mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +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.
68 lines
1.8 KiB
PHP
68 lines
1.8 KiB
PHP
# ==== Purpose ====
|
|
#
|
|
# Kill a query in the master connection, and then try to reap the
|
|
# result of the killed query.
|
|
#
|
|
# ==== Usage ====
|
|
#
|
|
# The following variables should be set before sourcing this file.
|
|
#
|
|
# $debug_lock: name of the debug user lock, if set, will release/lock
|
|
# the specified debug lock accordingly, and before
|
|
# sourcing this, connection 'master' should get the user
|
|
# lock and run a query in another thread, which will
|
|
# block before creating statement event.
|
|
#
|
|
# $connection_name: name of the connection that is waiting for the
|
|
# lock, this can not be 'master'
|
|
#
|
|
# $connection_id: id of the connection that is waiting for the lock
|
|
#
|
|
# Example:
|
|
# let $debug_lock=;
|
|
# connection master1;
|
|
# let $connection_name= master1;
|
|
# let $connection_id= `SELECT CONNECTION_ID()`;
|
|
# send CREATE TABLE t1;
|
|
# source kill_query.inc;
|
|
#
|
|
# let $debug_lock= "debug_lock.before_query_log_event";
|
|
# connection master;
|
|
# eval SELECT GET_LOCK($debug_lock, 10);
|
|
# connection master1;
|
|
# let $connection_name= master1;
|
|
# let $connection_id= `SELECT CONNECTION_ID()`;
|
|
# send CREATE TABLE t1;
|
|
# source kill_query.inc;
|
|
|
|
|
|
--echo source include/kill_query.inc;
|
|
disable_query_log;
|
|
disable_result_log;
|
|
connection master;
|
|
|
|
# kill the query that is waiting
|
|
eval kill query $connection_id;
|
|
|
|
if (`SELECT '$debug_lock' != ''`)
|
|
{
|
|
# release the lock to allow binlog continue
|
|
eval SELECT RELEASE_LOCK($debug_lock);
|
|
}
|
|
|
|
# reap the result of the waiting query
|
|
connection $connection_name;
|
|
error 0, 1317, 1307, 1306, 1334, 1305;
|
|
reap;
|
|
|
|
connection master;
|
|
|
|
if (`SELECT '$debug_lock' != ''`)
|
|
{
|
|
# get lock again to make the next query wait
|
|
eval SELECT GET_LOCK($debug_lock, 10);
|
|
}
|
|
|
|
connection $connection_name;
|
|
enable_query_log;
|
|
enable_result_log;
|