diff options
| author | unknown <konstantin@mysql.com> | 2006-02-02 23:35:23 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-02-02 23:35:23 +0300 |
| commit | cf4b6ee4c01ca9e002511ad221872b4182b910fa (patch) | |
| tree | 336ed0f3ebd53f06d2b14904f4fd937b5fe487c6 /mysql-test/r/kill.result | |
| parent | 95a3509a6637699fdcc26d7042013778c5e55d08 (diff) | |
| parent | 86f9bdf8b2e5ea624e3eff2962c531b8c3c6e3c0 (diff) | |
| download | mariadb-git-cf4b6ee4c01ca9e002511ad221872b4182b910fa.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-root
mysql-test/r/date_formats.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
sql/item_timefunc.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/kill.result')
0 files changed, 0 insertions, 0 deletions