From b69e8d46b64e221ff046b15338118d7328425229 Mon Sep 17 00:00:00 2001 From: Elena Stepanova Date: Thu, 2 Aug 2012 04:48:33 +0400 Subject: [PATCH] MDEV-369: Mismatches in MySQL engines test suite Post-merge fixes for mismatches that only affect 5.5 (but not 5.3) --- mysql-test/suite/engines/funcs/r/db_use_error.result | 2 +- mysql-test/suite/engines/funcs/r/sq_error.result | 8 ++++---- mysql-test/suite/engines/iuds/r/update_time.result | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mysql-test/suite/engines/funcs/r/db_use_error.result b/mysql-test/suite/engines/funcs/r/db_use_error.result index 03c41e927ac..2051b56b19e 100644 --- a/mysql-test/suite/engines/funcs/r/db_use_error.result +++ b/mysql-test/suite/engines/funcs/r/db_use_error.result @@ -9,7 +9,7 @@ mysql performance_schema test USE DATABASE nond6; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DATABASE nond6' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'DATABASE nond6' at line 1 DROP DATABASE d6; SHOW DATABASES; Database diff --git a/mysql-test/suite/engines/funcs/r/sq_error.result b/mysql-test/suite/engines/funcs/r/sq_error.result index 5ce36f50e49..c983ff73d12 100644 --- a/mysql-test/suite/engines/funcs/r/sq_error.result +++ b/mysql-test/suite/engines/funcs/r/sq_error.result @@ -11,7 +11,7 @@ INSERT INTO t2 VALUES (2,'abcde'); SELECT * FROM t1 WHERE c2 IN (SELECT c2 FROM t2 ORDER BY c1 LIMIT 1) --error 1241 SELECT (SELECT c1, c2 FROM t2) FROM t1; -ERROR 42000: This version of MySQL doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' +ERROR 42000: This version of MariaDB doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' SELECT * FROM t1 WHERE c1 = (SELECT c1 FROM t2); ERROR 21000: Subquery returns more than 1 row UPDATE t1 SET c2 = (SELECT MAX(c1) FROM t2); @@ -30,7 +30,7 @@ INSERT INTO t2 VALUES (2,'abcde'); SELECT * FROM t1 WHERE c2 IN (SELECT c2 FROM t2 ORDER BY c1 LIMIT 1) --error 1241 SELECT (SELECT c1, c2 FROM t2) FROM t1; -ERROR 42000: This version of MySQL doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' +ERROR 42000: This version of MariaDB doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' SELECT * FROM t1 WHERE c1 = (SELECT c1 FROM t2); ERROR 21000: Subquery returns more than 1 row UPDATE t1 SET c2 = (SELECT MAX(c1) FROM t2); @@ -49,7 +49,7 @@ INSERT INTO t2 VALUES (2,'abcde'); SELECT * FROM t1 WHERE c2 IN (SELECT c2 FROM t2 ORDER BY c1 LIMIT 1) --error 1241 SELECT (SELECT c1, c2 FROM t2) FROM t1; -ERROR 42000: This version of MySQL doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' +ERROR 42000: This version of MariaDB doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' SELECT * FROM t1 WHERE c1 = (SELECT c1 FROM t2); ERROR 21000: Subquery returns more than 1 row UPDATE t1 SET c2 = (SELECT MAX(c1) FROM t2); @@ -68,7 +68,7 @@ INSERT INTO t2 VALUES (2,'abcde'); SELECT * FROM t1 WHERE c2 IN (SELECT c2 FROM t2 ORDER BY c1 LIMIT 1) --error 1241 SELECT (SELECT c1, c2 FROM t2) FROM t1; -ERROR 42000: This version of MySQL doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' +ERROR 42000: This version of MariaDB doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' SELECT * FROM t1 WHERE c1 = (SELECT c1 FROM t2); ERROR 21000: Subquery returns more than 1 row UPDATE t1 SET c2 = (SELECT MAX(c1) FROM t2); diff --git a/mysql-test/suite/engines/iuds/r/update_time.result b/mysql-test/suite/engines/iuds/r/update_time.result index 3c651b45466..09a7cbf0c7f 100644 --- a/mysql-test/suite/engines/iuds/r/update_time.result +++ b/mysql-test/suite/engines/iuds/r/update_time.result @@ -1122,7 +1122,7 @@ c2 838:59:59 NULL UPDATE t4 SET c1=11:11:11 WHERE c2=NULL; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':11:11 WHERE c2=NULL' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':11:11 WHERE c2=NULL' at line 1 SELECT c1 FROM t4; c1 00:00:01 @@ -1262,7 +1262,7 @@ c1 c2 838:59:59 838:59:59 UPDATE t1 SET c1=c1+1,c2=c2-1 WHERE c1 IN (222222,8385955,1500000) ORDER BY c1; Warnings: -Warning 1264 Out of range value for column 'c2' at row 2 +Warning 1265 Data truncated for column 'c2' at row 2 SELECT * FROM t1; c1 c2 -12:12:12 12:12:12