diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-06-01 04:09:33 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-06-01 04:09:33 +0200 |
| commit | d0e45e17dd67918ceeed7a0b11cc8723a51ec28f (patch) | |
| tree | f16349f33b875dd351b3dc0f5dede48cef28bdf8 | |
| parent | a9977686275f968a26272fb8bad28f7506f0043b (diff) | |
| download | forums-d0e45e17dd67918ceeed7a0b11cc8723a51ec28f.tar forums-d0e45e17dd67918ceeed7a0b11cc8723a51ec28f.tar.gz forums-d0e45e17dd67918ceeed7a0b11cc8723a51ec28f.tar.bz2 forums-d0e45e17dd67918ceeed7a0b11cc8723a51ec28f.tar.xz forums-d0e45e17dd67918ceeed7a0b11cc8723a51ec28f.zip | |
[ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher.
PHPBB3-11583
| -rw-r--r-- | phpBB/includes/search/fulltext_mysql.php | 9 | ||||
| -rw-r--r-- | phpBB/language/en/acp/search.php | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php index bd4c003397..a2211bbe9b 100644 --- a/phpBB/includes/search/fulltext_mysql.php +++ b/phpBB/includes/search/fulltext_mysql.php @@ -86,7 +86,14 @@ class fulltext_mysql extends search_backend $engine = $info['Type']; } - if ($engine != 'MyISAM') + $fulltext_supported = + $engine === 'MyISAM' || + // FULLTEXT is supported on InnoDB since MySQL 5.6.4 according to + // http://dev.mysql.com/doc/refman/5.6/en/innodb-storage-engine.html + $engine === 'InnoDB' && + phpbb_version_compare($db->sql_server_info(true), '5.6.4', '>='); + + if (!$fulltext_supported) { return $user->lang['FULLTEXT_MYSQL_NOT_MYISAM']; } diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php index a7d687d7c2..ded5584a7e 100644 --- a/phpBB/language/en/acp/search.php +++ b/phpBB/language/en/acp/search.php @@ -53,7 +53,7 @@ $lang = array_merge($lang, array( 'DELETING_INDEX_IN_PROGRESS_EXPLAIN' => 'The search backend is currently cleaning its index. This can take a few minutes.', 'FULLTEXT_MYSQL_INCOMPATIBLE_VERSION' => 'The MySQL fulltext backend can only be used with MySQL4 and above.', - 'FULLTEXT_MYSQL_NOT_MYISAM' => 'MySQL fulltext indexes can only be used with MyISAM tables.', + 'FULLTEXT_MYSQL_NOT_MYISAM' => 'MySQL fulltext indexes can only be used with MyISAM or InnoDB tables. MySQL 5.6.4 or later is required for fulltext indexes on InnoDB tables.', 'FULLTEXT_MYSQL_TOTAL_POSTS' => 'Total number of indexed posts', 'FULLTEXT_MYSQL_MBSTRING' => 'Support for non-latin UTF-8 characters using mbstring:', 'FULLTEXT_MYSQL_PCRE' => 'Support for non-latin UTF-8 characters using PCRE:', |