1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

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
This commit is contained in:
unknown
2006-11-10 15:05:38 +03:00
19 changed files with 389 additions and 72 deletions

View File

@ -54,3 +54,4 @@ Tables_in_test
t2
t4
drop table t2, t4;
End of 4.1 tests