Kouhei Sutou
null+****@clear*****
Sat May 16 17:28:16 JST 2015
Kouhei Sutou 2015-05-16 17:28:16 +0900 (Sat, 16 May 2015) New Revision: 24052fa8646bccf35601cecfbb430ea024f8b155 https://github.com/mroonga/mroonga/commit/24052fa8646bccf35601cecfbb430ea024f8b155 Message: Fix a bug that needless groonga-normalizer-mysql plugin search is ran This is occurred only when groonga-normalizer-mysql plugin is embedded into Mroonga. GitHub: fix #53 Reported by torinky. Thanks!!! Modified files: lib/mrn_database_manager.cpp Modified: lib/mrn_database_manager.cpp (+5 -5) =================================================================== --- lib/mrn_database_manager.cpp 2015-05-16 16:49:07 +0900 (365f473) +++ lib/mrn_database_manager.cpp 2015-05-16 17:28:16 +0900 (f0e8df0) @@ -313,18 +313,18 @@ namespace mrn { int error = 0; #ifdef WITH_GROONGA_NORMALIZER_MYSQL { +# ifdef MRN_GROONGA_NORMALIZER_MYSQL_EMBED + GRN_PLUGIN_IMPL_NAME_TAGGED(init, normalizers_mysql)(ctx_); + GRN_PLUGIN_IMPL_NAME_TAGGED(register, normalizers_mysql)(ctx_); +# else grn_obj *mysql_normalizer; mysql_normalizer = grn_ctx_get(ctx_, "NormalizerMySQLGeneralCI", -1); if (mysql_normalizer) { grn_obj_unlink(ctx_, mysql_normalizer); } else { -# ifdef MRN_GROONGA_NORMALIZER_MYSQL_EMBED - GRN_PLUGIN_IMPL_NAME_TAGGED(init, normalizers_mysql)(ctx_); - GRN_PLUGIN_IMPL_NAME_TAGGED(register, normalizers_mysql)(ctx_); -# else grn_plugin_register(ctx_, GROONGA_NORMALIZER_MYSQL_PLUGIN_NAME); -# endif } +# endif } #endif -------------- next part -------------- HTML����������������������������...下載
