diff options
| author | Maat <maat-pub@mageia.biz> | 2013-11-30 14:43:45 +0100 |
|---|---|---|
| committer | Maat <maat-pub@mageia.biz> | 2013-11-30 14:47:18 +0100 |
| commit | 33193de3c84f52917ba5c340591cc2d97dc42ebb (patch) | |
| tree | 4b6635e7e8e8b9e69a3e58689a6f9c1241dee8f3 /phpBB/includes/search/fulltext_mysql.php | |
| parent | 41b19431251f19f607d192a555fdf1e57fb36643 (diff) | |
| parent | 446ea9928d8373cf7695d3adda6d5ee30d5f94b4 (diff) | |
| download | forums-33193de3c84f52917ba5c340591cc2d97dc42ebb.tar forums-33193de3c84f52917ba5c340591cc2d97dc42ebb.tar.gz forums-33193de3c84f52917ba5c340591cc2d97dc42ebb.tar.bz2 forums-33193de3c84f52917ba5c340591cc2d97dc42ebb.tar.xz forums-33193de3c84f52917ba5c340591cc2d97dc42ebb.zip | |
Merge remote-tracking branch 'upstream/prep-release-3.0.12'
Diffstat (limited to 'phpBB/includes/search/fulltext_mysql.php')
| -rw-r--r-- | phpBB/includes/search/fulltext_mysql.php | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php index 779ec1d216..f28b8885e7 100644 --- a/phpBB/includes/search/fulltext_mysql.php +++ b/phpBB/includes/search/fulltext_mysql.php @@ -86,9 +86,16 @@ 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']; + return $user->lang['FULLTEXT_MYSQL_NOT_SUPPORTED']; } $sql = 'SHOW VARIABLES @@ -747,7 +754,7 @@ class fulltext_mysql extends search_backend { if ($db->sql_layer == 'mysqli' || version_compare($db->sql_server_info(true), '4.1.3', '>=')) { - //$alter[] = 'MODIFY post_subject varchar(100) COLLATE utf8_unicode_ci DEFAULT \'\' NOT NULL'; + $alter[] = 'MODIFY post_subject varchar(255) COLLATE utf8_unicode_ci DEFAULT \'\' NOT NULL'; } else { |