diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2016-08-28 20:40:10 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2016-08-28 20:40:10 +0100 |
| commit | 3ee5472a8ca197b411c6b9f116ce73e9bf20e13b (patch) | |
| tree | 57e0522cdba6c1e741df9fa7897a14ac36b7fc54 /phpBB | |
| parent | a019a86bfcd7c1ffe7b38449bc6d93c377d4662a (diff) | |
| download | forums-3ee5472a8ca197b411c6b9f116ce73e9bf20e13b.tar forums-3ee5472a8ca197b411c6b9f116ce73e9bf20e13b.tar.gz forums-3ee5472a8ca197b411c6b9f116ce73e9bf20e13b.tar.bz2 forums-3ee5472a8ca197b411c6b9f116ce73e9bf20e13b.tar.xz forums-3ee5472a8ca197b411c6b9f116ce73e9bf20e13b.zip | |
[ticket/14109] Increase MySQL Version for InnoDB FULLTEXT Index to 5.6.8.
This is required for proper overall database operation. In previous versions,
InnoDB might error on ALTER statements when multiple FULLTEXT Indexes are
defined.
PHPBB3-14109
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/language/en/acp/search.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/search/fulltext_mysql.php | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php index bda965b615..c52b71c121 100644 --- a/phpBB/language/en/acp/search.php +++ b/phpBB/language/en/acp/search.php @@ -54,7 +54,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_DATABASE' => 'The MySQL fulltext backend can only be used with MySQL4 and above.', - 'FULLTEXT_MYSQL_NOT_SUPPORTED' => '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_NOT_SUPPORTED' => 'MySQL fulltext indexes can only be used with MyISAM or InnoDB tables. MySQL 5.6.8 or later is required for fulltext indexes on InnoDB tables.', 'FULLTEXT_MYSQL_TOTAL_POSTS' => 'Total number of indexed posts', 'FULLTEXT_MYSQL_MIN_SEARCH_CHARS_EXPLAIN' => 'Words with at least this many characters will be indexed for searching. You or your host can only change this setting by changing the mysql configuration.', 'FULLTEXT_MYSQL_MAX_SEARCH_CHARS_EXPLAIN' => 'Words with no more than this many characters will be indexed for searching. You or your host can only change this setting by changing the mysql configuration.', diff --git a/phpBB/phpbb/search/fulltext_mysql.php b/phpBB/phpbb/search/fulltext_mysql.php index 3ddbd85b36..9faf5ca08b 100644 --- a/phpBB/phpbb/search/fulltext_mysql.php +++ b/phpBB/phpbb/search/fulltext_mysql.php @@ -177,8 +177,10 @@ class fulltext_mysql extends \phpbb\search\base $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 + // We also require https://bugs.mysql.com/bug.php?id=67004 to be + // fixed for proper overall operation. Hence we require 5.6.8. $engine === 'InnoDB' && - phpbb_version_compare($this->db->sql_server_info(true), '5.6.4', '>='); + phpbb_version_compare($this->db->sql_server_info(true), '5.6.8', '>='); if (!$fulltext_supported) { |