diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-10-19 01:01:54 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-10-19 01:01:54 +0200 |
| commit | 15a86d185da20b26744c4cf9329c12fbed207a2a (patch) | |
| tree | ae7b35a52b5938cfcb0ee9c2b34078f346483d94 /mysql-test/r | |
| parent | 54fadc5b88824886d34242f2fd871c856a8f006b (diff) | |
| parent | d8d57c77b1f3490b69e0ed116a766b6434137ecd (diff) | |
| download | mariadb-git-15a86d185da20b26744c4cf9329c12fbed207a2a.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/bug22436/my50-bug22436
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/t/innodb_mysql.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/r/create.result:
Merge
mysql-test/t/create.test:
Merge
mysql-test/t/view.test:
Remove the disable_warnings part as engine=innodb has been removed
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/create.result | 6 | ||||
| -rw-r--r-- | mysql-test/r/innodb_mysql.result | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result index 5f885ad199b..1dcbc693597 100644 --- a/mysql-test/r/create.result +++ b/mysql-test/r/create.result @@ -767,11 +767,5 @@ t1 CREATE TABLE `t1` ( `i` int(11) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 MAX_ROWS=4294967295 drop table t1; -create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb -character set utf8 collate utf8_general_ci; -Warnings: -Warning 1071 Specified key was too long; max key length is 765 bytes -insert into t1 values('aaa'); -drop table t1; create table t1 (upgrade int); drop table t1; diff --git a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result index 9c5a691d26b..517f1208784 100644 --- a/mysql-test/r/innodb_mysql.result +++ b/mysql-test/r/innodb_mysql.result @@ -347,3 +347,9 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t2 index NULL fkey 5 NULL 5 Using index 1 SIMPLE t1 eq_ref PRIMARY PRIMARY 4 test.t2.fkey 1 Using where DROP TABLE t1,t2; +create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb +character set utf8 collate utf8_general_ci; +Warnings: +Warning 1071 Specified key was too long; max key length is 765 bytes +insert into t1 values('aaa'); +drop table t1; |