Fix for MariaDB 10.0.8.

mroonga · Feb 9, 2014 · aca6db9 · aca6db9
1 parent 1a0a8fe
commit aca6db9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/ha_mroonga.hpp b/ha_mroonga.hpp
@@ -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
 

diff --git a/mysql-test/mroonga/storage/fulltext/version_100/r/no_such_key.result b/mysql-test/mroonga/storage/fulltext/version_100/r/no_such_key.result
@@ -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;
diff --git a/mysql-test/mroonga/storage/fulltext/version_100/t/no_such_key.test b/mysql-test/mroonga/storage/fulltext/version_100/t/no_such_key.test
@@ -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);