database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

After merge fixes

Browse Source
This commit is contained in:
monty@mysql.com
2004-07-12 07:43:38 +03:00
parent 1e31199995
commit fa7f63d46d
12 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/opt_range.cc
View File

@ -954,7 +954,7 @@ int QUICK_ROR_INTERSECT_SELECT::init_ror_merged_scan(bool reuse_handler)
quick->record= head->record[0];
}
if (need_to_fetch_row && head->file->rnd_init())
if (need_to_fetch_row && head->file->ha_rnd_init(1))
{
DBUG_PRINT("error", ("ROR index_merge rnd_init call failed"));
DBUG_RETURN(1);
@ -1105,7 +1105,7 @@ int QUICK_ROR_UNION_SELECT::reset()
queue_insert(&queue, (byte*)quick);
}
if (head->file->rnd_init())
if (head->file->ha_rnd_init(1))
{
DBUG_PRINT("error", ("ROR index_merge rnd_init call failed"));
DBUG_RETURN(1);