diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-12-25 09:13:28 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-12-25 09:13:28 +0100 |
| commit | 478b83032b170b2ae030fa77fe4bed60a7910472 (patch) | |
| tree | a3893bb725e227dc15c6997731cdeba622ae1744 /storage/federatedx/ha_federatedx.cc | |
| parent | 0aa02567dd62d96467f84ba96cc67b103f63c9e0 (diff) | |
| parent | 043bd85a574a88856ab9c6d497e682ed06fe45e9 (diff) | |
| download | mariadb-git-478b83032b170b2ae030fa77fe4bed60a7910472.tar.gz | |
Merge branch '10.3' into 10.4bb-10.4-MDEV-23468
Diffstat (limited to 'storage/federatedx/ha_federatedx.cc')
| -rw-r--r-- | storage/federatedx/ha_federatedx.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/federatedx/ha_federatedx.cc b/storage/federatedx/ha_federatedx.cc index 3c2b4cdc25b..bc2cdef6509 100644 --- a/storage/federatedx/ha_federatedx.cc +++ b/storage/federatedx/ha_federatedx.cc @@ -2942,7 +2942,7 @@ int ha_federatedx::read_next(uchar *buf, FEDERATEDX_IO_RESULT *result) DBUG_RETURN(retval); /* Fetch a row, insert it back in a row format. */ - if (!(row= io->fetch_row(result))) + if (!(row= io->fetch_row(result, ¤t))) DBUG_RETURN(HA_ERR_END_OF_FILE); if (!(retval= convert_row_to_internal_format(buf, row, result))) @@ -2986,7 +2986,7 @@ void ha_federatedx::position(const uchar *record __attribute__ ((unused))) if (txn->acquire(share, ha_thd(), TRUE, &io)) DBUG_VOID_RETURN; - io->mark_position(stored_result, ref); + io->mark_position(stored_result, ref, current); position_called= TRUE; |