*: Address comments

pingcap · Oct 19, 2015 · c14b723 · ngaut · Oct 20, 2015 · shenli
1 parent 3442b77
commit c14b723
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/mysql/type.go b/mysql/type.go
@@ -48,6 +48,10 @@ const (
 	TypeGeometry
 )
 
+// UnInitializedType is an uninitialized type code.
+// TypeDecimal is the old type code for decimal and not be used in the new mysql version.
+const UnInitializedType = TypeDecimal
+
 // Flag informations.
 const (
 	NotNullFlag     = 1   /* Field can't be NULL */

diff --git a/plan/plans/fields.go b/plan/plans/fields.go
@@ -22,6 +22,7 @@ import (
 	"github.com/pingcap/tidb/context"
 	"github.com/pingcap/tidb/expression"
 	"github.com/pingcap/tidb/field"
+	"github.com/pingcap/tidb/mysql"
 	"github.com/pingcap/tidb/plan"
 	"github.com/pingcap/tidb/util/format"
 	"github.com/pingcap/tidb/util/types"
@@ -83,7 +84,7 @@ func (r *SelectFieldsDefaultPlan) Next(ctx context.Context) (row *plan.Row, err
 		}
 		di, ok := d.(*types.DataItem)
 		if ok {
-			if r.ResultFields[i].Col.Tp == 0 {
+			if r.ResultFields[i].Col.Tp == mysql.UnInitializedType {
 				r.ResultFields[i].Col.FieldType = *di.Type
 			}
 			row.Data[i] = di.Data

diff --git a/plan/plans/plans.go b/plan/plans/plans.go
@@ -131,7 +131,7 @@ func setResultFieldInfo(fields []*field.ResultField, values []interface{}) error
 		return errors.Errorf("Fields and Values length unmatch %d VS %d", len(fields), len(values))
 	}
 	for i, rf := range fields {
-		if rf.Col.Tp == 0 {
+		if rf.Col.Tp == mysql.UnInitializedType {
 			// 0 == TypeDecimal, Tp maybe uninitialized
 			rf.Col.Charset = charset.CharsetBin
 			rf.Col.Collate = charset.CharsetBin

diff --git a/plan/plans/union.go b/plan/plans/union.go
@@ -19,7 +19,7 @@ import (
 	"github.com/pingcap/tidb/expression"
 	"github.com/pingcap/tidb/field"
 	"github.com/pingcap/tidb/kv/memkv"
-	mysql "github.com/pingcap/tidb/mysqldef"
+	"github.com/pingcap/tidb/mysql"
 	"github.com/pingcap/tidb/plan"
 	"github.com/pingcap/tidb/util/format"
 	"github.com/pingcap/tidb/util/types"