Commit a17173c7 authored by monty@work.mysql.com's avatar monty@work.mysql.com
Browse files

Merge work.mysql.com:/home/bk/mysql 

into work.mysql.com:/home/bk/mysql-4.0
parents b43f9005 1bea4bd3

mysql-test/t/rpl000001.test

+2 −2
Original line number Diff line number Diff line
@@ -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;

sql/slave.cc

+1 −1
Original line number Diff line number Diff line
@@ -925,7 +925,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;