mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-07 23:54:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
mysql-test/t/rpl000001.test:
  test for coredump on slave while trying to print aborted query
sql/slave.cc:
  do not coredump printing aborted query if it has % in it.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
This commit is contained in:
unknown 2001-10-05 13:18:18 -06:00
commit 9def70036f
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
BitKeeper/etc/logging_ok
View file

@ -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

4
mysql-test/t/rpl000001.test
View file

@ -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;

2
sql/slave.cc
View file

@ -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;