Merge pull request #285 from flike/bugfix-autocommit

Bugfix autocommit

core/hack/version.go

@@ -1,6 +1,6 @@
 package hack
 
 const (
-	Version = "2016-11-20 09:29:56 +0800 @c9b0909"
-	Compile = "2016-11-24 19:35:53 +0800 by go version go1.7.3 darwin/amd64"
+	Version = "2016-11-26 11:13:45 +0800 @7b5c49e"
+	Compile = "2016-11-26 11:25:54 +0800 by go version go1.7.1 linux/amd64"
 )

proxy/server/conn_set.go

@@ -76,12 +76,17 @@ func (c *ClientConn) handleSet(stmt *sqlparser.Set, sql string) (err error) {
 }
 
 func (c *ClientConn) handleSetAutoCommit(val sqlparser.ValExpr) error {
-	value, ok := val.(sqlparser.NumVal)
-	if !ok {
-		return fmt.Errorf("set autocommit error")
+	flag := sqlparser.String(val)
+	flag = strings.Trim(flag, "'`\"")
+	// autocommit允许为 0, 1, ON, OFF, "ON", "OFF", 不允许"0", "1"
+	if flag == `0` || flag == `1` {
+		_, ok := val.(sqlparser.NumVal)
+		if !ok {
+			return fmt.Errorf("set autocommit error")
+		}
 	}
-	switch value[0] {
-	case '1':
+	switch strings.ToUpper(flag) {
+	case `1`, `ON`:
 		c.status |= mysql.SERVER_STATUS_AUTOCOMMIT
 		if c.status&mysql.SERVER_STATUS_IN_TRANS > 0 {
 			c.status &= ^mysql.SERVER_STATUS_IN_TRANS
@@ -95,10 +100,10 @@ func (c *ClientConn) handleSetAutoCommit(val sqlparser.ValExpr) error {
 			co.Close()
 		}
 		c.txConns = make(map[*backend.Node]*backend.BackendConn)
-	case '0':
+	case `0`, `OFF`:
 		c.status &= ^mysql.SERVER_STATUS_AUTOCOMMIT
 	default:
-		return fmt.Errorf("invalid autocommit flag %s", value)
+		return fmt.Errorf("invalid autocommit flag %s", flag)
 	}
 
 	return c.writeOK(nil)