mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 10:31:54 +01:00
Tokutek/mysql#10 use DB_TYPE_TOKUDB in mysql 5.5
This commit is contained in:
parent
affe5ac600
commit
11e4b8b84c
2 changed files with 1 additions and 5 deletions
storage/tokudb
|
@ -166,7 +166,7 @@ PATENT RIGHTS GRANT:
|
|||
|
||||
#elif 50500 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50599
|
||||
// mysql 5.5 and mariadb 5.5
|
||||
#define TOKU_USE_OTHER_DB_TYPE 1
|
||||
#define TOKU_USE_DB_TYPE_TOKUDB 1
|
||||
#define TOKU_INCLUDE_ALTER_56 1
|
||||
#define TOKU_INCLUDE_ALTER_55 1
|
||||
#define TOKU_INCLUDE_ROW_TYPE_COMPRESSION 1
|
||||
|
|
|
@ -335,10 +335,6 @@ static int tokudb_init_func(void *p) {
|
|||
tokudb_hton->db_type = DB_TYPE_TOKUDB;
|
||||
#elif defined(TOKU_USE_DB_TYPE_UNKNOWN) && TOKU_USE_DB_TYPE_UNKNOWN
|
||||
tokudb_hton->db_type = DB_TYPE_UNKNOWN;
|
||||
#elif defined(TOKU_USE_OTHER_DB_TYPE) && TOKU_USE_OTHER_DB_TYPE
|
||||
// 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;
|
||||
#else
|
||||
#error
|
||||
#endif
|
||||
|
|
Loading…
Add table
Reference in a new issue