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

Merge 10.1 into 10.2

Browse Source
This commit is contained in:
Marko Mäkelä
2018-06-26 18:16:49 +03:00
parent 0e937f30f6 c6392d52ee
commit 31c950cca8
11 changed files with 188 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/handler.h
View File

@ -3230,9 +3230,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: