diff options
| author | Igor Babaev <igor@askmonty.org> | 2010-03-16 19:32:31 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2010-03-16 19:32:31 -0700 |
| commit | 014ec6db2e459cf615128368816e3c89722c1c3a (patch) | |
| tree | 8cadabd0460603d88ce25b5e059220199917be53 /sql/field.cc | |
| parent | f09ca00e088b316441bb76e97ba097bc9f3da7d3 (diff) | |
| download | mariadb-git-014ec6db2e459cf615128368816e3c89722c1c3a.tar.gz | |
Fixed bug #539643.
The cause of the problem is a bad merge MariaDB-5.1=>MariaDB-5.2.
Added the vcol suite to the list of the default suites run
by mysql-test-run.pl.
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/field.cc b/sql/field.cc index 4932a0308b4..a6751151beb 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -9598,13 +9598,13 @@ bool Create_field::init(THD *thd, char *fld_name, enum_field_types fld_type, interval_list.empty(); comment= *fld_comment; + vcol_info= fld_vcol_info; stored_in_db= TRUE; /* Initialize data for a computed field */ if ((uchar)fld_type == (uchar)MYSQL_TYPE_VIRTUAL) { DBUG_ASSERT(vcol_info && vcol_info->expr_item); - vcol_info= fld_vcol_info; stored_in_db= vcol_info->is_stored(); /* Walk through the Item tree checking if all items are valid @@ -9624,8 +9624,6 @@ bool Create_field::init(THD *thd, char *fld_name, enum_field_types fld_type, */ sql_type= fld_type= vcol_info->get_real_type(); } - else - vcol_info= NULL; /* Set NO_DEFAULT_VALUE_FLAG if this field doesn't have a default value and |