diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2013-06-05 01:41:26 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2013-06-05 01:41:26 +0530 |
| commit | ad8386a64a0ea1c8f5811767e3bf7c84d9eda27d (patch) | |
| tree | 65ad136a2935bcdfb0ea29c8d503d6a063d7fcbb | |
| parent | a3d15938047fb02a12276805427682beb36e5184 (diff) | |
| parent | d925c8d0daca58ce6f2a7b327e496c072c8a9fc8 (diff) | |
| download | forums-ad8386a64a0ea1c8f5811767e3bf7c84d9eda27d.tar forums-ad8386a64a0ea1c8f5811767e3bf7c84d9eda27d.tar.gz forums-ad8386a64a0ea1c8f5811767e3bf7c84d9eda27d.tar.bz2 forums-ad8386a64a0ea1c8f5811767e3bf7c84d9eda27d.tar.xz forums-ad8386a64a0ea1c8f5811767e3bf7c84d9eda27d.zip | |
Merge remote-tracking branch 'bantu/ticket/11583' into develop-olympus
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11583:
[ticket/11583] Use a new lang key instead of giving the old one a new meaning.
[ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher.
| -rw-r--r-- | phpBB/includes/search/fulltext_mysql.php | 11 | ||||
| -rw-r--r-- | phpBB/language/en/acp/search.php | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php index bd4c003397..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 diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php index a7d687d7c2..79ac75c833 100644 --- a/phpBB/language/en/acp/search.php +++ b/phpBB/language/en/acp/search.php @@ -53,7 +53,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_VERSION' => 'The MySQL fulltext backend can only be used with MySQL4 and above.', - 'FULLTEXT_MYSQL_NOT_MYISAM' => 'MySQL fulltext indexes can only be used with MyISAM tables.', + '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_TOTAL_POSTS' => 'Total number of indexed posts', 'FULLTEXT_MYSQL_MBSTRING' => 'Support for non-latin UTF-8 characters using mbstring:', 'FULLTEXT_MYSQL_PCRE' => 'Support for non-latin UTF-8 characters using PCRE:', |