Commit ee231394 authored by Igor Babaev's avatar Igor Babaev

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.
parent 61522b17
...@@ -126,7 +126,7 @@ my $path_config_file; # The generated config file, var/my.cnf ...@@ -126,7 +126,7 @@ my $path_config_file; # The generated config file, var/my.cnf
# executables will be used by the test suite. # executables will be used by the test suite.
our $opt_vs_config = $ENV{'MTR_VS_CONFIG'}; 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; my $opt_suites;
our $opt_verbose= 0; # Verbose output, enable with --verbose our $opt_verbose= 0; # Verbose output, enable with --verbose
......
...@@ -2205,7 +2205,7 @@ t1 CREATE TABLE `t1` ( ...@@ -2205,7 +2205,7 @@ t1 CREATE TABLE `t1` (
insert into t1 values (1196440219,default); insert into t1 values (1196440219,default);
select * from t1; select * from t1;
a b a b
1196440219 2007-11-30 19:30:19 1196440219 2007-11-30 08:30:19
drop table t1; drop table t1;
set sql_warnings = 0; set sql_warnings = 0;
# GET_FORMAT() # GET_FORMAT()
......
...@@ -2205,7 +2205,7 @@ t1 CREATE TABLE `t1` ( ...@@ -2205,7 +2205,7 @@ t1 CREATE TABLE `t1` (
insert into t1 values (1196440219,default); insert into t1 values (1196440219,default);
select * from t1; select * from t1;
a b a b
1196440219 2007-11-30 19:30:19 1196440219 2007-11-30 08:30:19
drop table t1; drop table t1;
set sql_warnings = 0; set sql_warnings = 0;
# GET_FORMAT() # GET_FORMAT()
......
...@@ -9598,13 +9598,13 @@ bool Create_field::init(THD *thd, char *fld_name, enum_field_types fld_type, ...@@ -9598,13 +9598,13 @@ bool Create_field::init(THD *thd, char *fld_name, enum_field_types fld_type,
interval_list.empty(); interval_list.empty();
comment= *fld_comment; comment= *fld_comment;
vcol_info= fld_vcol_info;
stored_in_db= TRUE; stored_in_db= TRUE;
/* Initialize data for a computed field */ /* Initialize data for a computed field */
if ((uchar)fld_type == (uchar)MYSQL_TYPE_VIRTUAL) if ((uchar)fld_type == (uchar)MYSQL_TYPE_VIRTUAL)
{ {
DBUG_ASSERT(vcol_info && vcol_info->expr_item); DBUG_ASSERT(vcol_info && vcol_info->expr_item);
vcol_info= fld_vcol_info;
stored_in_db= vcol_info->is_stored(); stored_in_db= vcol_info->is_stored();
/* /*
Walk through the Item tree checking if all items are valid 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, ...@@ -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(); 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 Set NO_DEFAULT_VALUE_FLAG if this field doesn't have a default value and
......
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