diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-09-23 14:37:22 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-09-23 14:37:22 +0200 |
| commit | 72a8049b0dda6e06d893f3be64a2aced4c94eed4 (patch) | |
| tree | 2eaeadd57a23c5370c6f6a873954cbf3dd210ccf /myisam/myisamchk.c | |
| parent | 129300f13dbc77d77c0f25aebcf70e209041c609 (diff) | |
| download | mariadb-git-72a8049b0dda6e06d893f3be64a2aced4c94eed4.tar.gz | |
Merge from 4.1 to 5.0
mysql-test/r/loaddata.result:
Add drop tablea after test case
mysql-test/r/type_decimal.result:
Update warnings
mysql-test/r/union.result:
Miss in merge
mysql-test/t/loaddata.test:
Add drop table after test case
sql/opt_sum.cc:
Add missing }
sql/sql_load.cc:
Manual merge
Diffstat (limited to 'myisam/myisamchk.c')
0 files changed, 0 insertions, 0 deletions