summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authorunknown <dlenev@mysql.com>2004-12-30 21:37:32 +0300
committerunknown <dlenev@mysql.com>2004-12-30 21:37:32 +0300
commitdc09d7f3626241fe34ed0dffa659bb4630ca4bf8 (patch)
tree8e50594a30d4d0d2a0239ab976ce23fe93ec089c /sql-common
parent328ecfa73128259c53728812955cca92f6030704 (diff)
parentf7863e30a9a78d3684ad728854e27d0ee9334bd7 (diff)
downloadmariadb-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