Moving members' initialization from LEX::init_last_field

to constructor Create_field::Create_field().
MariaDB · Apr 25, 2015 · 4681699 · 4681699
1 parent ecb009b
commit 4681699
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/sql/field.h b/sql/field.h
@@ -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
 */
@@ -2954,9 +2955,13 @@ class Create_field :public Sql_alloc
   */
   bool stored_in_db;
 
-  Create_field() :after(0), pack_length(0), key_length(0), interval(0),
-                  srid(0), field(0), option_list(NULL), option_struct(NULL),
-                  create_if_not_exists(false), stored_in_db(true)
+  Create_field() :change(0), after(0), comment(null_lex_str),
+                  def(0), on_update(0), sql_type(MYSQL_TYPE_NULL),
+                  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();
   }

diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
@@ -864,15 +864,6 @@ void LEX::init_last_field(Create_field *field, const char *name, CHARSET_INFO *c
   last_field= field;
 
   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() */
   length= 0;