database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge 10.0 into 10.1

Browse Source
This commit is contained in:
Marko Mäkelä
2018-06-26 17:34:44 +03:00
parent c4eb4bcef6 cc8772f33e
commit c6392d52ee
10 changed files with 184 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/handler.h
View File

@ -3180,9 +3180,17 @@ private:
*/
virtual int rnd_pos_by_record(uchar *record)
{
int error;
DBUG_ASSERT(table_flags() & HA_PRIMARY_KEY_REQUIRED_FOR_POSITION);
error = ha_rnd_init(false);
if (error != 0)
return error;
position(record);
return rnd_pos(record, ref);
error = ha_rnd_pos(record, ref);
ha_rnd_end();
return error;
}
virtual int read_first_row(uchar *buf, uint primary_key);
public: