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/ha_partition.cc | |
parent | 0e937f30f6cdadd2bc1607efa4a07f19c88e1b68 (diff) | |
parent | c6392d52ee2e918a65b05c275286ff4d450eef2c (diff) | |
download | mariadb-git-31c950cca8fa1623d41a8a7784e09fbcd6bc2c71.tar.gz |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/ha_partition.cc')
-rw-r--r-- | sql/ha_partition.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index da6cff96921..d4ecc0d3970 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -5079,7 +5079,8 @@ int ha_partition::rnd_pos_by_record(uchar *record) if (unlikely(get_part_for_delete(record, m_rec0, m_part_info, &m_last_part))) DBUG_RETURN(1); - DBUG_RETURN(handler::rnd_pos_by_record(record)); + int err= m_file[m_last_part]->rnd_pos_by_record(record); + DBUG_RETURN(err); } |