diff options
| author | unknown <kostja@bodhi.local> | 2006-11-11 14:51:19 +0300 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-11-11 14:51:19 +0300 |
| commit | 75a0878fbf8b2dc2d0eb19fce130a85f38118c89 (patch) | |
| tree | d766f0ab887eefd38ffb8ee547186e23afe1f081 /mysql-test | |
| parent | 2220a3a8429688006e3bbb55be06f4e6e188de28 (diff) | |
| parent | 871378bc697c59f87b99c64d243136948b1f9d6f (diff) | |
| download | mariadb-git-75a0878fbf8b2dc2d0eb19fce130a85f38118c89.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into bodhi.local:/opt/local/work/mysql-5.0-runtime
configure.in:
Auto merged
include/my_time.h:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/rename.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
Auto merged
sql-common/my_time.c:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/time.cc:
Auto merged
mysql-test/t/rename.test:
Use local (resolve a conflict)
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/t/rename.test | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/t/rename.test b/mysql-test/t/rename.test index 28c64a62666..09a02344203 100644 --- a/mysql-test/t/rename.test +++ b/mysql-test/t/rename.test @@ -60,6 +60,9 @@ send RENAME TABLE t1 TO t2, t3 to t4; connection con2; show tables; UNLOCK TABLES; +connection con1; +reap; +connection con2; # Wait for the the tables to be renamed # i.e the query below succeds |