diff options
| author | unknown <igreenhoe/greenman@anubis.greendragongames.com> | 2006-07-13 16:35:25 -0700 |
|---|---|---|
| committer | unknown <igreenhoe/greenman@anubis.greendragongames.com> | 2006-07-13 16:35:25 -0700 |
| commit | 6471005c629b4a2bb6e1fd93ea236e8d259c06ed (patch) | |
| tree | ade4a3fc40348d0802ec1bbd31d554eaa91edfd3 /mysql-test/r/mysqldump-max.result | |
| parent | 3630e829f1323769589d852805d416d14bb5bef8 (diff) | |
| parent | f098cab93eb14cd470bcc229387c635077d38107 (diff) | |
| download | mariadb-git-6471005c629b4a2bb6e1fd93ea236e8d259c06ed.tar.gz | |
4.1 -> 5.0 merge
client/mysql.cc:
Auto merged
client/sql_string.h:
Auto merged
configure.in:
Auto merged
myisam/mi_create.c:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_string.h:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/mysqldump-max.result')
0 files changed, 0 insertions, 0 deletions