mirror of
https://github.com/MariaDB/server.git
synced 2025-01-21 22:34:18 +01:00
2c86b5ad16
into romeo.(none):/home/bk/w3464-mysql-5.1-new-rpl client/Makefile.am: Auto merged sql/Makefile.am: Auto merged sql/log_event.cc: Auto merged sql/log_event.h: Auto merged sql/rpl_injector.h: Auto merged sql/sql_parse.cc: Auto merged mysql-test/r/ctype_cp932_binlog_stm.result: Manual merge , mysql-test/r/flush_block_commit_notembedded.result: Manual merge mysql-test/r/rpl_000015.result: Manual merge mysql-test/r/rpl_change_master.result: Manual merge mysql-test/r/rpl_deadlock_innodb.result: Manual merge mysql-test/r/rpl_flushlog_loop.result: Manual merge , mysql-test/r/rpl_loaddata.result: manual merge mysql-test/r/rpl_loaddata_s.result: manual merge , mysql-test/r/rpl_log_pos.result: manual merge mysql-test/r/rpl_ndb_charset.result: manual merge mysql-test/r/rpl_ndb_log.result: manual merge , mysql-test/r/rpl_ndb_multi.result: manual merge mysql-test/r/rpl_rbr_to_sbr.result: manual merge mysql-test/r/rpl_rotate_logs.result: Manual merge mysql-test/r/rpl_row_basic_11bugs.result: Manual merge mysql-test/r/rpl_row_charset.result: Manual merge mysql-test/r/rpl_row_create_table.result: Manual merge mysql-test/r/rpl_row_delayed_ins.result: Manual merge mysql-test/r/rpl_row_drop.result: Manual merge mysql-test/r/rpl_row_flsh_tbls.result: Manual merge mysql-test/r/rpl_row_inexist_tbl.result: Manual merge mysql-test/r/rpl_row_log.result: Manual merge mysql-test/r/rpl_row_log_innodb.result: Manual merge mysql-test/r/rpl_row_max_relay_size.result: Manual merge mysql-test/r/rpl_row_reset_slave.result: Manual merge mysql-test/r/rpl_row_until.result: Manual merge mysql-test/r/rpl_server_id1.result: Manual merge mysql-test/r/rpl_server_id2.result: Manual merge mysql-test/r/rpl_sp.result: Manual merge mysql-test/r/rpl_stm_charset.result: Manual merge mysql-test/r/rpl_stm_flsh_tbls.result: Manual merge mysql-test/r/rpl_stm_log.result: Manual merge mysql-test/r/rpl_stm_max_relay_size.result: Manual merge mysql-test/r/rpl_stm_multi_query.result: Manual merge mysql-test/r/rpl_stm_reset_slave.result: Manual merge mysql-test/r/rpl_stm_until.result: Manual merge mysql-test/r/rpl_switch_stm_row_mixed.result: Manual merge mysql-test/r/rpl_truncate_2myisam.result: Manual merge mysql-test/r/rpl_truncate_3innodb.result: Manual merge mysql-test/r/rpl_truncate_7ndb.result: Manual merge mysql-test/r/user_var-binlog.result: Manual merge mysql-test/t/binlog_row_mix_innodb_myisam.test: Manual merge mysql-test/extra/binlog_tests/binlog.test: Binlog position change. mysql-test/extra/binlog_tests/binlog_insert_delayed.test: Binlog position change. mysql-test/extra/binlog_tests/ctype_cp932_binlog.test: Binlog position change. mysql-test/extra/binlog_tests/ctype_ucs_binlog.test: Binlog position change. mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test: Binlog position change. mysql-test/extra/rpl_tests/rpl_deadlock.test: Binlog position change. mysql-test/extra/rpl_tests/rpl_log.test: Binlog position change. mysql-test/extra/rpl_tests/rpl_multi_query.test: Binlog position change. mysql-test/extra/rpl_tests/rpl_row_charset.test: Binlog position change. mysql-test/extra/rpl_tests/rpl_stm_charset.test: Binlog position change. mysql-test/include/show_binlog_events.inc: Binlog position change. mysql-test/r/binlog_row_binlog.result: Result change mysql-test/r/binlog_row_ctype_ucs.result: Result change mysql-test/r/binlog_row_insert_select.result: Result change mysql-test/r/binlog_row_mix_innodb_myisam.result: Result change mysql-test/r/binlog_stm_binlog.result: Result change mysql-test/r/binlog_stm_ctype_ucs.result: Result change mysql-test/r/binlog_stm_insert_select.result: Result change mysql-test/r/binlog_stm_mix_innodb_myisam.result: Result change mysql-test/r/ctype_cp932_binlog_row.result: Result change mysql-test/t/binlog_stm_mix_innodb_myisam.test: Binlog position change. mysql-test/t/ctype_cp932_binlog_stm.test: Binlog position change. mysql-test/t/mysqlbinlog.test: Binlog position change. mysql-test/t/mysqlbinlog2.test: Binlog position change. mysql-test/t/rpl_loaddata_s.test: Binlog position change. mysql-test/t/rpl_log_pos.test: Binlog position change. mysql-test/t/rpl_row_basic_11bugs.test: Binlog position change. mysql-test/t/rpl_row_create_table.test: Binlog position change. mysql-test/t/rpl_row_flsh_tbls.test: Binlog position change. mysql-test/t/rpl_row_mysqlbinlog.test: Binlog position change. mysql-test/t/rpl_sp.test: Binlog position change. mysql-test/t/rpl_stm_flsh_tbls.test: Binlog position change. mysql-test/t/rpl_switch_stm_row_mixed.test: Binlog position change. mysql-test/t/user_var-binlog.test: Binlog position change. sql/share/errmsg.txt: Merging error messages
184 lines
4.9 KiB
Text
184 lines
4.9 KiB
Text
--source include/have_binlog_format_row.inc
|
|
|
|
|
|
let $SERVER_VERSION=`select version()`;
|
|
|
|
#This test case is not written for NDB, the result files
|
|
#will not match when NDB is the default engine
|
|
-- source include/not_ndb_default.inc
|
|
|
|
--source include/master-slave.inc
|
|
|
|
# Bug#15942 (RBR ignores --binlog_ignore_db and tries to map to table
|
|
# on slave for writes)
|
|
|
|
CREATE DATABASE test_ignore; # --binlog_ignore_db=mysqltest_ignore
|
|
|
|
--echo **** On Master ****
|
|
SHOW DATABASES;
|
|
USE test;
|
|
CREATE TABLE t1 (a INT, b INT);
|
|
SHOW TABLES;
|
|
INSERT INTO t1 VALUES (1,1), (2,2);
|
|
USE test_ignore;
|
|
CREATE TABLE t2 (a INT, b INT);
|
|
SHOW TABLES;
|
|
INSERT INTO t2 VALUES (3,3), (4,4);
|
|
source include/show_binlog_events.inc;
|
|
sync_slave_with_master;
|
|
--echo **** On Slave ****
|
|
SHOW DATABASES;
|
|
USE test;
|
|
SHOW TABLES;
|
|
--error 1049
|
|
USE test_ignore;
|
|
|
|
connection master;
|
|
DROP DATABASE test_ignore;
|
|
sync_slave_with_master;
|
|
|
|
# Bug#19995: Extreneous table maps generated for statements that does
|
|
# not generate rows
|
|
--disable_query_log
|
|
--source include/master-slave-reset.inc
|
|
--enable_query_log
|
|
|
|
connection master;
|
|
CREATE TABLE t1 (a INT);
|
|
DELETE FROM t1;
|
|
INSERT INTO t1 VALUES (1),(2);
|
|
DELETE FROM t1 WHERE a = 0;
|
|
UPDATE t1 SET a=99 WHERE a = 0;
|
|
--replace_result $SERVER_VERSION SERVER_VERSION
|
|
--replace_regex /table_id: [0-9]+/table_id: #/
|
|
SHOW BINLOG EVENTS;
|
|
|
|
DROP TABLE t1;
|
|
|
|
# BUG#17620: Replicate (Row Based) Fails when Query Cache enabled on
|
|
# slave
|
|
--echo ================ Test for BUG#17620 ================
|
|
--disable_query_log
|
|
--source include/master-slave-reset.inc
|
|
--enable_query_log
|
|
|
|
--echo **** On Slave ****
|
|
connection slave;
|
|
SET GLOBAL QUERY_CACHE_SIZE=0;
|
|
|
|
--echo **** On Master ****
|
|
connection master;
|
|
CREATE TABLE t1 (a INT);
|
|
INSERT INTO t1 VALUES (1),(2),(3);
|
|
|
|
--echo **** On Slave ****
|
|
sync_slave_with_master;
|
|
SET GLOBAL QUERY_CACHE_SIZE=16*1024*1024;
|
|
|
|
--echo **** On Master ****
|
|
connection master;
|
|
INSERT INTO t1 VALUES (4),(5),(6);
|
|
|
|
--echo **** On Slave ****
|
|
sync_slave_with_master;
|
|
SELECT * FROM t1;
|
|
|
|
--echo **** On Master ****
|
|
connection master;
|
|
INSERT INTO t1 VALUES (7),(8),(9);
|
|
|
|
--echo **** On Slave ****
|
|
sync_slave_with_master;
|
|
SELECT * FROM t1;
|
|
|
|
SET GLOBAL QUERY_CACHE_SIZE=0;
|
|
|
|
# Bug#22550: Replication of BIT columns failing
|
|
--echo ================ Test for BUG#22550 ================
|
|
--disable_query_log
|
|
--source include/master-slave-reset.inc
|
|
--enable_query_log
|
|
|
|
connection master;
|
|
CREATE TABLE t1 (a BIT(1), b INT) ENGINE=MYISAM;
|
|
sync_slave_with_master;
|
|
|
|
connection master;
|
|
INSERT INTO t1 VALUES(1,2);
|
|
SELECT HEX(a),b FROM t1;
|
|
sync_slave_with_master;
|
|
SELECT HEX(a),b FROM t1;
|
|
|
|
connection master;
|
|
UPDATE t1 SET a=0 WHERE b=2;
|
|
SELECT HEX(a),b FROM t1;
|
|
sync_slave_with_master;
|
|
SELECT HEX(a),b FROM t1;
|
|
|
|
connection master;
|
|
DROP TABLE IF EXISTS t1;
|
|
sync_slave_with_master;
|
|
|
|
# BUG#22583: RBR between MyISAM and non-MyISAM tables containing a BIT
|
|
# field does not work
|
|
|
|
--echo ================ Test for BUG#22583 ================
|
|
--disable_query_log
|
|
--source include/master-slave-reset.inc
|
|
--enable_query_log
|
|
|
|
--echo **** On Master ****
|
|
connection master;
|
|
CREATE TABLE t1_myisam (k INT, a BIT(1), b BIT(9)) ENGINE=MYISAM;
|
|
CREATE TABLE t1_innodb (k INT, a BIT(1), b BIT(9)) ENGINE=INNODB;
|
|
CREATE TABLE t2_myisam (k INT, a BIT(1) NOT NULL, b BIT(4) NOT NULL) ENGINE=MYISAM;
|
|
CREATE TABLE t2_innodb (k INT, a BIT(1) NOT NULL, b BIT(4) NOT NULL) ENGINE=INNODB;
|
|
--echo **** On Slave ****
|
|
sync_slave_with_master;
|
|
ALTER TABLE t1_myisam ENGINE=INNODB;
|
|
ALTER TABLE t1_innodb ENGINE=MYISAM;
|
|
ALTER TABLE t2_myisam ENGINE=INNODB;
|
|
ALTER TABLE t2_innodb ENGINE=MYISAM;
|
|
|
|
--echo **** On Master ****
|
|
connection master;
|
|
INSERT INTO t1_myisam VALUES(1, b'0', 257);
|
|
INSERT INTO t1_myisam VALUES(2, b'1', 256);
|
|
INSERT INTO t1_innodb VALUES(1, b'0', 257);
|
|
INSERT INTO t1_innodb VALUES(2, b'1', 256);
|
|
SELECT k, HEX(a),HEX(b) FROM t1_myisam;
|
|
SELECT k, HEX(a),HEX(b) FROM t1_innodb;
|
|
INSERT INTO t2_myisam VALUES(1, b'0', 9);
|
|
INSERT INTO t2_myisam VALUES(2, b'1', 8);
|
|
INSERT INTO t2_innodb VALUES(1, b'0', 9);
|
|
INSERT INTO t2_innodb VALUES(2, b'1', 8);
|
|
SELECT k, HEX(a),HEX(b) FROM t2_myisam;
|
|
SELECT k, HEX(a),HEX(b) FROM t2_innodb;
|
|
--echo **** On Slave ****
|
|
sync_slave_with_master;
|
|
SELECT k, HEX(a),HEX(b) FROM t1_myisam;
|
|
SELECT k, HEX(a),HEX(b) FROM t1_innodb;
|
|
SELECT k, HEX(a),HEX(b) FROM t2_myisam;
|
|
SELECT k, HEX(a),HEX(b) FROM t2_innodb;
|
|
|
|
--echo **** On Master ****
|
|
connection master;
|
|
UPDATE t1_myisam SET a=0 WHERE k=2;
|
|
SELECT k, HEX(a),HEX(b) FROM t1_myisam;
|
|
UPDATE t1_innodb SET a=0 WHERE k=2;
|
|
SELECT k, HEX(a),HEX(b) FROM t1_innodb;
|
|
UPDATE t2_myisam SET a=0 WHERE k=2;
|
|
SELECT k, HEX(a),HEX(b) FROM t2_myisam;
|
|
UPDATE t2_innodb SET a=0 WHERE k=2;
|
|
SELECT k, HEX(a),HEX(b) FROM t2_innodb;
|
|
--echo **** On Slave ****
|
|
sync_slave_with_master;
|
|
SELECT k, HEX(a),HEX(b) FROM t1_myisam;
|
|
SELECT k, HEX(a),HEX(b) FROM t1_innodb;
|
|
SELECT k, HEX(a),HEX(b) FROM t2_myisam;
|
|
SELECT k, HEX(a),HEX(b) FROM t2_innodb;
|
|
|
|
--echo **** On Master ****
|
|
connection master;
|
|
DROP TABLE IF EXISTS t1_myisam, t1_innodb, t2_myisam, t2_innodb;
|
|
sync_slave_with_master;
|