1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-369: Mismatches in MySQL engines test suite

Browse Source 
Post-merge fixes for mismatches that only affect 5.5 (but not 5.3)
This commit is contained in:
Elena Stepanova 2012-08-02 04:48:33 +04:00
parent f2b4305bd4
commit b69e8d46b6
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/engines/funcs/r/db_use_error.result
View File

@ -9,7 +9,7 @@ mysql
performance_schema performance_schema
test test
USE DATABASE nond6; 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; DROP DATABASE d6;
SHOW DATABASES; SHOW DATABASES;
Database Database

8
mysql-test/suite/engines/funcs/r/sq_error.result
View File

@ -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) SELECT * FROM t1 WHERE c2 IN (SELECT c2 FROM t2 ORDER BY c1 LIMIT 1)
--error 1241 --error 1241
SELECT (SELECT c1, c2 FROM t2) FROM t1; 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); SELECT * FROM t1 WHERE c1 = (SELECT c1 FROM t2);
ERROR 21000: Subquery returns more than 1 row ERROR 21000: Subquery returns more than 1 row
UPDATE t1 SET c2 = (SELECT MAX(c1) FROM t2); 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) SELECT * FROM t1 WHERE c2 IN (SELECT c2 FROM t2 ORDER BY c1 LIMIT 1)
--error 1241 --error 1241
SELECT (SELECT c1, c2 FROM t2) FROM t1; 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); SELECT * FROM t1 WHERE c1 = (SELECT c1 FROM t2);
ERROR 21000: Subquery returns more than 1 row ERROR 21000: Subquery returns more than 1 row
UPDATE t1 SET c2 = (SELECT MAX(c1) FROM t2); 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) SELECT * FROM t1 WHERE c2 IN (SELECT c2 FROM t2 ORDER BY c1 LIMIT 1)
--error 1241 --error 1241
SELECT (SELECT c1, c2 FROM t2) FROM t1; 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); SELECT * FROM t1 WHERE c1 = (SELECT c1 FROM t2);
ERROR 21000: Subquery returns more than 1 row ERROR 21000: Subquery returns more than 1 row
UPDATE t1 SET c2 = (SELECT MAX(c1) FROM t2); 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) SELECT * FROM t1 WHERE c2 IN (SELECT c2 FROM t2 ORDER BY c1 LIMIT 1)
--error 1241 --error 1241
SELECT (SELECT c1, c2 FROM t2) FROM t1; 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); SELECT * FROM t1 WHERE c1 = (SELECT c1 FROM t2);
ERROR 21000: Subquery returns more than 1 row ERROR 21000: Subquery returns more than 1 row
UPDATE t1 SET c2 = (SELECT MAX(c1) FROM t2); UPDATE t1 SET c2 = (SELECT MAX(c1) FROM t2);

4
mysql-test/suite/engines/iuds/r/update_time.result
View File

@ -1122,7 +1122,7 @@ c2
838:59:59 838:59:59
NULL NULL
UPDATE t4 SET c1=11:11:11 WHERE c2=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; SELECT c1 FROM t4;
c1 c1
00:00:01 00:00:01
@ -1262,7 +1262,7 @@ c1 c2
838:59:59 838:59:59 838:59:59 838:59:59
UPDATE t1 SET c1=c1+1,c2=c2-1 WHERE c1 IN (222222,8385955,1500000) ORDER BY c1; UPDATE t1 SET c1=c1+1,c2=c2-1 WHERE c1 IN (222222,8385955,1500000) ORDER BY c1;
Warnings: 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; SELECT * FROM t1;
c1 c2 c1 c2
-12:12:12 12:12:12 -12:12:12 12:12:12