diff options
author | unknown <kostja@bodhi.(none)> | 2007-06-01 20:06:13 +0400 |
---|---|---|
committer | unknown <kostja@bodhi.(none)> | 2007-06-01 20:06:13 +0400 |
commit | f42bcd7774b09cd05fcb4a9e29496de5b8ebb33a (patch) | |
tree | 3ab7a7c92bcb7bdb6e975b363dbc04919e6e459e /mysys/my_getsystime.c | |
parent | 8d2119e95fececfaa656283450baf2394280378b (diff) | |
parent | 75485dc3498596b53d3e0eb04e6f4fe101996908 (diff) | |
download | mariadb-git-f42bcd7774b09cd05fcb4a9e29496de5b8ebb33a.tar.gz |
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/strict.test:
Auto merged
Diffstat (limited to 'mysys/my_getsystime.c')
0 files changed, 0 insertions, 0 deletions