diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2005-03-09 08:25:12 +0100 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2005-03-09 08:25:12 +0100 |
| commit | 08e23eb602937a5957899e9230f93ca96b25a9ce (patch) | |
| tree | f895f0c4873095d01276914d7b9098e39b3c2b2d /sql/tztime.h | |
| parent | 7ec1e170c75605b003f47298386f1b2c37526567 (diff) | |
| parent | dd2306839a91de388cf4299cb6a13029b75c52ee (diff) | |
| download | mariadb-git-08e23eb602937a5957899e9230f93ca96b25a9ce.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
sql/item.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/tztime.h')
0 files changed, 0 insertions, 0 deletions