diff options
| author | David M <davidmj@users.sourceforge.net> | 2008-01-06 02:21:44 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2008-01-06 02:21:44 +0000 |
| commit | 57645ad5bc2469e166cb3e5d54628d87ffa74c42 (patch) | |
| tree | 2b7e47b0a2d4d07b8b1c3acbab5115d7b60ce606 /phpBB/includes/search | |
| parent | f0dea060972a48460ce64d3cdf885d82383763c6 (diff) | |
| download | forums-57645ad5bc2469e166cb3e5d54628d87ffa74c42.tar forums-57645ad5bc2469e166cb3e5d54628d87ffa74c42.tar.gz forums-57645ad5bc2469e166cb3e5d54628d87ffa74c42.tar.bz2 forums-57645ad5bc2469e166cb3e5d54628d87ffa74c42.tar.xz forums-57645ad5bc2469e166cb3e5d54628d87ffa74c42.zip | |
the end of an era...
- MySQL < 4.1.3 support is removed
- renamed mysql4 to mysql, no need to cause confusion
- changed the cfg cacher, reduces file system lookups and include count by two on every page load
git-svn-id: file:///svn/phpbb/trunk@8307 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/search')
| -rw-r--r-- | phpBB/includes/search/fulltext_mysql.php | 22 | ||||
| -rwxr-xr-x | phpBB/includes/search/fulltext_native.php | 6 |
2 files changed, 3 insertions, 25 deletions
diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php index b359b3ba1c..17b081a18a 100644 --- a/phpBB/includes/search/fulltext_mysql.php +++ b/phpBB/includes/search/fulltext_mysql.php @@ -50,11 +50,6 @@ class fulltext_mysql extends search_backend { global $db, $user; - if ($db->sql_layer != 'mysql4' && $db->sql_layer != 'mysqli') - { - return $user->lang['FULLTEXT_MYSQL_INCOMPATIBLE_VERSION']; - } - $result = $db->sql_query('SHOW TABLE STATUS LIKE \'' . POSTS_TABLE . '\''); $info = $db->sql_fetchrow($result); $db->sql_freeresult($result); @@ -628,27 +623,12 @@ class fulltext_mysql extends search_backend if (!isset($this->stats['post_subject'])) { - if ($db->sql_layer == 'mysqli' || version_compare($db->mysql_version, '4.1.3', '>=')) - { - //$alter[] = 'MODIFY post_subject varchar(100) COLLATE utf8_unicode_ci DEFAULT \'\' NOT NULL'; - } - else - { - $alter[] = 'MODIFY post_subject text NOT NULL'; - } $alter[] = 'ADD FULLTEXT (post_subject)'; } if (!isset($this->stats['post_text'])) { - if ($db->sql_layer == 'mysqli' || version_compare($db->mysql_version, '4.1.3', '>=')) - { - $alter[] = 'MODIFY post_text mediumtext COLLATE utf8_unicode_ci NOT NULL'; - } - else - { - $alter[] = 'MODIFY post_text mediumtext NOT NULL'; - } + $alter[] = 'MODIFY post_text mediumtext COLLATE utf8_unicode_ci NOT NULL'; $alter[] = 'ADD FULLTEXT (post_text)'; } diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php index 788af4b002..8501474cfb 100755 --- a/phpBB/includes/search/fulltext_native.php +++ b/phpBB/includes/search/fulltext_native.php @@ -642,10 +642,8 @@ class fulltext_native extends search_backend switch ($db->sql_layer) { - case 'mysql4': + case 'mysql': case 'mysqli': - - // 3.x does not support SQL_CALC_FOUND_ROWS $sql_array['SELECT'] = 'SQL_CALC_FOUND_ROWS ' . $sql_array['SELECT']; $is_mysql = true; @@ -844,7 +842,7 @@ class fulltext_native extends search_backend { switch ($db->sql_layer) { - case 'mysql4': + case 'mysql': case 'mysqli': $select = 'SQL_CALC_FOUND_ROWS ' . $select; $is_mysql = true; |