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 | e107535fa2c41862fa0e1faa68d0e693a45f1b64 (patch) | |
| tree | 8e50594a30d4d0d2a0239ab976ce23fe93ec089c /mysql-test/r/ps_5merge.result | |
| parent | 12b08e569431a9d98baf0e2f03d1c024259b3d07 (diff) | |
| parent | 15017480a7d7aba65df4fcab00a922aa8fc0cf01 (diff) | |
| download | mariadb-git-e107535fa2c41862fa0e1faa68d0e693a45f1b64.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 'mysql-test/r/ps_5merge.result')
0 files changed, 0 insertions, 0 deletions