diff options
| author | Yoni Fogel <yoni@tokutek.com> | 2013-04-17 00:02:19 -0400 |
|---|---|---|
| committer | Yoni Fogel <yoni@tokutek.com> | 2013-04-17 00:02:19 -0400 |
| commit | 5f919625c10c8afa4f514cea0a3bee8467e4a61a (patch) | |
| tree | cf7423890a73cd4b818604982abb9504cafe3682 /storage/tokudb/hatoku_hton.cc | |
| parent | 9e6dffba8970466ce50916726ec6ef259294b356 (diff) | |
| download | mariadb-git-5f919625c10c8afa4f514cea0a3bee8467e4a61a.tar.gz | |
refs #6372 Merge table delete bugfix to main
svn merge https://svn.tokutek.com/tokudb/mysql.com/mysql-5.5.30-6372b https://svn.tokutek.com/tokudb/mysql.com/mysql-5.5.30
svn merge https://svn.tokutek.com/tokudb/mysql.com/mariadb-5.5.30-6372b https://svn.tokutek.com/tokudb/mysql.com/mariadb-5.5.30
svn merge https://svn.tokutek.com/tokudb/mysql/tokudb-engine/tokudb-engine-6372b https://svn.tokutek.com/tokudb/mysql/tokudb-engine/tokudb-engine
git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@55264 c7de825b-a66e-492c-adef-691d508d4ae1
Diffstat (limited to 'storage/tokudb/hatoku_hton.cc')
| -rw-r--r-- | storage/tokudb/hatoku_hton.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/storage/tokudb/hatoku_hton.cc b/storage/tokudb/hatoku_hton.cc index 1cd2e5b87f7..1dc5ede78eb 100644 --- a/storage/tokudb/hatoku_hton.cc +++ b/storage/tokudb/hatoku_hton.cc @@ -370,7 +370,11 @@ static int tokudb_init_func(void *p) { tokudb_hton->state = SHOW_OPTION_YES;
// tokudb_hton->flags= HTON_CAN_RECREATE; // QQQ this came from skeleton
tokudb_hton->flags = HTON_CLOSE_CURSORS_AT_COMMIT;
- tokudb_hton->db_type = DB_TYPE_TOKUDB;
+
+ // we have historically been a dynamic storage engine, so we set db_type according.
+ // however, extended keys is triggered off of the db_type, so tokudb adds another type so that extended keys works
+ tokudb_hton->db_type = DB_TYPE_UNKNOWN;
+ tokudb_hton->other_db_type = DB_TYPE_TOKUDB;
tokudb_hton->create = tokudb_create_handler;
tokudb_hton->close_connection = tokudb_close_connection;
|