1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-23 16:52:54 +02:00

Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/9685] Buffer posts for search indexing when using mssqlnative.
This commit is contained in:
Andreas Fischer
2011-03-15 02:00:04 +01:00
3 changed files with 35 additions and 3 deletions

View File

@@ -384,7 +384,18 @@ class acp_search
AND post_id <= ' . (int) ($post_counter + $this->batch_size);
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
$buffer = $db->sql_buffer_nested_transactions();
if ($buffer)
{
$rows = $db->sql_fetchrowset($result);
$rows[] = false; // indicate end of array for while loop below
$db->sql_freeresult($result);
}
$i = 0;
while ($row = ($buffer ? $rows[$i++] : $db->sql_fetchrow($result)))
{
// Indexing enabled for this forum or global announcement?
// Global announcements get indexed by default.
@@ -394,7 +405,10 @@ class acp_search
}
$row_count++;
}
$db->sql_freeresult($result);
if (!$buffer)
{
$db->sql_freeresult($result);
}
$post_counter += $this->batch_size;
}