mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Enable rpl_row_create_table (no reason to keep this disabled anymore)

Browse source
This commit is contained in:
Michael Widenius 2014-02-11 14:03:13 +02:00
parent 12bbf03cff
commit 5785b1a05c
2 changed files with 22 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/suite/rpl/disabled.def
View file

@ -10,6 +10,5 @@
# #
############################################################################## ##############################################################################
rpl_row_create_table : Bug#11759274 2010-02-27 andrei failed different way than earlier with bug#45576
rpl_spec_variables : BUG#11755836 2009-10-27 jasonh rpl_spec_variables fails on PB2 hpux rpl_spec_variables : BUG#11755836 2009-10-27 jasonh rpl_spec_variables fails on PB2 hpux
rpl_get_master_version_and_clock : Bug#11766137 Jan 05 2011 joro Valgrind warnings rpl_get_master_version_and_clock rpl_get_master_version_and_clock : Bug#11766137 Jan 05 2011 joro Valgrind warnings rpl_get_master_version_and_clock

75
mysql-test/suite/rpl/r/rpl_row_create_table.result
View file

@ -1,14 +1,8 @@
stop slave; include/master-slave.inc
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; [connection master]
reset master; include/wait_for_slave_to_stop.inc
reset slave; include/wait_for_slave_to_start.inc
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; include/rpl_reset.inc
start slave;
**** Resetting master and slave ****
include/stop_slave.inc
RESET SLAVE;
RESET MASTER;
include/start_slave.inc
CREATE TABLE t1 (a INT, b INT); CREATE TABLE t1 (a INT, b INT);
CREATE TABLE t2 (a INT, b INT) ENGINE=Merge; CREATE TABLE t2 (a INT, b INT) ENGINE=Merge;
CREATE TABLE t3 (a INT, b INT) CHARSET=utf8; CREATE TABLE t3 (a INT, b INT) CHARSET=utf8;
@ -111,11 +105,7 @@ NULL 3 6
NULL 4 2 NULL 4 2
NULL 5 10 NULL 5 10
NULL 6 12 NULL 6 12
**** Resetting master and slave **** include/rpl_reset.inc
include/stop_slave.inc
RESET SLAVE;
RESET MASTER;
include/start_slave.inc
CREATE TABLE t7 (UNIQUE(b)) SELECT a,b FROM tt3; CREATE TABLE t7 (UNIQUE(b)) SELECT a,b FROM tt3;
ERROR 23000: Duplicate entry '2' for key 'b' ERROR 23000: Duplicate entry '2' for key 'b'
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
@ -140,11 +130,7 @@ a b
1 2 1 2
2 4 2 4
3 6 3 6
**** Resetting master and slave **** include/rpl_reset.inc
include/stop_slave.inc
RESET SLAVE;
RESET MASTER;
include/start_slave.inc
CREATE TEMPORARY TABLE tt4 (a INT, b INT); CREATE TEMPORARY TABLE tt4 (a INT, b INT);
INSERT INTO tt4 VALUES (4,8), (5,10), (6,12); INSERT INTO tt4 VALUES (4,8), (5,10), (6,12);
BEGIN; BEGIN;
@ -174,11 +160,7 @@ a b
4 8 4 8
5 10 5 10
6 12 6 12
**** Resetting master and slave **** include/rpl_reset.inc
include/stop_slave.inc
RESET SLAVE;
RESET MASTER;
include/start_slave.inc
CREATE TABLE t8 LIKE t4; CREATE TABLE t8 LIKE t4;
CREATE TABLE t9 LIKE tt4; CREATE TABLE t9 LIKE tt4;
CREATE TEMPORARY TABLE tt5 LIKE t4; CREATE TEMPORARY TABLE tt5 LIKE t4;
@ -219,15 +201,12 @@ Create Table CREATE TABLE `t9` (
) ENGINE=MEMORY DEFAULT CHARSET=latin1 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8,t9; DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8,t9;
STOP SLAVE; STOP SLAVE;
include/wait_for_slave_to_stop.inc
SET GLOBAL storage_engine=@storage_engine; SET GLOBAL storage_engine=@storage_engine;
START SLAVE; START SLAVE;
include/wait_for_slave_to_start.inc
================ BUG#22864 ================ ================ BUG#22864 ================
stop slave; include/rpl_reset.inc
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
SET AUTOCOMMIT=0; SET AUTOCOMMIT=0;
CREATE TABLE t1 (a INT); CREATE TABLE t1 (a INT);
INSERT INTO t1 VALUES (1),(2),(3); INSERT INTO t1 VALUES (1),(2),(3);
@ -333,10 +312,7 @@ a
3 3
DROP TABLE IF EXISTS t1,t2,t3,t4; DROP TABLE IF EXISTS t1,t2,t3,t4;
SET AUTOCOMMIT=1; SET AUTOCOMMIT=1;
STOP SLAVE; include/rpl_reset.inc
RESET SLAVE;
RESET MASTER;
START SLAVE;
CREATE TABLE t1 (a INT); CREATE TABLE t1 (a INT);
INSERT INTO t1 VALUES (1),(2),(3); INSERT INTO t1 VALUES (1),(2),(3);
CREATE TABLE t2 (a INT) ENGINE=INNODB; CREATE TABLE t2 (a INT) ENGINE=INNODB;
@ -377,11 +353,7 @@ a
6 6
9 9
TRUNCATE TABLE t2; TRUNCATE TABLE t2;
**** Resetting master and slave **** include/rpl_reset.inc
include/stop_slave.inc
RESET SLAVE;
RESET MASTER;
include/start_slave.inc
BEGIN; BEGIN;
INSERT INTO t2 SELECT a*a FROM t1; INSERT INTO t2 SELECT a*a FROM t1;
CREATE TEMPORARY TABLE tt2 CREATE TEMPORARY TABLE tt2
@ -396,6 +368,12 @@ SELECT * FROM t2 ORDER BY a;
a a
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # BEGIN
master-bin.000001 # Table_map # # table_id: # (test.t2)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Table_map # # table_id: # (test.t2)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # ROLLBACK
SELECT * FROM t2 ORDER BY a; SELECT * FROM t2 ORDER BY a;
a a
DROP TABLE t1,t2; DROP TABLE t1,t2;
@ -412,12 +390,7 @@ a
1 1
2 2
DROP TABLE t1; DROP TABLE t1;
stop slave; include/rpl_reset.inc
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
DROP DATABASE IF EXISTS mysqltest1; DROP DATABASE IF EXISTS mysqltest1;
CREATE DATABASE mysqltest1; CREATE DATABASE mysqltest1;
CREATE TABLE mysqltest1.without_select (f1 BIGINT); CREATE TABLE mysqltest1.without_select (f1 BIGINT);
@ -435,12 +408,7 @@ master-bin.000001 # Table_map # # table_id: # (mysqltest1.with_select)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
DROP DATABASE mysqltest1; DROP DATABASE mysqltest1;
stop slave; include/rpl_reset.inc
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
CREATE TEMPORARY TABLE t7(c1 INT); CREATE TEMPORARY TABLE t7(c1 INT);
CREATE TABLE t5(c1 INT); CREATE TABLE t5(c1 INT);
CREATE TABLE t4(c1 INT); CREATE TABLE t4(c1 INT);
@ -461,4 +429,5 @@ DROP VIEW IF EXISTS bug48506_t1, bug48506_t2, bug48506_t3;
DROP TEMPORARY TABLES t7; DROP TEMPORARY TABLES t7;
DROP TABLES t4, t5; DROP TABLES t4, t5;
DROP TABLES IF EXISTS bug48506_t4; DROP TABLES IF EXISTS bug48506_t4;
include/rpl_end.inc
end of the tests end of the tests