shibakentoku
null+****@clear*****
Mon Feb 10 01:42:56 JST 2014
shibakentoku 2014-02-10 01:42:56 +0900 (Mon, 10 Feb 2014) New Revision: aca6db99cf0b226269f9d3cc10656c820fb09865 https://github.com/mroonga/mroonga/commit/aca6db99cf0b226269f9d3cc10656c820fb09865 Message: Fix for MariaDB 10.0.8. Modified files: ha_mroonga.hpp mysql-test/mroonga/storage/fulltext/version_100/r/no_such_key.result mysql-test/mroonga/storage/fulltext/version_100/t/no_such_key.test Modified: ha_mroonga.hpp (+2 -1) =================================================================== --- ha_mroonga.hpp 2014-02-10 01:35:22 +0900 (47c6122) +++ ha_mroonga.hpp 2014-02-10 01:42:56 +0900 (54326a6) @@ -121,7 +121,8 @@ extern "C" { # define MRN_HAVE_HA_EXTRA_PREPARE_FOR_FORCED_CLOSE #endif -#if MYSQL_VERSION_ID >= 50607 +#if MYSQL_VERSION_ID >= 50607 && \ + (!defined(MRN_MARIADB_P) || MYSQL_VERSION_ID < 100008) # define MRN_HAVE_HA_EXTRA_EXPORT #endif Modified: mysql-test/mroonga/storage/fulltext/version_100/r/no_such_key.result (+1 -1) =================================================================== --- mysql-test/mroonga/storage/fulltext/version_100/r/no_such_key.result 2014-02-10 01:35:22 +0900 (e9081dd) +++ mysql-test/mroonga/storage/fulltext/version_100/r/no_such_key.result 2014-02-10 01:42:56 +0900 (e8c4b89) @@ -21,5 +21,5 @@ INSERT INTO diaries (title, body) VALUES ("groonga (1)", "starting groonga..."); INSERT INTO diaries (title, body) VALUES ("groonga (2)", "started groonga."); SELECT * FROM diaries FORCE INDEX(primary) WHERE MATCH(title) AGAINST("survey" IN BOOLEAN MODE); -id title body +ERROR HY000: Can't find FULLTEXT index matching the column list DROP TABLE diaries; Modified: mysql-test/mroonga/storage/fulltext/version_100/t/no_such_key.test (+1 -0) =================================================================== --- mysql-test/mroonga/storage/fulltext/version_100/t/no_such_key.test 2014-02-10 01:35:22 +0900 (e92a7bf) +++ mysql-test/mroonga/storage/fulltext/version_100/t/no_such_key.test 2014-02-10 01:42:56 +0900 (f89bc40) @@ -34,6 +34,7 @@ INSERT INTO diaries (title, body) VALUES ("survey", "will start groonga!"); INSERT INTO diaries (title, body) VALUES ("groonga (1)", "starting groonga..."); INSERT INTO diaries (title, body) VALUES ("groonga (2)", "started groonga."); +-- error ER_FT_MATCHING_KEY_NOT_FOUND SELECT * FROM diaries FORCE INDEX(primary) WHERE MATCH(title) AGAINST("survey" IN BOOLEAN MODE); -------------- next part -------------- HTML����������������������������...Descargar
