diff options
| author | unknown <aivanov@mysql.com> | 2005-12-15 18:59:40 +0300 |
|---|---|---|
| committer | unknown <aivanov@mysql.com> | 2005-12-15 18:59:40 +0300 |
| commit | bf4b5b39102e9502d97330c65a664762366d01e3 (patch) | |
| tree | 76aaa9b0c93271d0dad0165fa08b22b0f1720249 /innobase | |
| parent | 792f813cb9096281ae917b6c036c29a792ac5183 (diff) | |
| parent | 3d6179e7f18b7a453084d84ac632862e8273412c (diff) | |
| download | mariadb-git-bf4b5b39102e9502d97330c65a664762366d01e3.tar.gz | |
Merge mysql.com:/home/alexi/dev/mysql-4.1-12440
into mysql.com:/home/alexi/dev/mysql-5.0-12440
mysql-test/r/type_time.result:
Auto merged
ndb/src/ndbapi/NdbImpl.hpp:
Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
sql-common/my_time.c:
Auto merged
zlib/Makefile.am:
Auto merged
Diffstat (limited to 'innobase')
0 files changed, 0 insertions, 0 deletions