diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-11-20 11:14:21 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-11-20 11:14:21 +0100 |
| commit | 0d66c7dd8494e06af70e1f07e210721f4782c459 (patch) | |
| tree | 4e4ef15dcf351ae78c80eafbbf9229a57fe40e06 /storage/tokudb/ha_tokudb.cc | |
| parent | 81e4ce5e31ba0753d7acfab28bc6c3d83bfad1c6 (diff) | |
| download | mariadb-git-0d66c7dd8494e06af70e1f07e210721f4782c459.tar.gz | |
update tokudb to 10.2
Diffstat (limited to 'storage/tokudb/ha_tokudb.cc')
| -rw-r--r-- | storage/tokudb/ha_tokudb.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/tokudb/ha_tokudb.cc b/storage/tokudb/ha_tokudb.cc index 97fadae8b8e..f34ee3be0ed 100644 --- a/storage/tokudb/ha_tokudb.cc +++ b/storage/tokudb/ha_tokudb.cc @@ -428,7 +428,7 @@ static inline bool do_ignore_flag_optimization(THD* thd, TABLE* table, bool opt_ static inline uint get_key_parts(const KEY *key) { #if (50609 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50699) || \ (50700 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50799) || \ - (100009 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100199) + (100009 <= MYSQL_VERSION_ID) return key->user_defined_key_parts; #else return key->key_parts; @@ -2072,7 +2072,7 @@ int ha_tokudb::write_frm_data(DB* db, DB_TXN* txn, const char* frm_name) { size_t frm_len = 0; int error = 0; -#if 100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100199 +#if 100000 <= MYSQL_VERSION_ID error = table_share->read_frm_image((const uchar**)&frm_data,&frm_len); if (error) { goto cleanup; } #else @@ -2112,7 +2112,7 @@ int ha_tokudb::verify_frm_data(const char* frm_name, DB_TXN* txn) { HA_METADATA_KEY curr_key = hatoku_frm_data; // get the frm data from MySQL -#if 100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100199 +#if 100000 <= MYSQL_VERSION_ID error = table_share->read_frm_image((const uchar**)&mysql_frm_data,&mysql_frm_len); if (error) { goto cleanup; |