diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-02-08 02:09:21 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-02-08 02:09:21 +0200 |
| commit | 0e755652df91c07fca7a777272bd4b04f18ba516 (patch) | |
| tree | c7756d4055a66864255358a434503e7e0e1f6bff /mysql-test/r/show_check.result | |
| parent | 5d782cc5cc028c7b2bb65f89caa5f2df7734b3e8 (diff) | |
| download | mariadb-git-0e755652df91c07fca7a777272bd4b04f18ba516.tar.gz | |
after merge fix
mysql-test/r/explain.result:
updated results
mysql-test/r/func_group.result:
updated results
mysql-test/r/order_by.result:
updated results
mysql-test/r/rpl000009.result:
updated results
mysql-test/r/rpl_insert_id.result:
updated results
mysql-test/r/show_check.result:
updated results
Diffstat (limited to 'mysql-test/r/show_check.result')
| -rw-r--r-- | mysql-test/r/show_check.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result index 66bd319c048..de652b05154 100644 --- a/mysql-test/r/show_check.result +++ b/mysql-test/r/show_check.result @@ -208,7 +208,7 @@ t1 CREATE TABLE `t1` ( `empty_char` char(0) default NULL, `type_char` char(2) default NULL, `type_varchar` varchar(10) default NULL, - `type_timestamp` timestamp(14) NOT NULL, + `type_timestamp` timestamp NOT NULL, `type_date` date NOT NULL default '0000-00-00', `type_time` time NOT NULL default '00:00:00', `type_datetime` datetime NOT NULL default '0000-00-00 00:00:00', @@ -221,11 +221,11 @@ t1 CREATE TABLE `t1` ( `type_long_blob` longblob, PRIMARY KEY (`type_tiny`), KEY `type_short` (`type_short`) -) TYPE=MyISAM MIN_ROWS=10 MAX_ROWS=100 AVG_ROW_LENGTH=10 PACK_KEYS=1 CHECKSUM=1 DELAY_KEY_WRITE=1 ROW_FORMAT=FIXED COMMENT='test' +) TYPE=MyISAM CHARSET=latin1 MIN_ROWS=10 MAX_ROWS=100 AVG_ROW_LENGTH=10 PACK_KEYS=1 CHECKSUM=1 DELAY_KEY_WRITE=1 ROW_FORMAT=FIXED COMMENT='test' insert into t1 (type_timestamp) values ("2003-02-07 10:00:01"); select * from t1; type_bool type_tiny type_short type_mediumint type_bigint type_decimal type_numeric empty_char type_char type_varchar type_timestamp type_date type_time type_datetime type_year type_enum type_set type_tinyblob type_blob type_medium_blob type_long_blob -0 1 NULL NULL NULL NULL NULL NULL NULL NULL 20030207100001 0000-00-00 00:00:00 0000-00-00 00:00:00 NULL NULL NULL NULL NULL NULL NULL +0 1 NULL NULL NULL NULL NULL NULL NULL NULL 2003-02-07 10:00:01 0000-00-00 00:00:00 0000-00-00 00:00:00 NULL NULL NULL NULL NULL NULL NULL drop table t1; create table t1 (c decimal, d double, f float, r real); show columns from t1; |