Merge branch 'master' into ngaut/update-readme

edric-shen · Apr 1, 2016 · aae1faa · aae1faa
2 parents 7f3eb23 + 8aa1055
commit aae1faa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -90,7 +90,7 @@ check:
 	@echo "vet"
 	@ go tool vet . 2>&1 | grep -vE 'Godeps|parser/scanner.*unreachable code' | awk '{print} END{if(NR>0) {exit 1}}'
 	@echo "vet --shadow"
-	@ go tool vet --shadow . 2>&1 | grep -vE 'Godeps' | awk '{print} END{if(NR>0) {exit 1}}'
+	@ go tool vet --shadow . 2>&1 | grep -vE 'Godeps|parser/parser.go|parser/scanner.go' | awk '{print} END{if(NR>0) {exit 1}}'
 	@echo "golint"
 	@ $(GOLINT) ./... 2>&1 | grep -vE 'LastInsertId|NewLexer|\.pb\.go' | awk '{print} END{if(NR>0) {exit 1}}'
 	@echo "gofmt (simplify)"

diff --git a/tidb-server/server/conn.go b/tidb-server/server/conn.go
@@ -411,14 +411,14 @@ func (cc *clientConn) writeResultset(rs ResultSet, binary bool) error {
 	columnLen := dumpLengthEncodedInt(uint64(len(columns)))
 	data := cc.alloc.AllocWithLen(4, 1024)
 	data = append(data, columnLen...)
-	if err := cc.writePacket(data); err != nil {
+	if err = cc.writePacket(data); err != nil {
 		return errors.Trace(err)
 	}
 
 	for _, v := range columns {
 		data = data[0:4]
 		data = append(data, v.Dump(cc.alloc)...)
-		if err := cc.writePacket(data); err != nil {
+		if err = cc.writePacket(data); err != nil {
 			return errors.Trace(err)
 		}
 	}
@@ -457,7 +457,7 @@ func (cc *clientConn) writeResultset(rs ResultSet, binary bool) error {
 			}
 		}
 
-		if err := cc.writePacket(data); err != nil {
+		if err = cc.writePacket(data); err != nil {
 			return errors.Trace(err)
 		}
 		row, err = rs.Next()