diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-09-06 21:50:25 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-09-06 21:50:25 +0200 |
| commit | 051323dbc602f3a7bf06df994274f481d2cfd7d1 (patch) | |
| tree | 8304707d22ffbf1e0d42dc048dedfa23e964e787 /phpBB/phpbb/search/fulltext_mysql.php | |
| parent | 801519ca4d1d83e3850d8524aeda9d8820857a34 (diff) | |
| parent | 2efdaaa0e2561ded5aeb3d7ec21505a8683c5d98 (diff) | |
| download | forums-051323dbc602f3a7bf06df994274f481d2cfd7d1.tar forums-051323dbc602f3a7bf06df994274f481d2cfd7d1.tar.gz forums-051323dbc602f3a7bf06df994274f481d2cfd7d1.tar.bz2 forums-051323dbc602f3a7bf06df994274f481d2cfd7d1.tar.xz forums-051323dbc602f3a7bf06df994274f481d2cfd7d1.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/phpbb/search/fulltext_mysql.php')
| -rw-r--r-- | phpBB/phpbb/search/fulltext_mysql.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/phpbb/search/fulltext_mysql.php b/phpBB/phpbb/search/fulltext_mysql.php index d1962bc8cc..73d7bc1574 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) { |