diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-03-08 08:44:32 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-03-08 08:44:32 -0500 |
| commit | 35309de0b77e8af18a03a2da5b8196668164c040 (patch) | |
| tree | a30aec0883d2377fe19e4874b8a3938d7b4c0b92 /phpBB/includes/search/fulltext_mysql.php | |
| parent | 65e711cbb0314dea5895308d1558453d222240e2 (diff) | |
| parent | d380a1a36ffd5b2de6e403eb63f8754d8a277386 (diff) | |
| download | forums-35309de0b77e8af18a03a2da5b8196668164c040.tar forums-35309de0b77e8af18a03a2da5b8196668164c040.tar.gz forums-35309de0b77e8af18a03a2da5b8196668164c040.tar.bz2 forums-35309de0b77e8af18a03a2da5b8196668164c040.tar.xz forums-35309de0b77e8af18a03a2da5b8196668164c040.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10653] Call get_row_count of base class in mysql get_estimated_row_count
[ticket/9813] Only get posts table row count if we detected a fulltext index.
[ticket/9813] Also use estimated row count of posts table for fulltext mysql.
[ticket/10653] Fix parameter to substr() in unit tests. Should be 1, not -1.
[ticket/10653] Unit tests for get_row_count() and get_estimated_row_count().
[ticket/10653] Add ability to count table rows to database abstraction layer.
[ticket/9813] Use table status row count only if greater than 100000 or exact.
[ticket/9813] Use SHOW TABLE STATUS to get search stats for native on MySQL.
Diffstat (limited to 'phpBB/includes/search/fulltext_mysql.php')
| -rw-r--r-- | phpBB/includes/search/fulltext_mysql.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php index 99467da978..7c94038cc9 100644 --- a/phpBB/includes/search/fulltext_mysql.php +++ b/phpBB/includes/search/fulltext_mysql.php @@ -897,11 +897,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base } $db->sql_freeresult($result); - $sql = 'SELECT COUNT(post_id) as total_posts - FROM ' . POSTS_TABLE; - $result = $db->sql_query($sql); - $this->stats['total_posts'] = (int) $db->sql_fetchfield('total_posts'); - $db->sql_freeresult($result); + $this->stats['total_posts'] = empty($this->stats) ? 0 : $db->get_estimated_row_count(POSTS_TABLE); } /** |