summaryrefslogtreecommitdiff
path: root/mysql-test/t/strict.test
diff options
context:
space:
mode:
authorramil@mysql.com <>2005-07-27 15:09:06 +0500
committerramil@mysql.com <>2005-07-27 15:09:06 +0500
commite43dff67f5e67dc04952ac68b1a18e45205e54cb (patch)
tree51722150e21962166f36cbe8e72f2e9c19c37f09 /mysql-test/t/strict.test
parent29cfa64f68758fea8643a6608b1ea0f791b9ab70 (diff)
parentefc8404a408158720a321fedf4a103d85404e7f4 (diff)
downloadmariadb-git-e43dff67f5e67dc04952ac68b1a18e45205e54cb.tar.gz
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/mysql-5.0
Diffstat (limited to 'mysql-test/t/strict.test')
-rw-r--r--mysql-test/t/strict.test14
1 files changed, 14 insertions, 0 deletions
diff --git a/mysql-test/t/strict.test b/mysql-test/t/strict.test
index 9e8d92533d9..ca57ca646f2 100644
--- a/mysql-test/t/strict.test
+++ b/mysql-test/t/strict.test
@@ -1120,6 +1120,20 @@ select * from t1;
drop table t1;
#
+# Bug #11964: alter table with timestamp field
+#
+
+set @@sql_mode='traditional';
+create table t1(a int, b timestamp);
+alter table t1 add primary key(a);
+show create table t1;
+drop table t1;
+create table t1(a int, b timestamp default 20050102030405);
+alter table t1 add primary key(a);
+show create table t1;
+drop table t1;
+
+#
# BIT fields
#