diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-08 09:39:54 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-08 09:39:54 +0200 |
commit | a26e7a37266d8296094dabca52f0f6646fd73926 (patch) | |
tree | e5f974ad280d6815979f9a1104b0638ffd8458f1 /storage/innobase/include/row0mysql.h | |
parent | 39e2c95771432cf83e98203a220f7eb602f7068b (diff) | |
parent | ecc1cd219d427e62acbd37c4c02e1f99d6c2d769 (diff) | |
download | mariadb-git-a26e7a37266d8296094dabca52f0f6646fd73926.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/include/row0mysql.h')
-rw-r--r-- | storage/innobase/include/row0mysql.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/storage/innobase/include/row0mysql.h b/storage/innobase/include/row0mysql.h index f018f4eed73..cbb544f60c1 100644 --- a/storage/innobase/include/row0mysql.h +++ b/storage/innobase/include/row0mysql.h @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 2000, 2017, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2017, 2019, MariaDB Corporation. +Copyright (c) 2017, 2021, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -804,12 +804,6 @@ struct row_prebuilt_t { search key values from MySQL format to InnoDB format.*/ uint srch_key_val_len; /*!< Size of search key */ - /** Disable prefetch. */ - bool m_no_prefetch; - - /** Return materialized key for secondary index scan */ - bool m_read_virtual_key; - /** The MySQL table object */ TABLE* m_mysql_table; |