Kouhei Sutou
null+****@clear*****
Wed Apr 11 16:53:06 JST 2018
Kouhei Sutou 2018-04-11 16:53:06 +0900 (Wed, 11 Apr 2018) New Revision: acb347d4213fbf161ad3593ad1cc65b0c198072f https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f Message: percona: support auto DB type fix It's occurred when you update from < 5.6.16 or < 5.7.10. Modified files: ha_mroonga.cpp Modified: ha_mroonga.cpp (+9 -1) =================================================================== --- ha_mroonga.cpp 2018-04-11 13:18:02 +0900 (f7c0ef68) +++ ha_mroonga.cpp 2018-04-11 16:53:06 +0900 (63b81af0) @@ -1921,6 +1921,11 @@ mrn_fix_db_type_static_rocksdb_db_type() THD *thd = current_thd; + handlerton *tokudb_hton = ha_resolve_by_legacy_type(thd, DB_TYPE_TOKUDB); + if (tokudb_hton) { + return; + } + handlerton *rocksdb_hton = ha_resolve_by_legacy_type(thd, DB_TYPE_ROCKSDB); if (rocksdb_hton) { return; @@ -1970,7 +1975,10 @@ mrn_fix_db_type_static_rocksdb_db_type() if (type != FRMTYPE_TABLE) continue; - if (db_type != DB_TYPE_ROCKSDB) + bool is_target_frm = + ((db_type == DB_TYPE_TOKUDB && !tokudb_hton) || + (db_type == DB_TYPE_ROCKSDB && !rocksdb_hton)); + if (!is_target_frm) continue; File frm_file = mysql_file_open(mrn_key_file_frm, -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-mysql-commit/attachments/20180411/72da2a4b/attachment-0001.htm
