diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2016-12-05 21:04:30 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2016-12-07 10:01:07 +0200 |
| commit | a46ef6e92a8974d1b678261ececb4d5fbee4f6ba (patch) | |
| tree | 167e0090ff35dc8c5e177f2125a620df8f96ac26 /storage/innobase/handler/ha_innodb.h | |
| parent | 0009f4a441da6ec98fdc55c6a14ce007edf7cfdb (diff) | |
| download | mariadb-git-a46ef6e92a8974d1b678261ececb4d5fbee4f6ba.tar.gz | |
MDEV-11487 Revert InnoDB internal temporary tables from WL#7682bb-10.2-mdev-11487
WL#7682 in MySQL 5.7 introduced the possibility to create light-weight
temporary tables in InnoDB. These are called 'intrinsic temporary tables'
in InnoDB, and in MySQL 5.7, they can be created by the optimizer for
sorting or buffering data in query processing.
In MariaDB 10.2, the optimizer temporary tables cannot be created in
InnoDB, so we should remove the dead code and related data structures.
Diffstat (limited to 'storage/innobase/handler/ha_innodb.h')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/storage/innobase/handler/ha_innodb.h b/storage/innobase/handler/ha_innodb.h index 84feea119c1..1c71735d716 100644 --- a/storage/innobase/handler/ha_innodb.h +++ b/storage/innobase/handler/ha_innodb.h @@ -203,9 +203,6 @@ public: int ft_read(uchar* buf); - int enable_indexes(uint mode); - int disable_indexes(uint mode); - void position(const uchar *record); int info(uint); @@ -468,9 +465,6 @@ protected: @see build_template() */ void reset_template(); - /** Write Row Interface optimized for Intrinsic table. */ - int intrinsic_table_write_row(uchar* record); - protected: inline void update_thd(THD* thd); void update_thd(); @@ -833,14 +827,6 @@ public: THD* thd() const { return(m_thd); } - inline bool is_intrinsic_temp_table() const - { - /* DICT_TF2_INTRINSIC implies DICT_TF2_TEMPORARY */ - ut_ad(!(m_flags2 & DICT_TF2_INTRINSIC) - || (m_flags2 & DICT_TF2_TEMPORARY)); - return((m_flags2 & DICT_TF2_INTRINSIC) != 0); - } - /** Normalizes a table name string. A normalized name consists of the database name catenated to '/' and table name. An example: test/mytable. On Windows normalization puts |