diff options
author | unknown <msvensson@pilot.blaudden> | 2007-02-20 18:21:14 +0100 |
---|---|---|
committer | unknown <msvensson@pilot.blaudden> | 2007-02-20 18:21:14 +0100 |
commit | da4abd2ecb8566671cb7f1fc51bf98ff4e0d0fdb (patch) | |
tree | 77ee9e3b4855dbc4963004304aa4c66045d0cd4f /include/my_time.h | |
parent | 485ab9a4d5329dea8cbba6de602da576b0467f7f (diff) | |
parent | f10cfb055a493def16503e90bae31ad0e3077238 (diff) | |
download | mariadb-git-da4abd2ecb8566671cb7f1fc51bf98ff4e0d0fdb.tar.gz |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
client/mysqltest.c:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
Diffstat (limited to 'include/my_time.h')
0 files changed, 0 insertions, 0 deletions