diff options
| author | unknown <monty@work.mysql.com> | 2001-10-07 12:26:03 +0200 |
|---|---|---|
| committer | unknown <monty@work.mysql.com> | 2001-10-07 12:26:03 +0200 |
| commit | d0fe5ce1c7f4297787b2b2f49263fe1ae18d0157 (patch) | |
| tree | 1fb3f8782944fd32e9141416f7c678430bb80846 /mysql-test | |
| parent | c965463333e3bd92697d18ad1d20eded92b1c463 (diff) | |
| parent | 9def70036f82bc3d9338b1584226451bbe88ab96 (diff) | |
| download | mariadb-git-d0fe5ce1c7f4297787b2b2f49263fe1ae18d0157.tar.gz | |
Merge work.mysql.com:/home/bk/mysql
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
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/t/rpl000001.test | 4 |
1 files changed, 2 insertions, 2 deletions
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; |