diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index c3643d477b3..a221148e3d5 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -3,3 +3,4 @@ monty@hundin.mysql.fi paul@central.snake.net serg@serg.mysql.com monty@work.mysql.com +sasha@mysql.sashanet.com diff --git a/mysql-test/t/rpl000001.test b/mysql-test/t/rpl000001.test index 54882d7bd43..113a9637dac 100644 --- a/mysql-test/t/rpl000001.test +++ b/mysql-test/t/rpl000001.test @@ -42,10 +42,10 @@ save_master_pos; connection master1; #avoid generating result 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; -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; sleep 2; select (@id := id) - id from t2; diff --git a/sql/slave.cc b/sql/slave.cc index 5836ac441e1..b550b849a09 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -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 START;", thd->query); last_slave_errno = expected_error; - sql_print_error(last_slave_error); + sql_print_error("%s",last_slave_error); return 1; default: return 0;