mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-21 08:12:17 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'bantu/ticket/11583' into develop-olympus

Browse Source 
# 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.
This commit is contained in:
Dhruv 2013-06-05 01:41:26 +05:30
commit ad8386a64a
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
phpBB/includes/search/fulltext_mysql.php
View File

@ -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

2
phpBB/language/en/acp/search.php
View File

@ -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:',