diff options
author | unknown <timour/tkatchaounov@lapi.mysql.com> | 2007-12-08 23:15:43 +0200 |
---|---|---|
committer | unknown <timour/tkatchaounov@lapi.mysql.com> | 2007-12-08 23:15:43 +0200 |
commit | b74535d7d9db2def6d829037e596d1fa7e58b51d (patch) | |
tree | aa6671068e2fe8449faf5d82c88122ce344de6d6 /mysql-test/t/renamedb.test | |
parent | 790dae3e7db1cb4eba9bcb68c7e21df03c7441ac (diff) | |
parent | b3d8ff4ebd16c418dbce2731a5553c3ae6a47a7f (diff) | |
download | mariadb-git-b74535d7d9db2def6d829037e596d1fa7e58b51d.tar.gz |
Merge lapi.mysql.com:/home/tkatchaounov/mysql/src/5.0#32694
into lapi.mysql.com:/home/tkatchaounov/mysql/src/5.1#32694
mysql-test/r/type_datetime.result:
Auto merged
mysql-test/t/type_datetime.test:
Manual merge for BUG#32694.
sql/item_cmpfunc.cc:
Manual merge for BUG#32694.
Diffstat (limited to 'mysql-test/t/renamedb.test')
0 files changed, 0 insertions, 0 deletions