Review fixes

Author: Maciej Zimnoch

connection_go18.go

@@ -46,6 +46,12 @@ func (mc *mysqlConn) BeginTx(ctx context.Context, opts driver.TxOptions) (driver
 		return nil, errors.New("mysql: read-only transactions not supported")
 	}
 
+	if err := mc.watchCancel(ctx); err != nil {
+		return nil, err
+	}
+
+	defer mc.finish()
+
 	if sql.IsolationLevel(opts.Isolation) != sql.LevelDefault {
 		level, err := mapIsolationLevel(opts.Isolation)
 		if err != nil {
@@ -55,15 +61,9 @@ func (mc *mysqlConn) BeginTx(ctx context.Context, opts driver.TxOptions) (driver
 		if err != nil {
 			return nil, err
 		}
-		mc.finish()
-	}
-
-	if err := mc.watchCancel(ctx); err != nil {
-		return nil, err
 	}
 
 	tx, err := mc.Begin()
-	mc.finish()
 	if err != nil {
 		return nil, err
 	}