diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-20 15:34:59 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-20 15:34:59 +0300 |
| commit | 4b959bd8df18a281248c7325a61f4a79ce7691da (patch) | |
| tree | a1ad0e5b950eea62a6eebe4b26e820269654f17c /sql/ha_partition.cc | |
| parent | 0a7faed75ad49b99bace0882f89e08639c85679b (diff) | |
| parent | acc58fd83584c49049951a2c54c7f82a0c7ec412 (diff) | |
| download | mariadb-git-4b959bd8df18a281248c7325a61f4a79ce7691da.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/ha_partition.cc')
| -rw-r--r-- | sql/ha_partition.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 60a249399f2..413c14d017e 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -5621,8 +5621,9 @@ extern "C" int cmp_key_rowid_part_id(void *ptr, uchar *ref1, uchar *ref2) { return res; } - if ((res= file->m_file[0]->cmp_ref(ref1 + PARTITION_BYTES_IN_POS + file->m_rec_length, - ref2 + PARTITION_BYTES_IN_POS + file->m_rec_length))) + if ((res= file->get_open_file_sample()->cmp_ref(ref1 + + PARTITION_BYTES_IN_POS + file->m_rec_length, + ref2 + PARTITION_BYTES_IN_POS + file->m_rec_length))) { return res; } @@ -9654,7 +9655,7 @@ uint8 ha_partition::table_cache_type() { DBUG_ENTER("ha_partition::table_cache_type"); - DBUG_RETURN(m_file[0]->table_cache_type()); + DBUG_RETURN(get_open_file_sample()->table_cache_type()); } |