diff options
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/derived.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/rpl000009.test | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/t/derived.test b/mysql-test/t/derived.test index a13d5de40f0..f0d5a253bf4 100644 --- a/mysql-test/t/derived.test +++ b/mysql-test/t/derived.test @@ -157,8 +157,8 @@ UPDATE `t1` AS P1 INNER JOIN (SELECT N FROM `t1` GROUP BY N HAVING Count(M) > 1) UPDATE `t1` AS P1 INNER JOIN (SELECT aaaa FROM `t1` GROUP BY N HAVING Count(M) > 1) AS P2 ON P1.N = P2.N SET P1.M = 2; delete P1.* from `t1` AS P1 INNER JOIN (SELECT N FROM `t1` GROUP BY N HAVING Count(M) > 1) AS P2 ON P1.N = P2.N; select * from t1; ---error 1288 --replace_result P2 p2 +--error 1288 delete P1.*,P2.* from `t1` AS P1 INNER JOIN (SELECT N FROM `t1` GROUP BY N HAVING Count(M) > 1) AS P2 ON P1.N = P2.N; -- error 1054 delete P1.* from `t1` AS P1 INNER JOIN (SELECT aaa FROM `t1` GROUP BY N HAVING Count(M) > 1) AS P2 ON P1.N = P2.N; diff --git a/mysql-test/t/rpl000009.test b/mysql-test/t/rpl000009.test index 4b69fb3e31c..59451bc888d 100644 --- a/mysql-test/t/rpl000009.test +++ b/mysql-test/t/rpl000009.test @@ -127,11 +127,11 @@ load data from master; start slave; # see if replication coordinates were restored fine connection master; -insert into bar.t1 values (5, 'five bar'); +insert into mysqltest.t1 values (5, 'five bar'); save_master_pos; connection slave; sync_with_master; -select * from bar.t1; +select * from mysqltest.t1; # Check that LOAD DATA FROM MASTER reports the error if it can't drop a # table to be overwritten. |