expression, executor: fix unhex(binary) error (#3569)

pingcap · Jul 13, 2017 · b7d7779 · b7d7779
1 parent 26decf5
commit b7d7779
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/executor/executor_test.go b/executor/executor_test.go
@@ -860,6 +860,8 @@ func (s *testSuite) TestBuiltin(c *C) {
 	tk.MustExec(`insert into t values('test')`)
 	result = tk.MustQuery("select hex(a) from t")
 	result.Check(testkit.Rows("7465737400000000"))
+	result = tk.MustQuery("select unhex(a) from t")
+	result.Check(testkit.Rows("<nil>"))
 
 	// select from_unixtime
 	result = tk.MustQuery("select from_unixtime(1451606400)")

diff --git a/expression/builtin_string.go b/expression/builtin_string.go
@@ -988,7 +988,7 @@ func (b *builtinUnHexSig) eval(row []types.Datum) (d types.Datum, err error) {
 	switch args[0].Kind() {
 	case types.KindNull:
 		return d, nil
-	case types.KindString:
+	case types.KindString, types.KindBytes:
 		x, err := args[0].ToString()
 		if err != nil {
 			return d, errors.Trace(err)