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 | 35bfad1e3db9d955a135035d4af6665f0331e811 (patch) | |
| tree | ade4a3fc40348d0802ec1bbd31d554eaa91edfd3 /mysql-test/r/mysqldump-max.result | |
| parent | 316577d69537d49d359a1928c6f54194aef19620 (diff) | |
| parent | 3c2bdb59bc19a62f08e9b778649d9f12a9c87eab (diff) | |
| download | mariadb-git-35bfad1e3db9d955a135035d4af6665f0331e811.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