summaryrefslogtreecommitdiff
path: root/mysql-test/t/union.test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/t/union.test')
-rw-r--r--mysql-test/t/union.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test
index b8b040b0d0d..87f88570c3b 100644
--- a/mysql-test/t/union.test
+++ b/mysql-test/t/union.test
@@ -847,7 +847,7 @@ drop table t1;
#
# Bug#12185: Data type aggregation may produce wrong result
#
-create table t1(f1 char(1), f2 char(5), f3 binary(1), f4 binary(5), f5 timestamp, f6 varchar(1) character set utf8 collate utf8_general_ci, f7 text);
+create table t1(f1 char(1), f2 char(5), f3 binary(1), f4 binary(5), f5 timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', f6 varchar(1) character set utf8 collate utf8_general_ci, f7 text);
create table t2 as select *, f6 as f8 from t1 union select *, f7 from t1;
show create table t2;
drop table t1, t2;