diff options
| author | unknown <guilhem@gbichot3.local> | 2006-10-11 19:30:16 +0300 |
|---|---|---|
| committer | unknown <guilhem@gbichot3.local> | 2006-10-11 19:30:16 +0300 |
| commit | 0a1dc8af5b665647a08c51f75b5d5c2e1a112d99 (patch) | |
| tree | e4dd0db2c850075ae49fa6055cddf626198a7fbe /unittest | |
| parent | abdc4682cdcb26b6980d4999ab6137a53643afbd (diff) | |
| download | mariadb-git-0a1dc8af5b665647a08c51f75b5d5c2e1a112d99.tar.gz | |
Merge of recent MyISAM changes into Maria. Testsuite passes as much
as in the main 5.1 (partition and ndb_alter_table fail).
mysql-test/r/maria.result:
merge from MyISAM
mysql-test/r/ps_maria.result:
merge from MyISAM
mysql-test/t/maria.test:
merge from MyISAM
sql/mysql_priv.h:
fix after wrong merge
sql/mysqld.cc:
fix after wrong merge
sql/set_var.cc:
adding _db like other engines have
storage/maria/Makefile.am:
merge from MyISAM
storage/maria/ha_maria.cc:
merge from MyISAM
storage/maria/ha_maria.h:
merge from MyISAM
storage/maria/ma_check.c:
merge from MyISAM
storage/maria/ma_delete.c:
merge from MyISAM
storage/maria/ma_init.c:
maria_inited should rather be my_bool
storage/maria/ma_locking.c:
merge from MyISAM
storage/maria/ma_packrec.c:
merge from MyISAM
storage/maria/ma_panic.c:
maria_panic() should not take mutex if engine has not been inited.
storage/maria/ma_rkey.c:
merge from MyISAM
storage/maria/ma_write.c:
merge from MyISAM
storage/maria/maria_def.h:
merge from MyISAM. maria_inited is needed for maria_panic().
storage/maria/maria_ftdump.c:
merge from MyISAM
Diffstat (limited to 'unittest')
0 files changed, 0 insertions, 0 deletions