summaryrefslogtreecommitdiff
path: root/mysql-test/suite/vcol
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2010-03-16 19:32:31 -0700
committerIgor Babaev <igor@askmonty.org>2010-03-16 19:32:31 -0700
commitee2313949a636230e78951a9249189c6e2ca948f (patch)
tree8cadabd0460603d88ce25b5e059220199917be53 /mysql-test/suite/vcol
parent61522b178f6e94301306bac6a6c5ae71bc1a1673 (diff)
downloadmariadb-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.
Diffstat (limited to 'mysql-test/suite/vcol')
-rw-r--r--mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result2
-rw-r--r--mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result2
2 files changed, 2 insertions, 2 deletions
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()