fixed crash on slave when master aborts a query that has % in it.

parent 38d120b0
...@@ -3,3 +3,4 @@ monty@hundin.mysql.fi ...@@ -3,3 +3,4 @@ monty@hundin.mysql.fi
paul@central.snake.net paul@central.snake.net
serg@serg.mysql.com serg@serg.mysql.com
monty@work.mysql.com monty@work.mysql.com
sasha@mysql.sashanet.com
...@@ -42,10 +42,10 @@ save_master_pos; ...@@ -42,10 +42,10 @@ save_master_pos;
connection master1; connection master1;
#avoid generating result #avoid generating result
create temporary table t1_temp(n int); create temporary table t1_temp(n int);
insert into t1_temp select get_lock('crash_lock', 1) from t2; insert into t1_temp select get_lock('crash_lock%20C', 1) from t2;
connection master; connection master;
send update t1 set n = n + get_lock('crash_lock', 2); send update t1 set n = n + get_lock('crash_lock%20C', 2);
connection master1; connection master1;
sleep 2; sleep 2;
select (@id := id) - id from t2; select (@id := id) - id from t2;
......
...@@ -862,7 +862,7 @@ point. If you are sure that your master is ok, run this query manually on the\ ...@@ -862,7 +862,7 @@ point. If you are sure that your master is ok, run this query manually on the\
slave and then restart the slave with SET SQL_SLAVE_SKIP_COUNTER=1;\ slave and then restart the slave with SET SQL_SLAVE_SKIP_COUNTER=1;\
SLAVE START;", thd->query); SLAVE START;", thd->query);
last_slave_errno = expected_error; last_slave_errno = expected_error;
sql_print_error(last_slave_error); sql_print_error("%s",last_slave_error);
return 1; return 1;
default: default:
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment