database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge bk@192.168.21.1:mysql-5.1-opt

Browse Source 
into  mysql.com:/home/hf/work/29247/my51-29247
This commit is contained in:
holyfoot/hf@hfmain.(none)
2007-06-29 10:51:42 +05:00
parent 48223dfc6b cb7efcad2b
commit 6413c24826
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/handler.h
View File

@@ -1130,10 +1130,12 @@ public:
int ha_index_init(uint idx, bool sorted)
{
int result;
DBUG_ENTER("ha_index_init");
DBUG_ASSERT(inited==NONE);
inited=INDEX;
DBUG_RETURN(index_init(idx, sorted));
if (!(result= index_init(idx, sorted)))
inited=INDEX;
DBUG_RETURN(result);
}
int ha_index_end()
{
@@ -1144,10 +1146,11 @@ public:
}
int ha_rnd_init(bool scan)
{
int result;
DBUG_ENTER("ha_rnd_init");
DBUG_ASSERT(inited==NONE || (inited==RND && scan));
inited=RND;
DBUG_RETURN(rnd_init(scan));
inited= (result= rnd_init(scan)) ? NONE: RND;
DBUG_RETURN(result);
}
int ha_rnd_end()
{