mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 05:22:25 +01:00
0f6047e455
The patch for WL 1563 added a new duplicate key error message so that the key name could be provided instead of the key number. But the error code for the new message was used even though that did not need to change. This could cause unnecessary problems for applications that used the old ER_DUP_ENTRY error code to detect duplicate key errors. mysql-test/t/auto_increment.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/create.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/create_select_tmp.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/ctype_ucs2_def.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/ctype_utf8.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/delayed.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/heap.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/heap_btree.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/heap_hash.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/innodb.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/insert_select.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/insert_update.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/join_outer.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/key.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/merge.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/myisam.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/ndb_basic.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/ndb_charset.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/ndb_index_unique.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/ndb_insert.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/ndb_replace.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/ndb_update.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/replace.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/rpl_err_ignoredtable.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/rpl_ndb_do_table.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/rpl_row_create_table.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/rpl_sp.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/show_check.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/sp-error.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/sp.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/sp_trans.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/sp_trans_log.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/temp_table.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/type_binary.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/type_bit.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/type_bit_innodb.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/type_blob.test: Update ER_DUP_ENTRY-related error message values mysql-test/t/type_varchar.test: Update ER_DUP_ENTRY-related error message values mysql-test/r/create.result: Update ER_DUP_ENTRY-related error message values mysql-test/r/rpl_sp.result: Update ER_DUP_ENTRY-related error message values mysql-test/r/sp.result: Update ER_DUP_ENTRY-related error message values mysql-test/include/mix1.inc: Update ER_DUP_ENTRY-related error message values mysql-test/include/mix2.inc: Update ER_DUP_ENTRY-related error message values mysql-test/include/ps_modify.inc: Update ER_DUP_ENTRY-related error message values mysql-test/include/query_cache.inc: Update ER_DUP_ENTRY-related error message values mysql-test/include/varchar.inc: Update ER_DUP_ENTRY-related error message values mysql-test/extra/binlog_tests/insert_select-binlog.test: Update ER_DUP_ENTRY-related error message values mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test: Update ER_DUP_ENTRY-related error message values mysql-test/extra/rpl_tests/rpl_auto_increment.test: Update ER_DUP_ENTRY-related error message values mysql-test/extra/rpl_tests/rpl_foreign_key.test: Update ER_DUP_ENTRY-related error message values mysql-test/extra/rpl_tests/rpl_insert_delayed.test: Update ER_DUP_ENTRY-related error message values mysql-test/extra/rpl_tests/rpl_insert_id.test: Update ER_DUP_ENTRY-related error message values mysql-test/extra/rpl_tests/rpl_insert_id_pk.test: Update ER_DUP_ENTRY-related error message values mysql-test/extra/rpl_tests/rpl_loaddata.test: Update ER_DUP_ENTRY-related error message values mysql-test/extra/rpl_tests/rpl_row_basic.test: Update ER_DUP_ENTRY-related error message values mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test: Update ER_DUP_ENTRY-related error message values mysql-test/extra/rpl_tests/rpl_trig004.test: Update ER_DUP_ENTRY-related error message values sql/handler.cc: Restore use of ER_DUP_ENTRY error code even when ER_DUP_ENTRY_WITH_KEY_NAME error message is being used. (Bug #28842)
86 lines
2.7 KiB
Text
86 lines
2.7 KiB
Text
# 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));
|
|
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;
|
|
connection master;
|