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 | ee2313949a636230e78951a9249189c6e2ca948f (patch) | |
| tree | 8cadabd0460603d88ce25b5e059220199917be53 | |
| parent | 61522b178f6e94301306bac6a6c5ae71bc1a1673 (diff) | |
| download | mariadb-git-ee2313949a636230e78951a9249189c6e2ca948f.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.
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 2 | ||||
| -rw-r--r-- | mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result | 2 | ||||
| -rw-r--r-- | sql/field.cc | 4 |
4 files changed, 4 insertions, 6 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index a06b29815a0..b43682d6945 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -126,7 +126,7 @@ my $path_config_file; # The generated config file, var/my.cnf # executables will be used by the test suite. our $opt_vs_config = $ENV{'MTR_VS_CONFIG'}; -my $DEFAULT_SUITES= "main,binlog,federated,rpl,maria,parts"; +my $DEFAULT_SUITES= "main,binlog,federated,rpl,maria,parts,vcol"; my $opt_suites; our $opt_verbose= 0; # Verbose output, enable with --verbose diff --git a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result index 6d390a26139..8ce67883743 100644 --- a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result +++ b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result @@ -2205,7 +2205,7 @@ t1 CREATE TABLE `t1` ( insert into t1 values (1196440219,default); select * from t1; a b -1196440219 2007-11-30 19:30:19 +1196440219 2007-11-30 08:30:19 drop table t1; set sql_warnings = 0; # GET_FORMAT() diff --git a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result index 75c7ecff524..63ba8970a81 100644 --- a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result +++ b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result @@ -2205,7 +2205,7 @@ t1 CREATE TABLE `t1` ( insert into t1 values (1196440219,default); select * from t1; a b -1196440219 2007-11-30 19:30:19 +1196440219 2007-11-30 08:30:19 drop table t1; set sql_warnings = 0; # GET_FORMAT() 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 |