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 /phpBB/includes/search/fulltext_mysql.php | |
| 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
Diffstat (limited to 'phpBB/includes/search/fulltext_mysql.php')
| -rw-r--r-- | phpBB/includes/search/fulltext_mysql.php | 9 |
1 files changed, 8 insertions, 1 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']; } |