maria-developers team mailing list archive

[Igor Babaev <igor@xxxxxxxxxxxx>]

#At lp:maria/5.2 based on revid:sergii@xxxxxxxxx-20100315115123-21tgprclhz7qbk6m

 2744 Igor Babaev	2010-03-16
      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.
      modified:
        mysql-test/mysql-test-run.pl
        mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result
        mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result
        sql/field.cc

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2010-03-10 10:32:14 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-03-17 02:32:31 +0000
@@ -126,7 +126,7 @@ my $path_config_file;           # The ge
 # 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

=== modified file 'mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result'
--- a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result	2009-10-16 22:57:48 +0000
+++ b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result	2010-03-17 02:32:31 +0000
@@ -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()

=== modified file 'mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result'
--- a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result	2009-10-16 22:57:48 +0000
+++ b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result	2010-03-17 02:32:31 +0000
@@ -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()

=== modified file 'sql/field.cc'
--- a/sql/field.cc	2010-03-15 11:51:23 +0000
+++ b/sql/field.cc	2010-03-17 02:32:31 +0000
@@ -9598,13 +9598,13 @@ bool Create_field::init(THD *thd, char *
   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 *
     */
     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