diff options
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/func_concat.result | 6 | ||||
| -rw-r--r-- | mysql-test/r/select.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/view.result | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/mysql-test/r/func_concat.result b/mysql-test/r/func_concat.result index cf6fbf2da4f..0bd53b32dd7 100644 --- a/mysql-test/r/func_concat.result +++ b/mysql-test/r/func_concat.result @@ -63,4 +63,8 @@ a0 select 'a' union select concat('a', -0.0); a a -good +a0.0 +select 'a' union select concat('a', -0.0000); +a +a +a0.0000 diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result index ac0157fcfd1..7d5b2ed18cb 100644 --- a/mysql-test/r/select.result +++ b/mysql-test/r/select.result @@ -1,5 +1,5 @@ drop table if exists t1,t2,t3,t4; -drop table if exists t1_1,t1_2,t9_1,t9_2; +drop table if exists t1_1,t1_2,t9_1,t9_2,t1aa,t2aa; drop view if exists v1; CREATE TABLE t1 ( Period smallint(4) unsigned zerofill DEFAULT '0000' NOT NULL, diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result index 8013521e2f4..d31575eb38e 100644 --- a/mysql-test/r/view.result +++ b/mysql-test/r/view.result @@ -1433,7 +1433,8 @@ insert into v1 values (1) on duplicate key update a=2; insert into v1 values (1) on duplicate key update a=2; ERROR HY000: CHECK OPTION failed 'test.v1' insert ignore into v1 values (1) on duplicate key update a=2; -ERROR HY000: CHECK OPTION failed 'test.v1' +Warnings: +Error 1369 CHECK OPTION failed 'test.v1' select * from t1; a 1 |