diff options
author | Sergey Petrunya <psergey@askmonty.org> | 2013-07-05 21:42:06 +0400 |
---|---|---|
committer | Sergey Petrunya <psergey@askmonty.org> | 2013-07-05 21:42:06 +0400 |
commit | 9f14736a407c402dc76235f688a7777a56a38919 (patch) | |
tree | 52c779549b353c09d1b234e73d553a84fa14fb79 /mysql-test/suite/rpl | |
parent | f5b7f6101da623a804d13b487726fd52743c08f8 (diff) | |
download | mariadb-git-9f14736a407c402dc76235f688a7777a56a38919.tar.gz |
More buildbot test result updates
Diffstat (limited to 'mysql-test/suite/rpl')
-rw-r--r-- | mysql-test/suite/rpl/r/rpl_000013.result | 2 | ||||
-rw-r--r-- | mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result | 124 | ||||
-rw-r--r-- | mysql-test/suite/rpl/r/rpl_row_sp005.result | 2 |
3 files changed, 63 insertions, 65 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_000013.result b/mysql-test/suite/rpl/r/rpl_000013.result index e94a469e970..a45f11c4b5e 100644 --- a/mysql-test/suite/rpl/r/rpl_000013.result +++ b/mysql-test/suite/rpl/r/rpl_000013.result @@ -21,5 +21,5 @@ Variable_name Value Slave_open_temp_tables 0 drop table if exists t1,t2; Warnings: -Note 1051 Unknown table 't1' +Note 1051 Unknown table 'test.t1' include/rpl_end.inc diff --git a/mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result b/mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result index b296c6418a7..c647b4e2d3e 100644 --- a/mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result +++ b/mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result @@ -20,35 +20,35 @@ CREATE TEMPORARY TABLE nt_tmp_xx_1 ( id INT ) ENGINE = MyIsam; CREATE TEMPORARY TABLE tt_tmp_xx_1 ( id INT ) ENGINE = Innodb; DROP TEMPORARY TABLE IF EXISTS nt_tmp_2; Warnings: -Note 1051 Unknown table 'nt_tmp_2' +Note 1051 Unknown table 'test.nt_tmp_2' CREATE TEMPORARY TABLE nt_tmp_2 ( id INT ) ENGINE = MyIsam; DROP TEMPORARY TABLE IF EXISTS nt_tmp_1; Warnings: -Note 1051 Unknown table 'nt_tmp_1' +Note 1051 Unknown table 'test.nt_tmp_1' CREATE TEMPORARY TABLE nt_tmp_1 ( id INT ) ENGINE = MyIsam; DROP TEMPORARY TABLE IF EXISTS tt_tmp_2; Warnings: -Note 1051 Unknown table 'tt_tmp_2' +Note 1051 Unknown table 'test.tt_tmp_2' CREATE TEMPORARY TABLE tt_tmp_2 ( id INT ) ENGINE = Innodb; DROP TEMPORARY TABLE IF EXISTS tt_tmp_1; Warnings: -Note 1051 Unknown table 'tt_tmp_1' +Note 1051 Unknown table 'test.tt_tmp_1' CREATE TEMPORARY TABLE tt_tmp_1 ( id INT ) ENGINE = Innodb; DROP TABLE IF EXISTS nt_2; Warnings: -Note 1051 Unknown table 'nt_2' +Note 1051 Unknown table 'test.nt_2' CREATE TABLE nt_2 ( id INT ) ENGINE = MyIsam; DROP TABLE IF EXISTS nt_1; Warnings: -Note 1051 Unknown table 'nt_1' +Note 1051 Unknown table 'test.nt_1' CREATE TABLE nt_1 ( id INT ) ENGINE = MyIsam; DROP TABLE IF EXISTS tt_2; Warnings: -Note 1051 Unknown table 'tt_2' +Note 1051 Unknown table 'test.tt_2' CREATE TABLE tt_2 ( id INT ) ENGINE = Innodb; DROP TABLE IF EXISTS tt_1; Warnings: -Note 1051 Unknown table 'tt_1' +Note 1051 Unknown table 'test.tt_1' CREATE TABLE tt_1 ( id INT ) ENGINE = Innodb; SET @commands= ''; ######################################################################### @@ -76,7 +76,7 @@ master-bin.000001 # Query # # use `test`; DROP TEMPORARY TABLE IF EXISTS `nt_tmp SET @commands= 'Drop-Temp-Xe-Temp'; DROP TEMPORARY TABLE tt_xx_1; -ERROR 42S02: Unknown table 'tt_xx_1' +ERROR 42S02: Unknown table 'test.tt_xx_1' -b-b-b-b-b-b-b-b-b-b-b- >> Drop-Temp-Xe-Temp << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc -e-e-e-e-e-e-e-e-e-e-e- >> Drop-Temp-Xe-Temp << -e-e-e-e-e-e-e-e-e-e-e- @@ -84,7 +84,7 @@ include/show_binlog_events.inc SET @commands= 'Drop-Temp-If-Xe-Temp'; DROP TEMPORARY TABLE IF EXISTS tt_xx_1; Warnings: -Note 1051 Unknown table 'tt_xx_1' +Note 1051 Unknown table 'test.tt_xx_1' -b-b-b-b-b-b-b-b-b-b-b- >> Drop-Temp-If-Xe-Temp << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info @@ -93,7 +93,7 @@ master-bin.000001 # Query # # use `test`; DROP TEMPORARY TABLE IF EXISTS `tt_xx_ SET @commands= 'Drop-Temp-TXe-Temp'; DROP TEMPORARY TABLE tt_tmp_2, tt_1; -ERROR 42S02: Unknown table 'tt_1' +ERROR 42S02: Unknown table 'test.tt_1' -b-b-b-b-b-b-b-b-b-b-b- >> Drop-Temp-TXe-Temp << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info @@ -103,7 +103,7 @@ master-bin.000001 # Query # # use `test`; DROP TEMPORARY TABLE IF EXISTS `tt_tmp SET @commands= 'Drop-Temp-If-TXe-Temp'; DROP TEMPORARY TABLE IF EXISTS tt_tmp_2, tt_1; Warnings: -Note 1051 Unknown table 'tt_1' +Note 1051 Unknown table 'test.tt_1' -b-b-b-b-b-b-b-b-b-b-b- >> Drop-Temp-If-TXe-Temp << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info @@ -112,7 +112,7 @@ master-bin.000001 # Query # # use `test`; DROP TEMPORARY TABLE IF EXISTS `tt_tmp SET @commands= 'Drop-Temp-NXe-Temp'; DROP TEMPORARY TABLE nt_tmp_2, tt_1; -ERROR 42S02: Unknown table 'tt_1' +ERROR 42S02: Unknown table 'test.tt_1' -b-b-b-b-b-b-b-b-b-b-b- >> Drop-Temp-NXe-Temp << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info @@ -122,7 +122,7 @@ master-bin.000001 # Query # # use `test`; DROP TEMPORARY TABLE IF EXISTS `nt_tmp SET @commands= 'Drop-Temp-If-NXe-Temp'; DROP TEMPORARY TABLE IF EXISTS nt_tmp_2, tt_1; Warnings: -Note 1051 Unknown table 'tt_1' +Note 1051 Unknown table 'test.tt_1' -b-b-b-b-b-b-b-b-b-b-b- >> Drop-Temp-If-NXe-Temp << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info @@ -243,7 +243,7 @@ SET @commands= 'B T Drop-Temp-Xe-Temp C'; BEGIN; INSERT INTO tt_xx_1() VALUES (1); DROP TEMPORARY TABLE tt_xx_1; -ERROR 42S02: Unknown table 'tt_xx_1' +ERROR 42S02: Unknown table 'test.tt_xx_1' COMMIT; -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-Xe-Temp C << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc @@ -258,10 +258,10 @@ SET @commands= 'B T Drop-Temp-Xe-Temp N Drop-Temp-Xe-Temp C'; BEGIN; INSERT INTO tt_xx_1() VALUES (1); DROP TEMPORARY TABLE tt_xx_1; -ERROR 42S02: Unknown table 'tt_xx_1' +ERROR 42S02: Unknown table 'test.tt_xx_1' INSERT INTO nt_xx_1() VALUES (1); DROP TEMPORARY TABLE tt_xx_1; -ERROR 42S02: Unknown table 'tt_xx_1' +ERROR 42S02: Unknown table 'test.tt_xx_1' COMMIT; -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-Xe-Temp N Drop-Temp-Xe-Temp C << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc @@ -281,7 +281,7 @@ BEGIN; INSERT INTO tt_xx_1() VALUES (1); DROP TEMPORARY TABLE IF EXISTS tt_xx_1; Warnings: -Note 1051 Unknown table 'tt_xx_1' +Note 1051 Unknown table 'test.tt_xx_1' COMMIT; -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-If-Xe-Temp C << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc @@ -298,11 +298,11 @@ BEGIN; INSERT INTO tt_xx_1() VALUES (1); DROP TEMPORARY TABLE IF EXISTS tt_xx_1; Warnings: -Note 1051 Unknown table 'tt_xx_1' +Note 1051 Unknown table 'test.tt_xx_1' INSERT INTO nt_xx_1() VALUES (1); DROP TEMPORARY TABLE IF EXISTS tt_xx_1; Warnings: -Note 1051 Unknown table 'tt_xx_1' +Note 1051 Unknown table 'test.tt_xx_1' COMMIT; -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-If-Xe-Temp N Drop-Temp-If-Xe-Temp C << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc @@ -323,7 +323,7 @@ SET @commands= 'B T Drop-Temp-TXe-Temp C'; BEGIN; INSERT INTO tt_xx_1() VALUES (1); DROP TEMPORARY TABLE tt_tmp_2, tt_1; -ERROR 42S02: Unknown table 'tt_1' +ERROR 42S02: Unknown table 'test.tt_1' COMMIT; -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-TXe-Temp C << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc @@ -339,10 +339,10 @@ SET @commands= 'B T Drop-Temp-TXe-Temp N Drop-Temp-TXe-Temp C'; BEGIN; INSERT INTO tt_xx_1() VALUES (1); DROP TEMPORARY TABLE tt_tmp_2, tt_1; -ERROR 42S02: Unknown table 'tt_1' +ERROR 42S02: Unknown table 'test.tt_1' INSERT INTO nt_xx_1() VALUES (1); DROP TEMPORARY TABLE tt_tmp_1, tt_1; -ERROR 42S02: Unknown table 'tt_1' +ERROR 42S02: Unknown table 'test.tt_1' COMMIT; -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-TXe-Temp N Drop-Temp-TXe-Temp C << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc @@ -364,7 +364,7 @@ BEGIN; INSERT INTO tt_xx_1() VALUES (1); DROP TEMPORARY TABLE IF EXISTS tt_tmp_2, tt_1; Warnings: -Note 1051 Unknown table 'tt_1' +Note 1051 Unknown table 'test.tt_1' COMMIT; -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-If-TXe-Temp C << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc @@ -381,11 +381,11 @@ BEGIN; INSERT INTO tt_xx_1() VALUES (1); DROP TEMPORARY TABLE IF EXISTS tt_tmp_2, tt_1; Warnings: -Note 1051 Unknown table 'tt_1' +Note 1051 Unknown table 'test.tt_1' INSERT INTO nt_xx_1() VALUES (1); DROP TEMPORARY TABLE IF EXISTS tt_tmp_1, tt_1; Warnings: -Note 1051 Unknown table 'tt_1' +Note 1051 Unknown table 'test.tt_1' COMMIT; -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-If-TXe-Temp N Drop-Temp-If-TXe-Temp C << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc @@ -406,7 +406,7 @@ SET @commands= 'B T Drop-Temp-NXe-Temp C'; BEGIN; INSERT INTO tt_xx_1() VALUES (1); DROP TEMPORARY TABLE nt_tmp_2, tt_1; -ERROR 42S02: Unknown table 'tt_1' +ERROR 42S02: Unknown table 'test.tt_1' COMMIT; -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-NXe-Temp C << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc @@ -424,10 +424,10 @@ SET @commands= 'B T Drop-Temp-NXe-Temp N Drop-Temp-NXe-Temp C'; BEGIN; INSERT INTO tt_xx_1() VALUES (1); DROP TEMPORARY TABLE nt_tmp_2, tt_1; -ERROR 42S02: Unknown table 'tt_1' +ERROR 42S02: Unknown table 'test.tt_1' INSERT INTO nt_xx_1() VALUES (1); DROP TEMPORARY TABLE nt_tmp_1, tt_1; -ERROR 42S02: Unknown table 'tt_1' +ERROR 42S02: Unknown table 'test.tt_1' COMMIT; -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-NXe-Temp N Drop-Temp-NXe-Temp C << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc @@ -453,7 +453,7 @@ BEGIN; INSERT INTO tt_xx_1() VALUES (1); DROP TEMPORARY TABLE IF EXISTS nt_tmp_2, tt_1; Warnings: -Note 1051 Unknown table 'tt_1' +Note 1051 Unknown table 'test.tt_1' COMMIT; -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-If-NXe-Temp C << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc @@ -473,11 +473,11 @@ BEGIN; INSERT INTO tt_xx_1() VALUES (1); DROP TEMPORARY TABLE IF EXISTS nt_tmp_2, tt_1; Warnings: -Note 1051 Unknown table 'tt_1' +Note 1051 Unknown table 'test.tt_1' INSERT INTO nt_xx_1() VALUES (1); DROP TEMPORARY TABLE IF EXISTS nt_tmp_1, tt_1; Warnings: -Note 1051 Unknown table 'tt_1' +Note 1051 Unknown table 'test.tt_1' COMMIT; -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-If-NXe-Temp N Drop-Temp-If-NXe-Temp C << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc @@ -794,7 +794,7 @@ SET @commands= 'B T Drop-Temp-Xe-Temp R'; BEGIN; INSERT INTO tt_xx_1() VALUES (1); DROP TEMPORARY TABLE tt_xx_1; -ERROR 42S02: Unknown table 'tt_xx_1' +ERROR 42S02: Unknown table 'test.tt_xx_1' ROLLBACK; -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-Xe-Temp R << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc @@ -809,10 +809,10 @@ SET @commands= 'B T Drop-Temp-Xe-Temp N Drop-Temp-Xe-Temp R'; BEGIN; INSERT INTO tt_xx_1() VALUES (1); DROP TEMPORARY TABLE tt_xx_1; -ERROR 42S02: Unknown table 'tt_xx_1' +ERROR 42S02: Unknown table 'test.tt_xx_1' INSERT INTO nt_xx_1() VALUES (1); DROP TEMPORARY TABLE tt_xx_1; -ERROR 42S02: Unknown table 'tt_xx_1' +ERROR 42S02: Unknown table 'test.tt_xx_1' ROLLBACK; Warnings: Warning # Some non-transactional changed tables couldn't be rolled back @@ -834,7 +834,7 @@ BEGIN; INSERT INTO tt_xx_1() VALUES (1); DROP TEMPORARY TABLE IF EXISTS tt_xx_1; Warnings: -Note 1051 Unknown table 'tt_xx_1' +Note 1051 Unknown table 'test.tt_xx_1' ROLLBACK; -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-If-Xe-Temp R << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc @@ -851,11 +851,11 @@ BEGIN; INSERT INTO tt_xx_1() VALUES (1); DROP TEMPORARY TABLE IF EXISTS tt_xx_1; Warnings: -Note 1051 Unknown table 'tt_xx_1' +Note 1051 Unknown table 'test.tt_xx_1' INSERT INTO nt_xx_1() VALUES (1); DROP TEMPORARY TABLE IF EXISTS tt_xx_1; Warnings: -Note 1051 Unknown table 'tt_xx_1' +Note 1051 Unknown table 'test.tt_xx_1' ROLLBACK; Warnings: Warning # Some non-transactional changed tables couldn't be rolled back @@ -878,7 +878,7 @@ SET @commands= 'B T Drop-Temp-TXe-Temp R'; BEGIN; INSERT INTO tt_xx_1() VALUES (1); DROP TEMPORARY TABLE tt_tmp_2, tt_1; -ERROR 42S02: Unknown table 'tt_1' +ERROR 42S02: Unknown table 'test.tt_1' ROLLBACK; -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-TXe-Temp R << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc @@ -894,10 +894,10 @@ SET @commands= 'B T Drop-Temp-TXe-Temp N Drop-Temp-TXe-Temp R'; BEGIN; INSERT INTO tt_xx_1() VALUES (1); DROP TEMPORARY TABLE tt_tmp_2, tt_1; -ERROR 42S02: Unknown table 'tt_1' +ERROR 42S02: Unknown table 'test.tt_1' INSERT INTO nt_xx_1() VALUES (1); DROP TEMPORARY TABLE tt_tmp_1, tt_1; -ERROR 42S02: Unknown table 'tt_1' +ERROR 42S02: Unknown table 'test.tt_1' ROLLBACK; Warnings: Warning # Some non-transactional changed tables couldn't be rolled back @@ -921,7 +921,7 @@ BEGIN; INSERT INTO tt_xx_1() VALUES (1); DROP TEMPORARY TABLE IF EXISTS tt_tmp_2, tt_1; Warnings: -Note 1051 Unknown table 'tt_1' +Note 1051 Unknown table 'test.tt_1' ROLLBACK; -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-If-TXe-Temp R << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc @@ -938,11 +938,11 @@ BEGIN; INSERT INTO tt_xx_1() VALUES (1); DROP TEMPORARY TABLE IF EXISTS tt_tmp_2, tt_1; Warnings: -Note 1051 Unknown table 'tt_1' +Note 1051 Unknown table 'test.tt_1' INSERT INTO nt_xx_1() VALUES (1); DROP TEMPORARY TABLE IF EXISTS tt_tmp_1, tt_1; Warnings: -Note 1051 Unknown table 'tt_1' +Note 1051 Unknown table 'test.tt_1' ROLLBACK; Warnings: Warning # Some non-transactional changed tables couldn't be rolled back @@ -965,7 +965,7 @@ SET @commands= 'B T Drop-Temp-NXe-Temp R'; BEGIN; INSERT INTO tt_xx_1() VALUES (1); DROP TEMPORARY TABLE nt_tmp_2, tt_1; -ERROR 42S02: Unknown table 'tt_1' +ERROR 42S02: Unknown table 'test.tt_1' ROLLBACK; -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-NXe-Temp R << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc @@ -983,10 +983,10 @@ SET @commands= 'B T Drop-Temp-NXe-Temp N Drop-Temp-NXe-Temp R'; BEGIN; INSERT INTO tt_xx_1() VALUES (1); DROP TEMPORARY TABLE nt_tmp_2, tt_1; -ERROR 42S02: Unknown table 'tt_1' +ERROR 42S02: Unknown table 'test.tt_1' INSERT INTO nt_xx_1() VALUES (1); DROP TEMPORARY TABLE nt_tmp_1, tt_1; -ERROR 42S02: Unknown table 'tt_1' +ERROR 42S02: Unknown table 'test.tt_1' ROLLBACK; Warnings: Warning # Some non-transactional changed tables couldn't be rolled back @@ -1014,7 +1014,7 @@ BEGIN; INSERT INTO tt_xx_1() VALUES (1); DROP TEMPORARY TABLE IF EXISTS nt_tmp_2, tt_1; Warnings: -Note 1051 Unknown table 'tt_1' +Note 1051 Unknown table 'test.tt_1' ROLLBACK; -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-If-NXe-Temp R << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc @@ -1034,11 +1034,11 @@ BEGIN; INSERT INTO tt_xx_1() VALUES (1); DROP TEMPORARY TABLE IF EXISTS nt_tmp_2, tt_1; Warnings: -Note 1051 Unknown table 'tt_1' +Note 1051 Unknown table 'test.tt_1' INSERT INTO nt_xx_1() VALUES (1); DROP TEMPORARY TABLE IF EXISTS nt_tmp_1, tt_1; Warnings: -Note 1051 Unknown table 'tt_1' +Note 1051 Unknown table 'test.tt_1' ROLLBACK; Warnings: Warning # Some non-transactional changed tables couldn't be rolled back @@ -1302,7 +1302,7 @@ master-bin.000001 # Query # # use `test`; DROP TABLE `nt_2` /* generated by serv SET @commands= 'Drop-Xe'; DROP TABLE xx_1; -ERROR 42S02: Unknown table 'xx_1' +ERROR 42S02: Unknown table 'test.xx_1' -b-b-b-b-b-b-b-b-b-b-b- >> Drop-Xe << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc -e-e-e-e-e-e-e-e-e-e-e- >> Drop-Xe << -e-e-e-e-e-e-e-e-e-e-e- @@ -1310,7 +1310,7 @@ include/show_binlog_events.inc SET @commands= 'Drop-If-Xe'; DROP TABLE IF EXISTS xx_1; Warnings: -Note 1051 Unknown table 'xx_1' +Note 1051 Unknown table 'test.xx_1' -b-b-b-b-b-b-b-b-b-b-b- >> Drop-If-Xe << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info @@ -1319,7 +1319,7 @@ master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `xx_1` /* generat SET @commands= 'Drop-TXe'; DROP TABLE tt_2, xx_1; -ERROR 42S02: Unknown table 'xx_1' +ERROR 42S02: Unknown table 'test.xx_1' -b-b-b-b-b-b-b-b-b-b-b- >> Drop-TXe << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info @@ -1329,7 +1329,7 @@ master-bin.000001 # Query # # use `test`; DROP TABLE `tt_2`,`xx_1` /* generated SET @commands= 'Drop-If-TXe'; DROP TABLE IF EXISTS tt_2, xx_1; Warnings: -Note 1051 Unknown table 'xx_1' +Note 1051 Unknown table 'test.xx_1' -b-b-b-b-b-b-b-b-b-b-b- >> Drop-If-TXe << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info @@ -1338,7 +1338,7 @@ master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `tt_2`,`xx_1` /* SET @commands= 'Drop-NXe'; DROP TABLE nt_2, xx_1; -ERROR 42S02: Unknown table 'xx_1' +ERROR 42S02: Unknown table 'test.xx_1' -b-b-b-b-b-b-b-b-b-b-b- >> Drop-NXe << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info @@ -1348,7 +1348,7 @@ master-bin.000001 # Query # # use `test`; DROP TABLE `nt_2`,`xx_1` /* generated SET @commands= 'Drop-If-NXe'; DROP TABLE IF EXISTS nt_2, xx_1; Warnings: -Note 1051 Unknown table 'xx_1' +Note 1051 Unknown table 'test.xx_1' -b-b-b-b-b-b-b-b-b-b-b- >> Drop-If-NXe << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info @@ -1434,7 +1434,7 @@ SET @commands= 'B T Drop-Xe'; BEGIN; INSERT INTO tt_xx_1() VALUES (1); DROP TABLE xx_1; -ERROR 42S02: Unknown table 'xx_1' +ERROR 42S02: Unknown table 'test.xx_1' -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Xe << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info @@ -1449,7 +1449,7 @@ BEGIN; INSERT INTO tt_xx_1() VALUES (1); DROP TABLE IF EXISTS xx_1; Warnings: -Note 1051 Unknown table 'xx_1' +Note 1051 Unknown table 'test.xx_1' -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-If-Xe << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info @@ -1464,7 +1464,7 @@ SET @commands= 'B T Drop-TXe'; BEGIN; INSERT INTO tt_xx_1() VALUES (1); DROP TABLE tt_2, xx_1; -ERROR 42S02: Unknown table 'xx_1' +ERROR 42S02: Unknown table 'test.xx_1' -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-TXe << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info @@ -1480,7 +1480,7 @@ BEGIN; INSERT INTO tt_xx_1() VALUES (1); DROP TABLE IF EXISTS tt_2, xx_1; Warnings: -Note 1051 Unknown table 'xx_1' +Note 1051 Unknown table 'test.xx_1' -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-If-TXe << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info @@ -1495,7 +1495,7 @@ SET @commands= 'B T Drop-NXe'; BEGIN; INSERT INTO tt_xx_1() VALUES (1); DROP TABLE nt_2, xx_1; -ERROR 42S02: Unknown table 'xx_1' +ERROR 42S02: Unknown table 'test.xx_1' -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-NXe << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info @@ -1511,7 +1511,7 @@ BEGIN; INSERT INTO tt_xx_1() VALUES (1); DROP TABLE IF EXISTS nt_2, xx_1; Warnings: -Note 1051 Unknown table 'xx_1' +Note 1051 Unknown table 'test.xx_1' -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-If-NXe << -b-b-b-b-b-b-b-b-b-b-b- include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info diff --git a/mysql-test/suite/rpl/r/rpl_row_sp005.result b/mysql-test/suite/rpl/r/rpl_row_sp005.result index 0496fd6fe46..df877233e94 100644 --- a/mysql-test/suite/rpl/r/rpl_row_sp005.result +++ b/mysql-test/suite/rpl/r/rpl_row_sp005.result @@ -73,8 +73,6 @@ id2 < ---- Master selects-- > ------------------------- CALL test.p1(); -Warnings: -Error 1329 No data - zero rows fetched, selected, or processed SELECT * FROM test.t3 ORDER BY id3; id3 c 1 MySQL |