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 
Note: The following tests fails
- fulltext (Sergei has promised to fix)
- rpl_charset (Guilhem should fix)
- rpl_timezone (Dimitray has promised to fix)

Sanja needs to check out the calling of close_thread_tables() in sp_head.cc
This commit is contained in:
monty@mysql.com
2004-07-15 04:19:07 +03:00
parent 31fe2837f9
commit 5b3c418b48
50 changed files with 286 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/handler.h
View File

@ -306,29 +306,33 @@ public:
int ha_index_init(uint idx)
{
DBUG_ENTER("ha_index_init");
DBUG_ASSERT(inited==NONE);
inited=INDEX;
return index_init(idx);
DBUG_RETURN(index_init(idx));
}
int ha_index_end()
{
DBUG_ENTER("ha_index_end");
DBUG_ASSERT(inited==INDEX);
inited=NONE;
return index_end();
DBUG_RETURN(index_end());
}
int ha_rnd_init(bool scan)
{
DBUG_ENTER("ha_rnd_init");
DBUG_ASSERT(inited==NONE || (inited==RND && scan));
inited=RND;
return rnd_init(scan);
DBUG_RETURN(rnd_init(scan));
}
int ha_rnd_end()
{
DBUG_ENTER("ha_rnd_end");
DBUG_ASSERT(inited==RND);
inited=NONE;
return rnd_end();
DBUG_RETURN(rnd_end());
}
/* this is neseccary in many places, e.g. in HANDLER command */
/* this is necessary in many places, e.g. in HANDLER command */
int ha_index_or_rnd_end()
{
return inited == INDEX ? ha_index_end() : inited == RND ? ha_rnd_end() : 0;