diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-09-28 15:13:40 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-09-28 15:13:40 +0200 |
| commit | d8d57c77b1f3490b69e0ed116a766b6434137ecd (patch) | |
| tree | b32f8ef76a50a0b8ba8ae7067435060067fb83c3 /mysql-test/r | |
| parent | 6930d9d2695c5bdd2caea3d941834f105ba3e292 (diff) | |
| download | mariadb-git-d8d57c77b1f3490b69e0ed116a766b6434137ecd.tar.gz | |
Bug#22436 Four tests require "innodb" to be configured, fail in "classic" build
- Disable warnings when creating the "innodb" tables if it works anyway.
- Move test that are really innodb dependent to innodb_mysql
mysql-test/r/create.result:
Move the innodb dependent test to innodb_mysql.test
mysql-test/r/innodb_mysql.result:
Move the innodb dependent test to innodb_mysql.test
mysql-test/t/create.test:
Move the innodb dependent test to innodb_mysql.test
mysql-test/t/innodb_mysql.test:
Move the innodb dependent test to innodb_mysql.test
mysql-test/t/lock_multi.test:
Disable warnings while creating the innodb table. If innodb is not available, the table will be created with default engine and thus create a warning. Regardless of this, test output should be the same.
mysql-test/t/sp.test:
Disable warnings while creating the innodb table. If innodb is not available, the table will be created with default engine and thus create a warning. Regardless of this, test output should be the same.
mysql-test/t/view.test:
Disable warnings while creating the innodb table. If innodb is not available, the table will be created with default engine and thus create a warning. Regardless of this, test output should be the same.
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 3f8083a0e20..1cdd1b97243 100644 --- a/mysql-test/r/create.result +++ b/mysql-test/r/create.result @@ -767,9 +767,3 @@ 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; diff --git a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result index e7d097a1d2f..1afc1baa6e8 100644 --- a/mysql-test/r/innodb_mysql.result +++ b/mysql-test/r/innodb_mysql.result @@ -337,3 +337,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; |