mirror of
https://github.com/MariaDB/server.git
synced 2025-08-26 01:44:06 +03:00
into hynda.mysql.fi:/home/my/mysql-maria BitKeeper/etc/ignore: auto-union BUILD/SETUP.sh: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~99a50df6: Auto merged Makefile.am: Auto merged client/mysqldump.c: Auto merged configure.in: Auto merged include/Makefile.am: Auto merged include/keycache.h: Auto merged include/m_string.h: Auto merged include/my_sys.h: Auto merged libmysqld/Makefile.am: Auto merged mysql-test/extra/rpl_tests/rpl_insert_delayed.test: Auto merged mysql-test/lib/mtr_cases.pl: Auto merged mysql-test/lib/mtr_misc.pl: Auto merged mysql-test/lib/mtr_process.pl: Auto merged mysql-test/lib/mtr_report.pl: Auto merged mysql-test/lib/mtr_timer.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/alter_table.result: Auto merged mysql-test/r/merge.result: Auto merged mysql-test/r/mysqldump.result: Auto merged mysql-test/r/query_cache.result: Auto merged mysql-test/r/subselect.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/suite/ndb/r/ps_7ndb.result: Auto merged mysql-test/suite/rpl/r/rpl_events.result: Auto merged mysql-test/suite/rpl/r/rpl_insert.result: Auto merged mysql-test/suite/rpl/r/rpl_row_insert_delayed.result: Auto merged mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result: Auto merged mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result: Auto merged mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result: Auto merged mysql-test/suite/rpl/t/rpl_insert.test: Auto merged mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test: Auto merged mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test: Auto merged mysql-test/t/alter_table.test: Auto merged mysql-test/t/myisam.test: Auto merged mysql-test/t/mysqldump.test: Auto merged mysql-test/t/query_cache.test: Auto merged mysql-test/t/subselect.test: Auto merged mysql-test/t/view.test: Auto merged mysys/array.c: Auto merged mysys/mf_keycache.c: Auto merged mysys/my_init.c: Auto merged mysys/my_symlink2.c: Auto merged mysys/safemalloc.c: Auto merged mysys/thr_lock.c: Auto merged sql/Makefile.am: Auto merged sql/filesort.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/ha_partition.cc: Auto merged sql/ha_partition.h: Auto merged sql/handler.h: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_xmlfunc.cc: Auto merged sql/lock.cc: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/net_serv.cc: Auto merged sql/opt_range.cc: Auto merged sql/set_var.cc: Auto merged sql/slave.cc: Auto merged sql/slave.h: Auto merged sql/sql_class.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/share/errmsg.txt: Auto merged sql/sql_test.cc: Auto merged sql/table.h: Auto merged sql/udf_example.c: Auto merged sql/uniques.cc: Auto merged sql/unireg.cc: Auto merged storage/csv/ha_tina.h: Auto merged storage/myisam/ft_boolean_search.c: Auto merged storage/myisam/ft_nlq_search.c: Auto merged storage/myisam/ft_parser.c: Auto merged storage/myisam/ft_stopwords.c: Auto merged storage/myisam/ha_myisam.cc: Auto merged storage/myisam/ha_myisam.h: Auto merged storage/myisam/mi_check.c: Auto merged storage/myisam/mi_create.c: Auto merged storage/myisam/mi_delete.c: Auto merged storage/myisam/mi_dynrec.c: Auto merged storage/myisam/mi_extra.c: Auto merged storage/myisam/mi_key.c: Auto merged storage/myisam/mi_locking.c: Auto merged storage/myisam/mi_log.c: Auto merged storage/myisam/mi_packrec.c: Auto merged storage/myisam/mi_rkey.c: Auto merged storage/myisam/mi_search.c: Auto merged storage/myisam/mi_test1.c: Auto merged storage/myisam/mi_test2.c: Auto merged storage/myisam/mi_update.c: Auto merged storage/myisam/mi_write.c: Auto merged storage/myisam/myisamchk.c: Auto merged storage/myisam/myisamlog.c: Auto merged storage/myisam/myisampack.c: Auto merged storage/myisam/sort.c: Auto merged storage/myisam/sp_test.c: Auto merged storage/myisammrg/ha_myisammrg.cc: Auto merged storage/myisammrg/ha_myisammrg.h: Auto merged storage/ndb/src/mgmapi/mgmapi.cpp: Auto merged support-files/compiler_warnings.supp: Auto merged client/mysqltest.c: Manual merge between mysql-5.1 and mysql-maria include/my_base.h: Manual merge between mysql-5.1 and mysql-maria include/my_global.h: Manual merge between mysql-5.1 and mysql-maria include/myisam.h: Manual merge between mysql-5.1 and mysql-maria libmysql/Makefile.shared: Manual merge between mysql-5.1 and mysql-maria mysql-test/r/events_logs_tests.result: Manual merge between mysql-5.1 and mysql-maria mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result: Manual merge between mysql-5.1 and mysql-maria mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test: Manual merge between mysql-5.1 and mysql-maria mysql-test/t/disabled.def: Manual merge between mysql-5.1 and mysql-maria mysql-test/t/events_logs_tests.test: Manual merge between mysql-5.1 and mysql-maria mysys/my_compress.c: Manual merge between mysql-5.1 and mysql-maria mysys/my_getsystime.c: Manual merge between mysql-5.1 and mysql-maria mysys/my_open.c: Manual merge between mysql-5.1 and mysql-maria sql/handler.cc: Manual merge between mysql-5.1 and mysql-maria sql/set_var.h: Manual merge between mysql-5.1 and mysql-maria sql/sql_class.h: Manual merge between mysql-5.1 and mysql-maria sql/sql_show.cc: Manual merge between mysql-5.1 and mysql-maria sql/sql_sort.h: Manual merge between mysql-5.1 and mysql-maria sql/sql_yacc.yy: Manual merge between mysql-5.1 and mysql-maria sql/table.cc: Manual merge between mysql-5.1 and mysql-maria storage/csv/ha_tina.cc: Manual merge between mysql-5.1 and mysql-maria storage/myisam/mi_open.c: Manual merge between mysql-5.1 and mysql-maria storage/myisam/myisamdef.h: Manual merge between mysql-5.1 and mysql-maria unittest/mysys/my_atomic-t.c: Manual merge between mysql-5.1 and mysql-maria
141 lines
3.8 KiB
Plaintext
141 lines
3.8 KiB
Plaintext
# The two bugs below (BUG#25507 and BUG#26116) existed only in
|
|
# statement-based binlogging; we test that now they are fixed;
|
|
# we also test that mixed and row-based binlogging work too,
|
|
# for completeness.
|
|
|
|
connection master;
|
|
--disable_warnings
|
|
CREATE SCHEMA IF NOT EXISTS mysqlslap;
|
|
USE mysqlslap;
|
|
--enable_warnings
|
|
|
|
select @@global.binlog_format;
|
|
|
|
#
|
|
# BUG#25507 "multi-row insert delayed + auto increment causes
|
|
# duplicate key entries on slave";
|
|
# happened only in statement-based binlogging.
|
|
#
|
|
|
|
CREATE TABLE t1 (id INT primary key auto_increment, name VARCHAR(64)) ENGINE=MyISAM;
|
|
let $query = "INSERT DELAYED INTO t1 VALUES (null, 'Dr. No'), (null, 'From Russia With Love'), (null, 'Goldfinger'), (null, 'Thunderball'), (null, 'You Only Live Twice')";
|
|
--exec $MYSQL_SLAP --silent --concurrency=5 --iterations=200 --query=$query --delimiter=";"
|
|
|
|
FLUSH TABLE t1; # another way to be sure INSERT DELAYED has inserted
|
|
SELECT COUNT(*) FROM t1;
|
|
# when bug existed slave failed below ("duplicate key" error at random INSERT)
|
|
sync_slave_with_master;
|
|
use mysqlslap;
|
|
SELECT COUNT(*) FROM t1;
|
|
|
|
#
|
|
# BUG#26116 "If multi-row INSERT DELAYED has errors,
|
|
# statement-based binlogging breaks";
|
|
# happened only in statement-based binlogging.
|
|
#
|
|
|
|
connection master;
|
|
truncate table t1;
|
|
# first scenario: duplicate on first row
|
|
insert delayed into t1 values(10, "my name");
|
|
if ($binlog_format_statement)
|
|
{
|
|
# statement below will be converted to non-delayed INSERT and so
|
|
# will stop at first error, guaranteeing replication.
|
|
--error ER_DUP_ENTRY
|
|
insert delayed into t1 values(10, "is Bond"), (20, "James Bond");
|
|
}
|
|
if (!$binlog_format_statement)
|
|
{
|
|
insert delayed into t1 values(10, "is Bond"), (20, "James Bond");
|
|
}
|
|
flush table t1; # to wait for INSERT DELAYED to be done
|
|
select * from t1;
|
|
sync_slave_with_master;
|
|
# when bug existed in statement-based binlogging, t1 on slave had
|
|
# different content from on master
|
|
select * from t1;
|
|
|
|
# second scenario: duplicate on second row
|
|
connection master;
|
|
delete from t1 where id!=10;
|
|
if ($binlog_format_statement)
|
|
{
|
|
# statement below will be converted to non-delayed INSERT and so
|
|
# will be binlogged with its ER_DUP_ENTRY error code, guaranteeing
|
|
# replication (slave will hit the same error code and so be fine).
|
|
--error ER_DUP_ENTRY
|
|
insert delayed into t1 values(20, "is Bond"), (10, "James Bond");
|
|
}
|
|
if (!$binlog_format_statement)
|
|
{
|
|
insert delayed into t1 values(20, "is Bond"), (10, "James Bond");
|
|
}
|
|
flush table t1; # to wait for INSERT DELAYED to be done
|
|
select * from t1;
|
|
sync_slave_with_master;
|
|
# when bug existed in statement-based binlogging, query was binlogged
|
|
# with error_code=0 so slave stopped
|
|
select * from t1;
|
|
|
|
# clean up
|
|
connection master;
|
|
USE test;
|
|
DROP SCHEMA mysqlslap;
|
|
sync_slave_with_master;
|
|
use test;
|
|
connection master;
|
|
|
|
#
|
|
# Bug #29571: INSERT DELAYED IGNORE written to binary log on the master but
|
|
# on the slave
|
|
#
|
|
if (`SELECT @@global.binlog_format != 'ROW'`)
|
|
{
|
|
#flush the logs before the test
|
|
connection slave;
|
|
FLUSH LOGS;
|
|
connection master;
|
|
FLUSH LOGS;
|
|
}
|
|
|
|
CREATE TABLE t1(a int, UNIQUE(a));
|
|
INSERT DELAYED IGNORE INTO t1 VALUES(1);
|
|
INSERT DELAYED IGNORE INTO t1 VALUES(1);
|
|
flush table t1; # to wait for INSERT DELAYED to be done
|
|
|
|
if (`SELECT @@global.binlog_format != 'ROW'`)
|
|
{
|
|
#must show two INSERT DELAYED
|
|
--replace_column 1 x 2 x 3 x 4 x 5 x
|
|
show binlog events in 'master-bin.000002' LIMIT 2,2;
|
|
}
|
|
select * from t1;
|
|
|
|
sync_slave_with_master;
|
|
echo On slave;
|
|
if (`SELECT @@global.binlog_format != 'ROW'`)
|
|
{
|
|
#must show two INSERT DELAYED
|
|
--replace_column 1 x 2 x 3 x 4 x 5 x
|
|
show binlog events in 'slave-bin.000002' LIMIT 2,2;
|
|
}
|
|
select * from t1;
|
|
|
|
|
|
# clean up
|
|
connection master;
|
|
drop table t1;
|
|
sync_slave_with_master;
|
|
if (`SELECT @@global.binlog_format != 'ROW'`)
|
|
{
|
|
#flush the logs after the test
|
|
FLUSH LOGS;
|
|
connection master;
|
|
FLUSH LOGS;
|
|
}
|
|
connection master;
|
|
|
|
|
|
--echo End of 5.0 tests
|