diff options
| author | unknown <ramil@mysql.com> | 2005-07-27 15:09:06 +0500 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2005-07-27 15:09:06 +0500 |
| commit | 71e8b59126f4f426a89463244bc2496beabee84a (patch) | |
| tree | 51722150e21962166f36cbe8e72f2e9c19c37f09 /mysql-test/t/strict.test | |
| parent | 62aad3332271b63e538ba82be09934a92929f699 (diff) | |
| parent | 17132a93f2bde74f625e860daee655d99c8e81a7 (diff) | |
| download | mariadb-git-71e8b59126f4f426a89463244bc2496beabee84a.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/mysql-5.0
sql/field.cc:
Auto merged
mysql-test/r/strict.result:
merging
mysql-test/t/strict.test:
merging
Diffstat (limited to 'mysql-test/t/strict.test')
| -rw-r--r-- | mysql-test/t/strict.test | 14 |
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 # |