1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into work.mysql.com:/home/bk/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
mysql-test/t/rpl000017.test:
  Auto merged
sql/slave.cc:
  Auto merged
This commit is contained in:
unknown 2001-10-07 12:26:03 +02:00
commit d0fe5ce1c7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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