Kouhei Sutou
null+****@clear*****
Thu Nov 26 17:12:20 JST 2015
Kouhei Sutou 2015-11-26 17:12:20 +0900 (Thu, 26 Nov 2015) New Revision: 3f418ecdcf0b0b4fe6b712bca21e78617e75730d https://github.com/mroonga/mroonga/commit/3f418ecdcf0b0b4fe6b712bca21e78617e75730d Message: wrapper: really really fix a bug that DROP TABLE before SELECT is failed [groonga-dev,03673] Reported by Tomohiro KATO. Thanks!!! Modified files: ha_mroonga.cpp ha_mroonga.hpp Modified: ha_mroonga.cpp (+1 -3) =================================================================== --- ha_mroonga.cpp 2015-11-26 16:48:13 +0900 (18a2479) +++ ha_mroonga.cpp 2015-11-26 17:12:20 +0900 (4deabe0) @@ -4841,12 +4841,10 @@ int ha_mroonga::delete_table(const char *name) } if (!wrap_handlerton) { - bool open_table_to_get_wrap_handlerton = true; -#ifndef MRN_INTERNAL_TABLE_HAVE_FRM + bool open_table_to_get_wrap_handlerton = !mapper.is_temporary_table_name(); if (mapper.is_internal_table_name()) { open_table_to_get_wrap_handlerton = false; } -#endif if (open_table_to_get_wrap_handlerton) { TABLE_LIST table_list; table_list.init_one_table(mapper.db_name(), strlen(mapper.db_name()), Modified: ha_mroonga.hpp (+0 -4) =================================================================== --- ha_mroonga.hpp 2015-11-26 16:48:13 +0900 (44f0d18) +++ ha_mroonga.hpp 2015-11-26 17:12:20 +0900 (ed6ea91) @@ -218,10 +218,6 @@ extern "C" { Alter_inplace_info::ALTER_COLUMN_ORDER #endif -#if !(defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 100106) -# define MRN_INTERNAL_TABLE_HAVE_FRM -#endif - class ha_mroonga; /* structs */ -------------- next part -------------- HTML����������������������������...Download