summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <monty@tik.mysql.fi>2001-07-08 06:24:03 +0300
committerunknown <monty@tik.mysql.fi>2001-07-08 06:24:03 +0300
commit0b083a0d766bbc25e2b1264dd41a421703ac581f (patch)
tree2712930a2b972687e116b98f20cc9f4d4d8fa447 /mysql-test
parentfde78d995acca36cb353151604de5a12c2299361 (diff)
parent9a811481b21c3ac3a349b2311a92558e397bc764 (diff)
downloadmariadb-git-0b083a0d766bbc25e2b1264dd41a421703ac581f.tar.gz
merge
sql/sql_lex.h: Auto merged sql/sql_yacc.yy: Auto merged
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/varbinary.result4
-rw-r--r--mysql-test/t/varbinary.test16
2 files changed, 20 insertions, 0 deletions
diff --git a/mysql-test/r/varbinary.result b/mysql-test/r/varbinary.result
index 62aeae21970..bb4aaefe057 100644
--- a/mysql-test/r/varbinary.result
+++ b/mysql-test/r/varbinary.result
@@ -2,5 +2,9 @@
A 65 9223372036854775807 -1
0x31+1 concat(0x31)+1 -0xf
50 2 -15
+x'31' X'ffff'+0
+1 65535
table type possible_keys key key_len ref rows Extra
t1 const UNIQ UNIQ 8 const 1
+x xx
+1 2
diff --git a/mysql-test/t/varbinary.test b/mysql-test/t/varbinary.test
index 0ab26f51e65..7b0050fb2eb 100644
--- a/mysql-test/t/varbinary.test
+++ b/mysql-test/t/varbinary.test
@@ -4,6 +4,7 @@
select 0x41,0x41+0,0x41 | 0x7fffffffffffffff | 0,0xffffffffffffffff | 0 ;
select 0x31+1,concat(0x31)+1,-0xf;
+select x'31',X'ffff'+0;
#
# Test of hex constants in WHERE:
@@ -14,3 +15,18 @@ insert into t1 set UNIQ=0x38afba1d73e6a18a;
insert into t1 set UNIQ=123;
explain select * from t1 where UNIQ=0x38afba1d73e6a18a;
drop table t1;
+
+#
+# Test error conditions
+#
+--error 1064
+select x'hello';
+--error 1064
+select 0xfg;
+
+#
+# Test likely error conditions
+#
+create table t1 select 1 as x, 2 as xx;
+select x,xx from t1;
+drop table t1;