mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-06 14:35:56 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander 2020-04-21 20:08:11 +02:00
commit 5c0ec6eca9
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
phpBB/phpbb/search/fulltext_mysql.php
View File

@ -173,14 +173,15 @@ class fulltext_mysql extends \phpbb\search\base
$engine = $info['Type']; $engine = $info['Type'];
} }
$fulltext_supported = $fulltext_supported = $engine === 'Aria' || $engine === 'MyISAM'
$engine === 'MyISAM' || /**
// FULLTEXT is supported on InnoDB since MySQL 5.6.4 according to * 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 * 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 * We also require https://bugs.mysql.com/bug.php?id=67004 to be
// fixed for proper overall operation. Hence we require 5.6.8. * fixed for proper overall operation. Hence we require 5.6.8.
$engine === 'InnoDB' && */
phpbb_version_compare($this->db->sql_server_info(true), '5.6.8', '>='); || $engine === 'InnoDB'
&& phpbb_version_compare($this->db->sql_server_info(true), '5.6.8', '>=');
if (!$fulltext_supported) if (!$fulltext_supported)
{ {