From 48d435b16f6d071fe2726f80c3dc080f5632cb21 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 12 Feb 2006 13:26:30 -0800 Subject: This patch removes the remaining TYPE= code from MySQL. It cleans up a number of tests where it was being called still (and failing). Also I cleaned up all of the extra scripts so that they now work. BitKeeper/deleted/.del-raid.test~501e9e00b3c27a55: Delete: mysql-test/t/raid.test mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test: Test change mysql-test/r/binlog_stm_mix_innodb_myisam.result: New results mysql-test/r/ctype_ujis.result: New results mysql-test/r/innodb_concurrent.result: New results. mysql-test/r/rpl_heap.result: New results mysql-test/r/warnings.result: New results mysql-test/t/ctype_ujis.test: Fixed ENGINE=, test should now actually function mysql-test/t/innodb_concurrent.test: Fixed test for engine mysql-test/t/rpl_heap.test: Fixed test for engine mysql-test/t/system_mysql_db_fix.test: Fixed setup. mysql-test/t/warnings.test: Removed deprecated tests scripts/fill_func_tables.sh: Fixed script scripts/mysql_convert_table_format.sh: Fixed script sql/ha_innodb.cc: Fixed comment sql/sql_yacc.yy: Removed deprecated syntax tests/fork_big.pl: Fixed scipt tests/fork_big2.pl: Fixed script tests/mail_to_db.pl: Fixed script tests/mysql_client_test.c: Fixed test --- mysql-test/t/innodb_concurrent.test | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'mysql-test/t/innodb_concurrent.test') diff --git a/mysql-test/t/innodb_concurrent.test b/mysql-test/t/innodb_concurrent.test index 1595fcd2467..957276a44c7 100644 --- a/mysql-test/t/innodb_concurrent.test +++ b/mysql-test/t/innodb_concurrent.test @@ -11,7 +11,7 @@ connection default; drop table if exists t1; -create table t1(eta int(11) not null, tipo int(11), c varchar(255)) type=innodb; +create table t1(eta int(11) not null, tipo int(11), c varchar(255)) engine=innodb; connect (thread1, localhost, mysqltest,,); connection thread1; insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); @@ -57,7 +57,7 @@ drop table t1; # #connect (thread1, localhost, mysqltest,,); connection thread1; -create table t1(eta int(11) not null, tipo int(11), c varchar(255)) type=innodb; +create table t1(eta int(11) not null, tipo int(11), c varchar(255)) engine=innodb; insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); insert into t1 values (10,1,"ccccccccccccccccccccccccccccccccccccccccccc"); @@ -132,7 +132,7 @@ drop table t1; # #connect (thread1, localhost, mysqltest,,); connection thread1; -create table t1(eta int(11) not null, tipo int(11), c varchar(255)) type=innodb; +create table t1(eta int(11) not null, tipo int(11), c varchar(255)) engine=innodb; insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); insert into t1 values (10,1,"ccccccccccccccccccccccccccccccccccccccccccc"); @@ -175,7 +175,7 @@ drop table t1; # #connect (thread1, localhost, mysqltest,,); connection thread1; -create table t1(eta int(11) not null, tipo int(11), c varchar(255)) type=innodb; +create table t1(eta int(11) not null, tipo int(11), c varchar(255)) engine=innodb; insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); insert into t1 values (10,1,"ccccccccccccccccccccccccccccccccccccccccccc"); @@ -218,7 +218,7 @@ drop table t1; # #connect (thread1, localhost, mysqltest,,); connection thread1; -create table t1(eta int(11) not null, tipo int(11), c varchar(255)) type=innodb; +create table t1(eta int(11) not null, tipo int(11), c varchar(255)) engine=innodb; insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); insert into t1 values (10,1,"ccccccccccccccccccccccccccccccccccccccccccc"); @@ -261,7 +261,7 @@ drop table t1; # #connect (thread1, localhost, mysqltest,,); connection thread1; -create table t1(eta int(11) not null, tipo int(11), c varchar(255)) type=innodb; +create table t1(eta int(11) not null, tipo int(11), c varchar(255)) engine=innodb; insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); insert into t1 values (10,1,"ccccccccccccccccccccccccccccccccccccccccccc"); @@ -305,7 +305,7 @@ drop table t1; # #connect (thread1, localhost, mysqltest,,); connection thread1; -create table t1(eta int(11) not null, tipo int(11), c varchar(255)) type=innodb; +create table t1(eta int(11) not null, tipo int(11), c varchar(255)) engine=innodb; insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); insert into t1 values (10,1,"ccccccccccccccccccccccccccccccccccccccccccc"); -- cgit v1.2.1