diff options
Diffstat (limited to 'sql/sql_alter.h')
| -rw-r--r-- | sql/sql_alter.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sql/sql_alter.h b/sql/sql_alter.h index b8aa2595a58..a0f89c28d2a 100644 --- a/sql/sql_alter.h +++ b/sql/sql_alter.h @@ -318,12 +318,19 @@ public: uint tables_opened; LEX_CSTRING db; LEX_CSTRING table_name; + LEX_CSTRING storage_engine_name; LEX_CSTRING alias; LEX_CSTRING new_db; LEX_CSTRING new_name; LEX_CSTRING new_alias; LEX_CSTRING tmp_name; + LEX_CSTRING tmp_storage_engine_name; + LEX_CUSTRING tmp_id, id; char tmp_buff[80]; + uchar id_buff[MY_UUID_SIZE]; + char storage_engine_buff[NAME_LEN], tmp_storage_engine_buff[NAME_LEN]; + bool storage_engine_partitioned; + bool tmp_storage_engine_name_partitioned; /** Indicates that if a row is deleted during copying of data from old version @@ -335,6 +342,8 @@ public: const char *fk_error_id; /** Name of table for the above error. */ const char *fk_error_table; + /** Indicates that we are altering temporary table */ + bool tmp_table; private: char new_filename[FN_REFLEN + 1]; @@ -344,11 +353,6 @@ private: char new_path[FN_REFLEN + 1]; char tmp_path[FN_REFLEN + 1]; -#ifdef DBUG_ASSERT_EXISTS - /** Indicates that we are altering temporary table. Used only in asserts. */ - bool tmp_table; -#endif - Alter_table_ctx &operator=(const Alter_table_ctx &rhs); // not implemented Alter_table_ctx(const Alter_table_ctx &rhs); // not implemented }; |