database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
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)
This commit is contained in:
unknown
2006-11-11 14:51:19 +03:00
parent 2220a3a842 871378bc69
commit 75a0878fbf
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/t/rename.test
View File

@ -60,6 +60,9 @@ send RENAME TABLE t1 TO t2, t3 to t4;
connection con2; connection con2;
show tables; show tables;
UNLOCK TABLES; UNLOCK TABLES;
connection con1;
reap;
connection con2;
# Wait for the the tables to be renamed # Wait for the the tables to be renamed
# i.e the query below succeds # i.e the query below succeds