database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge.

Browse Source
This commit is contained in:
Igor Babaev
2011-10-28 04:07:11 -07:00
parent 2162704829 adc1f2f4c9
commit 4b4dfd57f5
22 changed files with 1863 additions and 553 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/handler.h
View File

@ -1723,6 +1723,7 @@ public:
DBUG_ENTER("ha_rnd_init");
DBUG_ASSERT(inited==NONE || (inited==RND && scan));
inited= (result= rnd_init(scan)) ? NONE: RND;
end_range= NULL;
DBUG_RETURN(result);
}
int ha_rnd_end()
@ -1730,6 +1731,7 @@ public:
DBUG_ENTER("ha_rnd_end");
DBUG_ASSERT(inited==RND);
inited=NONE;
end_range= NULL;
DBUG_RETURN(rnd_end());
}
int ha_rnd_init_with_error(bool scan) __attribute__ ((warn_unused_result));