diff options
Diffstat (limited to 'mysql-test/suite/engines')
10 files changed, 6 insertions, 40 deletions
diff --git a/mysql-test/suite/engines/funcs/r/sq_error.result b/mysql-test/suite/engines/funcs/r/sq_error.result index 2090f4b9cd4..6b00bf6c921 100644 --- a/mysql-test/suite/engines/funcs/r/sq_error.result +++ b/mysql-test/suite/engines/funcs/r/sq_error.result @@ -15,8 +15,6 @@ ERROR 42000: This version of MariaDB doesn't yet support 'LIMIT & IN/ALL/ANY/SOM 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); -UPDATE t1 SET c1 = (SELECT MAX(c1) FROM t1); -ERROR HY000: Table 't1' is specified twice, both as a target for 'UPDATE' and as a separate source for data DROP TABLE t1; DROP TABLE t2; CREATE TABLE t1 (c1 INT, c2 VARCHAR(100),c3 FLOAT); @@ -34,8 +32,6 @@ ERROR 42000: This version of MariaDB doesn't yet support 'LIMIT & IN/ALL/ANY/SOM 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); -UPDATE t1 SET c1 = (SELECT MAX(c1) FROM t1); -ERROR HY000: Table 't1' is specified twice, both as a target for 'UPDATE' and as a separate source for data DROP TABLE t1; DROP TABLE t2; CREATE TABLE t1 (c1 INT, c2 BINARY(100),c3 FLOAT); @@ -53,8 +49,6 @@ ERROR 42000: This version of MariaDB doesn't yet support 'LIMIT & IN/ALL/ANY/SOM 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); -UPDATE t1 SET c1 = (SELECT MAX(c1) FROM t1); -ERROR HY000: Table 't1' is specified twice, both as a target for 'UPDATE' and as a separate source for data DROP TABLE t1; DROP TABLE t2; CREATE TABLE t1 (c1 INT, c2 VARBINARY(100),c3 FLOAT); @@ -72,7 +66,5 @@ ERROR 42000: This version of MariaDB doesn't yet support 'LIMIT & IN/ALL/ANY/SOM 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); -UPDATE t1 SET c1 = (SELECT MAX(c1) FROM t1); -ERROR HY000: Table 't1' is specified twice, both as a target for 'UPDATE' and as a separate source for data DROP TABLE t1; DROP TABLE t2; diff --git a/mysql-test/suite/engines/funcs/t/rpl_row_max_relay_size.test b/mysql-test/suite/engines/funcs/t/rpl_row_max_relay_size.test index 3e057d48ec9..6df58122051 100644 --- a/mysql-test/suite/engines/funcs/t/rpl_row_max_relay_size.test +++ b/mysql-test/suite/engines/funcs/t/rpl_row_max_relay_size.test @@ -6,4 +6,4 @@ # Requires statement logging source include/have_binlog_format_row.inc; -source extra/rpl_tests/rpl_max_relay_size.test; +source suite/rpl/include/rpl_max_relay_size.test; diff --git a/mysql-test/suite/engines/funcs/t/rpl_row_reset_slave.test b/mysql-test/suite/engines/funcs/t/rpl_row_reset_slave.test index a970c161153..5c2ba774543 100644 --- a/mysql-test/suite/engines/funcs/t/rpl_row_reset_slave.test +++ b/mysql-test/suite/engines/funcs/t/rpl_row_reset_slave.test @@ -1,5 +1,5 @@ # TBF - difference in row level logging # Temp tables are not replicated in rbr, but it is still good to hit rbr with everthing -- source include/have_binlog_format_row.inc --- source extra/rpl_tests/rpl_reset_slave.test +-- source suite/rpl/include/rpl_reset_slave.test diff --git a/mysql-test/suite/engines/funcs/t/rpl_stm_max_relay_size.test b/mysql-test/suite/engines/funcs/t/rpl_stm_max_relay_size.test index 950aa8b322a..da1921ec262 100644 --- a/mysql-test/suite/engines/funcs/t/rpl_stm_max_relay_size.test +++ b/mysql-test/suite/engines/funcs/t/rpl_stm_max_relay_size.test @@ -5,7 +5,7 @@ # Requires statement logging -- source include/have_binlog_format_mixed_or_statement.inc --- source extra/rpl_tests/rpl_max_relay_size.test +-- source suite/rpl/include/rpl_max_relay_size.test # End of 4.1 tests # diff --git a/mysql-test/suite/engines/funcs/t/rpl_stm_reset_slave.test b/mysql-test/suite/engines/funcs/t/rpl_stm_reset_slave.test index 6a99d4e1613..63ff768b4f3 100644 --- a/mysql-test/suite/engines/funcs/t/rpl_stm_reset_slave.test +++ b/mysql-test/suite/engines/funcs/t/rpl_stm_reset_slave.test @@ -1,6 +1,6 @@ # TBF - difference in row level logging -- source include/have_binlog_format_mixed_or_statement.inc --- source extra/rpl_tests/rpl_reset_slave.test +-- source suite/rpl/include/rpl_reset_slave.test # End of 4.1 tests # diff --git a/mysql-test/suite/engines/funcs/t/sq_error.test b/mysql-test/suite/engines/funcs/t/sq_error.test index a9b72008c74..6776e92be63 100644 --- a/mysql-test/suite/engines/funcs/t/sq_error.test +++ b/mysql-test/suite/engines/funcs/t/sq_error.test @@ -19,8 +19,6 @@ SELECT (SELECT c1, c2 FROM t2) FROM t1; --error 1242 SELECT * FROM t1 WHERE c1 = (SELECT c1 FROM t2); UPDATE t1 SET c2 = (SELECT MAX(c1) FROM t2); ---error 1093 -UPDATE t1 SET c1 = (SELECT MAX(c1) FROM t1); DROP TABLE t1; DROP TABLE t2; CREATE TABLE t1 (c1 INT, c2 VARCHAR(100),c3 FLOAT); @@ -38,8 +36,6 @@ SELECT (SELECT c1, c2 FROM t2) FROM t1; --error 1242 SELECT * FROM t1 WHERE c1 = (SELECT c1 FROM t2); UPDATE t1 SET c2 = (SELECT MAX(c1) FROM t2); ---error 1093 -UPDATE t1 SET c1 = (SELECT MAX(c1) FROM t1); DROP TABLE t1; DROP TABLE t2; CREATE TABLE t1 (c1 INT, c2 BINARY(100),c3 FLOAT); @@ -57,8 +53,6 @@ SELECT (SELECT c1, c2 FROM t2) FROM t1; --error 1242 SELECT * FROM t1 WHERE c1 = (SELECT c1 FROM t2); UPDATE t1 SET c2 = (SELECT MAX(c1) FROM t2); ---error 1093 -UPDATE t1 SET c1 = (SELECT MAX(c1) FROM t1); DROP TABLE t1; DROP TABLE t2; CREATE TABLE t1 (c1 INT, c2 VARBINARY(100),c3 FLOAT); @@ -76,8 +70,6 @@ SELECT (SELECT c1, c2 FROM t2) FROM t1; --error 1242 SELECT * FROM t1 WHERE c1 = (SELECT c1 FROM t2); UPDATE t1 SET c2 = (SELECT MAX(c1) FROM t2); ---error 1093 -UPDATE t1 SET c1 = (SELECT MAX(c1) FROM t1); DROP TABLE t1; DROP TABLE t2; diff --git a/mysql-test/suite/engines/iuds/r/insert_decimal.result b/mysql-test/suite/engines/iuds/r/insert_decimal.result index c0f3224e26f..f167712d048 100644 --- a/mysql-test/suite/engines/iuds/r/insert_decimal.result +++ b/mysql-test/suite/engines/iuds/r/insert_decimal.result @@ -1151,7 +1151,7 @@ total_rows min_value max_value sum avg 7 -100000.00000 100000.00000 -99.15000 -16.525000509 SELECT count(*) as total_rows, min(c3) as min_value, max(c3) as max_value, sum(c3) as sum, avg(c3) as avg FROM t1; total_rows min_value max_value sum avg -7 -0.10000000149011612 111111112 111211212.95000306 18535202.15833384 +7 -0.1 111111000 111211212.95000306 18535202.15833384 SELECT count(*) as total_rows, min(c1) as min_value, max(c1) as max_value, sum(c1) as sum, avg(c1) as avg FROM t2; total_rows min_value max_value sum avg 30 -10000000000 10000000000 31322222339 1044074077.9667 @@ -1160,7 +1160,7 @@ total_rows min_value max_value sum avg 30 0 10000000000 43444444564 1448148152.1333 SELECT count(*) as total_rows, min(c3) as min_value, max(c3) as max_value, sum(c3) as sum, avg(c3) as avg FROM t2; total_rows min_value max_value sum avg -30 -3.4028234663852886e38 3.4028234663852886e38 1.0208470399155866e39 3.4028234663852886e37 +30 -3.40282e38 3.40282e38 1.0208470399155866e39 3.4028234663852886e37 SELECT * FROM t1; c1 c2 c3 c4 0.00000 -0.10000 -0.1 13 diff --git a/mysql-test/suite/engines/iuds/r/insert_number.result b/mysql-test/suite/engines/iuds/r/insert_number.result index 1355812649a..564ce8d3401 100644 --- a/mysql-test/suite/engines/iuds/r/insert_number.result +++ b/mysql-test/suite/engines/iuds/r/insert_number.result @@ -34324,12 +34324,8 @@ c1 c2 c3 c4 c5 c6 c7 0 -9223372036854775808 31 32 33 34 35 SELECT * FROM t3 WHERE c2 IN (-9223372036854775809,9223372036854775808) ORDER BY c2,c7; c1 c2 c3 c4 c5 c6 c7 -0 -9223372036854775808 1 2 3 4 5 -0 -9223372036854775808 31 32 33 34 35 SELECT * FROM t3 WHERE c2 IN (-9223372036854775809,9223372036854775808) ORDER BY c2,c7 LIMIT 2; c1 c2 c3 c4 c5 c6 c7 -0 -9223372036854775808 1 2 3 4 5 -0 -9223372036854775808 31 32 33 34 35 SELECT * FROM t3 WHERE c2 >= -9223372036854775809 AND c2 < 9223372036854775808 AND c7 = 35 ORDER BY c2,c7; c1 c2 c3 c4 c5 c6 c7 0 -9223372036854775808 31 32 33 34 35 @@ -34491,12 +34487,8 @@ c1 c2 c3 c4 c5 c6 c7 0 -9223372036854775808 1 2 3 4 5 SELECT * FROM t3 WHERE c2 IN (-9223372036854775809,9223372036854775808) ORDER BY c2,c7 DESC; c1 c2 c3 c4 c5 c6 c7 -0 -9223372036854775808 31 32 33 34 35 -0 -9223372036854775808 1 2 3 4 5 SELECT * FROM t3 WHERE c2 IN (-9223372036854775809,9223372036854775808) ORDER BY c2,c7 DESC LIMIT 2; c1 c2 c3 c4 c5 c6 c7 -0 -9223372036854775808 31 32 33 34 35 -0 -9223372036854775808 1 2 3 4 5 SELECT * FROM t3 WHERE c2 >= -9223372036854775809 AND c2 < 9223372036854775808 AND c7 = 35 ORDER BY c2,c7 DESC; c1 c2 c3 c4 c5 c6 c7 0 -9223372036854775808 31 32 33 34 35 @@ -34751,12 +34743,8 @@ c1 c2 c3 c4 c5 c6 c7 0 -9223372036854775808 31 32 33 34 35 SELECT * FROM t3 WHERE c2 IN (-9223372036854775809,9223372036854775808) ORDER BY c2,c7; c1 c2 c3 c4 c5 c6 c7 -0 -9223372036854775808 1 2 3 4 5 -0 -9223372036854775808 31 32 33 34 35 SELECT * FROM t3 WHERE c2 IN (-9223372036854775809,9223372036854775808) ORDER BY c2,c7 LIMIT 2; c1 c2 c3 c4 c5 c6 c7 -0 -9223372036854775808 1 2 3 4 5 -0 -9223372036854775808 31 32 33 34 35 SELECT * FROM t3 WHERE c2 >= -9223372036854775809 AND c2 < 9223372036854775808 AND c7 = 35 ORDER BY c2,c7; c1 c2 c3 c4 c5 c6 c7 0 -9223372036854775808 31 32 33 34 35 @@ -34918,12 +34906,8 @@ c1 c2 c3 c4 c5 c6 c7 0 -9223372036854775808 1 2 3 4 5 SELECT * FROM t3 WHERE c2 IN (-9223372036854775809,9223372036854775808) ORDER BY c2,c7 DESC; c1 c2 c3 c4 c5 c6 c7 -0 -9223372036854775808 31 32 33 34 35 -0 -9223372036854775808 1 2 3 4 5 SELECT * FROM t3 WHERE c2 IN (-9223372036854775809,9223372036854775808) ORDER BY c2,c7 DESC LIMIT 2; c1 c2 c3 c4 c5 c6 c7 -0 -9223372036854775808 31 32 33 34 35 -0 -9223372036854775808 1 2 3 4 5 SELECT * FROM t3 WHERE c2 >= -9223372036854775809 AND c2 < 9223372036854775808 AND c7 = 35 ORDER BY c2,c7 DESC; c1 c2 c3 c4 c5 c6 c7 0 -9223372036854775808 31 32 33 34 35 diff --git a/mysql-test/suite/engines/iuds/r/update_delete_number.result b/mysql-test/suite/engines/iuds/r/update_delete_number.result index 732fb9c4151..1cd2a62cb56 100644 --- a/mysql-test/suite/engines/iuds/r/update_delete_number.result +++ b/mysql-test/suite/engines/iuds/r/update_delete_number.result @@ -980,7 +980,6 @@ drop table mt1, mt2, mt3; create table mt1 (col1 int); create table mt2 (col1 int); update mt1,mt2 set mt1.col1 = (select max(col1) from mt1) where mt1.col1 = mt2.col1; -ERROR HY000: Table 'mt1' is specified twice, both as a target for 'UPDATE' and as a separate source for data delete mt1 from mt1,mt2 where mt1.col1 < (select max(col1) from mt1) and mt1.col1 = mt2.col1; ERROR HY000: Table 'mt1' is specified twice, both as a target for 'DELETE' and as a separate source for data drop table mt1,mt2; diff --git a/mysql-test/suite/engines/iuds/t/update_delete_number.test b/mysql-test/suite/engines/iuds/t/update_delete_number.test index c58746d59f4..ce3f90140b2 100644 --- a/mysql-test/suite/engines/iuds/t/update_delete_number.test +++ b/mysql-test/suite/engines/iuds/t/update_delete_number.test @@ -495,7 +495,6 @@ drop table mt1, mt2, mt3; # multi* unique updating table check create table mt1 (col1 int); create table mt2 (col1 int); --- error ER_UPDATE_TABLE_USED update mt1,mt2 set mt1.col1 = (select max(col1) from mt1) where mt1.col1 = mt2.col1; -- error ER_UPDATE_TABLE_USED delete mt1 from mt1,mt2 where mt1.col1 < (select max(col1) from mt1) and mt1.col1 = mt2.col1; |