mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
9530126822
When the thread executing a DDL was killed after finished its
execution but before writing the binlog event, the error code in
the binlog event could be set wrongly to ER_SERVER_SHUTDOWN or
ER_QUERY_INTERRUPTED.
This patch fixed the problem by ignoring the kill status when
constructing the event for DDL statements.
This patch also included the following changes in order to
provide the test case.
1) modified mysqltest to support variable for connection command
2) modified mysql-test-run.pl, add new variable MYSQL_SLAVE to
run mysql client against the slave mysqld.
43 lines
1.1 KiB
PHP
43 lines
1.1 KiB
PHP
# ==== Purpose ====
|
|
#
|
|
# Kill a query, sync master with slave, and diff the output of a
|
|
# statement on master and slave to check if statement is correctly
|
|
# replicated.
|
|
#
|
|
# ==== Usage ====
|
|
#
|
|
# connection <CONNECTION>;
|
|
# let $connection_name=<CONNECTION>
|
|
# let $connection_id=`SELECT CONNECTION_ID()`;
|
|
# let $diff_statement=<SQL COMMAND>;
|
|
# send <SQL COMMAND>;
|
|
# source include/kill_query_and_diff_master_slave.inc;
|
|
#
|
|
# Note: <CONNECTION> must not be 'master'.
|
|
#
|
|
# See also kill_query.inc and diff_master_slave.inc for more
|
|
# information
|
|
|
|
source include/kill_query.inc;
|
|
|
|
# Release the debug lock if used, so that the statements in
|
|
# diff_master_slave.inc will not be blocked.
|
|
connection master;
|
|
disable_query_log;
|
|
disable_result_log;
|
|
if (`SELECT '$debug_lock' != ''`)
|
|
{
|
|
eval SELECT RELEASE_LOCK($debug_lock);
|
|
}
|
|
enable_result_log;
|
|
enable_query_log;
|
|
|
|
source include/diff_master_slave.inc;
|
|
|
|
# Acquire the debug lock again if used
|
|
connection master;
|
|
disable_query_log; disable_result_log; if (`SELECT '$debug_lock' !=
|
|
''`) { eval SELECT GET_LOCK($debug_lock, 10); } enable_result_log;
|
|
enable_query_log;
|
|
|
|
connection $connection_name;
|