diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-06-26 18:16:49 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-06-26 18:16:49 +0300 |
| commit | 31c950cca8fa1623d41a8a7784e09fbcd6bc2c71 (patch) | |
| tree | e0a2b134996c7fc07efe5f254943683f8a02c220 /sql/handler.h | |
| parent | 0e937f30f6cdadd2bc1607efa4a07f19c88e1b68 (diff) | |
| parent | c6392d52ee2e918a65b05c275286ff4d450eef2c (diff) | |
| download | mariadb-git-31c950cca8fa1623d41a8a7784e09fbcd6bc2c71.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sql/handler.h b/sql/handler.h index a29026990de..dad2b30dec0 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -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: |