Commit 46816996 authored by Alexander Barkov's avatar Alexander Barkov

Moving members' initialization from LEX::init_last_field

to constructor Create_field::Create_field().
parent ecb009b2
...@@ -2900,6 +2900,7 @@ class Field_bit_as_char: public Field_bit { ...@@ -2900,6 +2900,7 @@ class Field_bit_as_char: public Field_bit {
}; };
extern const LEX_STRING null_lex_str;
/* /*
Create field class for CREATE TABLE Create field class for CREATE TABLE
*/ */
...@@ -2954,9 +2955,13 @@ class Create_field :public Sql_alloc ...@@ -2954,9 +2955,13 @@ class Create_field :public Sql_alloc
*/ */
bool stored_in_db; bool stored_in_db;
Create_field() :after(0), pack_length(0), key_length(0), interval(0), Create_field() :change(0), after(0), comment(null_lex_str),
srid(0), field(0), option_list(NULL), option_struct(NULL), def(0), on_update(0), sql_type(MYSQL_TYPE_NULL),
create_if_not_exists(false), stored_in_db(true) flags(0), pack_length(0), key_length(0), interval(0),
srid(0), geom_type(Field::GEOM_GEOMETRY),
field(0), option_list(NULL), option_struct(NULL),
create_if_not_exists(false), vcol_info(0),
stored_in_db(true)
{ {
interval_list.empty(); interval_list.empty();
} }
......
...@@ -864,15 +864,6 @@ void LEX::init_last_field(Create_field *field, const char *name, CHARSET_INFO *c ...@@ -864,15 +864,6 @@ void LEX::init_last_field(Create_field *field, const char *name, CHARSET_INFO *c
last_field= field; last_field= field;
field->field_name= name; field->field_name= name;
field->flags= 0;
field->def= 0;
field->on_update= 0;
field->sql_type= MYSQL_TYPE_NULL;
field->change= 0;
field->geom_type= Field::GEOM_GEOMETRY;
field->comment= null_lex_str;
field->vcol_info= 0;
field->interval_list.empty();
/* reset LEX fields that are used in Create_field::set_and_check() */ /* reset LEX fields that are used in Create_field::set_and_check() */
length= 0; length= 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment