fix parsing int24 in binary result (go-mysql-org#368)

Signed-off-by: siddontang <[email protected]>
hackfunn · Mar 3, 2019 · 670f74e · 670f74e
1 parent 3242b1d
commit 670f74e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,6 @@
 all: build
 
 GO111MODULE=on
-export export
 
 build:
 	go build -o bin/go-mysqlbinlog cmd/go-mysqlbinlog/main.go 

diff --git a/mysql/resultset.go b/mysql/resultset.go
@@ -63,6 +63,8 @@ func (p RowData) ParseText(f []*Field) ([]interface{}, error) {
 	return data, nil
 }
 
+// ParseBinary parses the binary format of data
+// see https://dev.mysql.com/doc/internals/en/binary-protocol-value.html
 func (p RowData) ParseBinary(f []*Field) ([]interface{}, error) {
 	data := make([]interface{}, len(f))
 
@@ -109,17 +111,7 @@ func (p RowData) ParseBinary(f []*Field) ([]interface{}, error) {
 			pos += 2
 			continue
 
-		case MYSQL_TYPE_INT24:
-			if isUnsigned {
-				data[i] = ParseBinaryUint24(p[pos : pos+3])
-			} else {
-				data[i] = ParseBinaryInt24(p[pos : pos+3])
-			}
-			//3 byte
-			pos += 3
-			continue
-
-		case MYSQL_TYPE_LONG:
+		case MYSQL_TYPE_INT24, MYSQL_TYPE_LONG:
 			if isUnsigned {
 				data[i] = ParseBinaryUint32(p[pos : pos+4])
 			} else {