diff options
| author | unknown <petr/cps@outpost.site> | 2006-11-10 15:05:38 +0300 |
|---|---|---|
| committer | unknown <petr/cps@outpost.site> | 2006-11-10 15:05:38 +0300 |
| commit | cb80733a898236445a0bcf893b1d7d3d64d2b03c (patch) | |
| tree | b66a727b703588ca78df0c1428526178a483cba2 /mysql-test/t/rename.test | |
| parent | facaaeb4c4fab01188b0e79ef1c3787a87e5d252 (diff) | |
| parent | 6cf8ceebbfa7c73d933e970c38c3c6aa5a3483c7 (diff) | |
| download | mariadb-git-cb80733a898236445a0bcf893b1d7d3d64d2b03c.tar.gz | |
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1
into outpost.site:/home/cps/mysql/trees/4.1-runtime-bug9191
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
sql-common/my_time.c:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/time.cc:
Auto merged
mysql-test/t/rename.test:
choose one of the race problem solutions. It was solved
differently in -runtime and mainstream
Diffstat (limited to 'mysql-test/t/rename.test')
| -rw-r--r-- | mysql-test/t/rename.test | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mysql-test/t/rename.test b/mysql-test/t/rename.test index b0fb60c0ee4..c32184645c1 100644 --- a/mysql-test/t/rename.test +++ b/mysql-test/t/rename.test @@ -70,4 +70,8 @@ show tables; drop table t2, t4; -# End of 4.1 tests +disconnect con2; +disconnect con1; +connection default; + +--echo End of 4.1 tests |