diff options
| author | ramil@mysql.com <> | 2005-07-27 15:09:06 +0500 |
|---|---|---|
| committer | ramil@mysql.com <> | 2005-07-27 15:09:06 +0500 |
| commit | e43dff67f5e67dc04952ac68b1a18e45205e54cb (patch) | |
| tree | 51722150e21962166f36cbe8e72f2e9c19c37f09 /mysql-test/r/strict.result | |
| parent | 29cfa64f68758fea8643a6608b1ea0f791b9ab70 (diff) | |
| parent | efc8404a408158720a321fedf4a103d85404e7f4 (diff) | |
| download | mariadb-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/r/strict.result')
| -rw-r--r-- | mysql-test/r/strict.result | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/mysql-test/r/strict.result b/mysql-test/r/strict.result index a742770ae9b..ce3cf8bb204 100644 --- a/mysql-test/r/strict.result +++ b/mysql-test/r/strict.result @@ -1259,6 +1259,26 @@ d 2000-10-01 drop table t1; set @@sql_mode='traditional'; +create table t1(a int, b timestamp); +alter table t1 add primary key(a); +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(11) NOT NULL default '0', + `b` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, + PRIMARY KEY (`a`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +drop table t1; +create table t1(a int, b timestamp default 20050102030405); +alter table t1 add primary key(a); +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(11) NOT NULL default '0', + `b` timestamp NOT NULL default '2005-01-02 03:04:05', + PRIMARY KEY (`a`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +drop table t1; create table t1(a bit(2)); insert into t1 values(b'101'); ERROR 22001: Data too long for column 'a' at row 1 |