diff options
| author | unknown <konstantin@mysql.com> | 2006-07-01 22:13:42 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-07-01 22:13:42 +0400 |
| commit | 02925cc5b1a93a228a14766977d69a76cfac272f (patch) | |
| tree | d95c3da90bd35eba6d137fa33a19459f9bdaf82f /mysql-test/r/strict.result | |
| parent | 00a191d1cecfbb657c67f07ffe25f0d9b7fb4a1a (diff) | |
| parent | 5c1b5f020be0615c3fd3d867f384233b981d4cfd (diff) | |
| download | mariadb-git-02925cc5b1a93a228a14766977d69a76cfac272f.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-runtime
mysql-test/r/func_sapdb.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/t/func_sapdb.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql/item.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/strict.result')
0 files changed, 0 insertions, 0 deletions