diff options
| author | monty@mashka.mysql.fi <> | 2002-10-02 17:55:12 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-10-02 17:55:12 +0300 |
| commit | 0f394576131c2f66046673420ca8b1311981a614 (patch) | |
| tree | a7ce8fe730bd0e06166bb15edcbe5aef252c2c3b /mysql-test/r/innodb.result | |
| parent | 7377f546316b13c2563fede4c3ed2506d29a93ac (diff) | |
| parent | 4d705988d562cac60d44e22f8d6e76df63432c72 (diff) | |
| download | mariadb-git-0f394576131c2f66046673420ca8b1311981a614.tar.gz | |
Merge with 4.0.4
Diffstat (limited to 'mysql-test/r/innodb.result')
| -rw-r--r-- | mysql-test/r/innodb.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index 78b0da2769e..34c2eef3fea 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -805,9 +805,9 @@ create table t1 (a char(20), index (a(5))) type=innodb; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` char(20) default NULL, + `a` char(20) character set latin1 default NULL, KEY `a` (`a`) -) TYPE=InnoDB +) TYPE=InnoDB CHARSET=latin1 drop table t1; create temporary table t1 (a int not null auto_increment, primary key(a)) type=innodb; insert into t1 values (NULL),(NULL),(NULL); |