1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup: Alter_table_ctx::Alter_table_ctx()

Browse Source
This commit is contained in:
Sergei Golubchik 2025-01-18 15:07:53 +01:00
parent b87c1b06dc
commit b1f57a98a8
2 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sql/sql_alter.cc
View File

@ -297,16 +297,8 @@ uint Alter_info::check_vcol_field(Item_field *item) const
Alter_table_ctx::Alter_table_ctx() Alter_table_ctx::Alter_table_ctx()
: implicit_default_value_error_field(NULL), : db(null_clex_str), table_name(null_clex_str), alias(null_clex_str),
error_if_not_empty(false), new_db(null_clex_str), new_name(null_clex_str), new_alias(null_clex_str)
tables_opened(0),
db(null_clex_str), table_name(null_clex_str), alias(null_clex_str),
new_db(null_clex_str), new_name(null_clex_str), new_alias(null_clex_str),
fk_error_if_delete_row(false), fk_error_id(NULL),
fk_error_table(NULL), modified_primary_key(false)
#ifdef DBUG_ASSERT_EXISTS
, tmp_table(false)
#endif
{ {
} }
@ -319,14 +311,8 @@ Alter_table_ctx::Alter_table_ctx(THD *thd, TABLE_LIST *table_list,
uint tables_opened_arg, uint tables_opened_arg,
const LEX_CSTRING *new_db_arg, const LEX_CSTRING *new_db_arg,
const LEX_CSTRING *new_name_arg) const LEX_CSTRING *new_name_arg)
: implicit_default_value_error_field(NULL), error_if_not_empty(false), : tables_opened(tables_opened_arg),
tables_opened(tables_opened_arg), new_db(*new_db_arg), new_name(*new_name_arg)
new_db(*new_db_arg), new_name(*new_name_arg),
fk_error_if_delete_row(false), fk_error_id(NULL),
fk_error_table(NULL), modified_primary_key(false)
#ifdef DBUG_ASSERT_EXISTS
, tmp_table(false)
#endif
{ {
/* /*
Assign members db, table_name, new_db and new_name Assign members db, table_name, new_db and new_name

16
sql/sql_alter.h
View File

@ -306,9 +306,9 @@ public:
void report_implicit_default_value_error(THD *thd, const TABLE_SHARE *) const; void report_implicit_default_value_error(THD *thd, const TABLE_SHARE *) const;
public: public:
Create_field *implicit_default_value_error_field; Create_field *implicit_default_value_error_field= NULL;
bool error_if_not_empty; bool error_if_not_empty= false;
uint tables_opened; uint tables_opened= 0;
LEX_CSTRING db; LEX_CSTRING db;
LEX_CSTRING table_name; LEX_CSTRING table_name;
LEX_CSTRING alias; LEX_CSTRING alias;
@ -322,12 +322,12 @@ public:
of table to the new version ER_FK_CANNOT_DELETE_PARENT error should be of table to the new version ER_FK_CANNOT_DELETE_PARENT error should be
emitted. emitted.
*/ */
bool fk_error_if_delete_row; bool fk_error_if_delete_row= false;
/** Name of foreign key for the above error. */ /** Name of foreign key for the above error. */
const char *fk_error_id; const char *fk_error_id= NULL;
/** Name of table for the above error. */ /** Name of table for the above error. */
const char *fk_error_table; const char *fk_error_table= NULL;
bool modified_primary_key; bool modified_primary_key= false;
private: private:
char new_filename[FN_REFLEN + 1]; char new_filename[FN_REFLEN + 1];
@ -339,7 +339,7 @@ private:
#ifdef DBUG_ASSERT_EXISTS #ifdef DBUG_ASSERT_EXISTS
/** Indicates that we are altering temporary table. Used only in asserts. */ /** Indicates that we are altering temporary table. Used only in asserts. */
bool tmp_table; bool tmp_table= false;
#endif #endif
Alter_table_ctx &operator=(const Alter_table_ctx &rhs); // not implemented Alter_table_ctx &operator=(const Alter_table_ctx &rhs); // not implemented