diff options
author | unknown <dlenev@mysql.com> | 2004-12-30 21:37:32 +0300 |
---|---|---|
committer | unknown <dlenev@mysql.com> | 2004-12-30 21:37:32 +0300 |
commit | dc09d7f3626241fe34ed0dffa659bb4630ca4bf8 (patch) | |
tree | 8e50594a30d4d0d2a0239ab976ce23fe93ec089c /sql-common | |
parent | 328ecfa73128259c53728812955cca92f6030704 (diff) | |
parent | f7863e30a9a78d3684ad728854e27d0ee9334bd7 (diff) | |
download | mariadb-git-dc09d7f3626241fe34ed0dffa659bb4630ca4bf8.tar.gz |
Manual merge of fix for bugs of #7297 and #7515 into 4.1 tree.
mysql-test/r/func_time.result:
Manual merge.
mysql-test/r/type_datetime.result:
Manual merge.
mysql-test/t/func_time.test:
Manual merge.
mysql-test/t/type_datetime.test:
Manual merge.
sql/item_timefunc.cc:
Manual merge.
sql/item_timefunc.h:
Manual merge.
sql/time.cc:
Manual merge.
Diffstat (limited to 'sql-common')
0 files changed, 0 insertions, 0 deletions