diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-04-15 09:16:54 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-04-15 09:16:54 -0700 |
| commit | f4cd2b37b12617ca383e625dfd07ce1468c5b5a8 (patch) | |
| tree | 4720b59562af2f8a4208b3cce4dca649d05b029b /sql/field.cc | |
| parent | ab10dc8fafc3ff5448947e698b500bab4042e95e (diff) | |
| parent | 30b2c64c4e87f8924fe817f5c607ae90a990e9e5 (diff) | |
| download | mariadb-git-f4cd2b37b12617ca383e625dfd07ce1468c5b5a8.tar.gz | |
Merge 10.0-base -> mwl253
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index 2dc7bbba07a..103d868d834 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -8956,6 +8956,7 @@ void Create_field::init_for_tmp_table(enum_field_types sql_type_arg, FLAGSTR(pack_flag, FIELDFLAG_DECIMAL), f_packtype(pack_flag))); vcol_info= 0; + create_if_not_exists= FALSE; stored_in_db= TRUE; DBUG_VOID_RETURN; @@ -8993,7 +8994,7 @@ bool Create_field::init(THD *thd, char *fld_name, enum_field_types fld_type, char *fld_change, List<String> *fld_interval_list, CHARSET_INFO *fld_charset, uint fld_geom_type, Virtual_column_info *fld_vcol_info, - engine_option_value *create_opt) + engine_option_value *create_opt, bool check_exists) { uint sign_len, allowed_type_modifier= 0; ulong max_field_charlength= MAX_FIELD_CHARLENGTH; @@ -9047,6 +9048,7 @@ bool Create_field::init(THD *thd, char *fld_name, enum_field_types fld_type, comment= *fld_comment; vcol_info= fld_vcol_info; + create_if_not_exists= check_exists; stored_in_db= TRUE; /* Initialize data for a computed field */ @@ -9655,6 +9657,7 @@ Create_field::Create_field(Field *old_field,Field *orig_field) comment= old_field->comment; decimals= old_field->decimals(); vcol_info= old_field->vcol_info; + create_if_not_exists= FALSE; stored_in_db= old_field->stored_in_db; option_list= old_field->option_list; option_struct= old_field->option_struct; |