diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-12-11 09:18:43 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-12-11 09:18:43 +0200 |
| commit | 659d21e929772cd6e7a3b85bc3ab667bd2cf58c6 (patch) | |
| tree | 6269df71542c5b73ad0eb4740601b29234482f8f /mysql-test/r/func_time.result | |
| parent | 8ffb500c663af38867b1db1b86bb0ba1ce6cb395 (diff) | |
| parent | 5d5fc834987d911a6068016aea30f13b2cc70406 (diff) | |
| download | mariadb-git-659d21e929772cd6e7a3b85bc3ab667bd2cf58c6.tar.gz | |
Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/procedure.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/func_time.result')
0 files changed, 0 insertions, 0 deletions