Kouhei Sutou
null+****@clear*****
Thu Oct 4 10:40:53 JST 2012
Kouhei Sutou 2011-11-26 16:56:32 +0900 (Sat, 26 Nov 2011) New Revision: bef0654a60b6577be29c0703183e60c3e50765ee https://github.com/mroonga/mroonga/commit/bef0654a60b6577be29c0703183e60c3e50765ee Log: add MRN_TABLE_LIST_INIT_REQUIRE_ALIAS. Modified files: ha_mroonga.cc ha_mroonga.h Modified: ha_mroonga.cc (+2 -2) =================================================================== --- ha_mroonga.cc 2011-11-26 16:51:15 +0900 (9e4d4ba) +++ ha_mroonga.cc 2011-11-26 16:56:32 +0900 (90c6f13) @@ -2815,7 +2815,7 @@ int ha_mroonga::delete_table(const char *name) } if (!tmp_table_share) { -#if MYSQL_VERSION_ID >= 50500 +#ifdef MRN_TABLE_LIST_INIT_REQUIRE_ALIAS table_list.init_one_table(db_name, strlen(db_name), tbl_name, strlen(tbl_name), tbl_name, TL_WRITE); #else @@ -7296,7 +7296,7 @@ int ha_mroonga::rename_table(const char *from, const char *to) if (strcmp(from_db_name, to_db_name)) DBUG_RETURN(HA_ERR_WRONG_COMMAND); -#if MYSQL_VERSION_ID >= 50500 +#ifdef MRN_TABLE_LIST_INIT_REQUIRE_ALIAS table_list.init_one_table(from_db_name, strlen(from_db_name), from_tbl_name, strlen(from_tbl_name), from_tbl_name, TL_WRITE); Modified: ha_mroonga.h (+4 -0) =================================================================== --- ha_mroonga.h 2011-11-26 16:51:15 +0900 (33d4524) +++ ha_mroonga.h 2011-11-26 16:56:32 +0900 (3b4d0f7) @@ -78,6 +78,10 @@ extern "C" { # define MRN_HANDLER_HAVE_TRUNCATE #endif +#if MYSQL_VERSION_ID >= 50500 +# define MRN_TABLE_LIST_INIT_REQUIRE_ALIAS +#endif + #if MYSQL_VERSION_ID < 50600 typedef Item COND; #endif -------------- next part -------------- HTML����������������������������...Download