merge before pushing

Makefile.am

@@ -149,7 +149,7 @@ test-bt:
 	  echo "no program found for 'ndbcluster' tests - skipped testing" ; \
 	fi
 	-cd mysql-test ; MTR_BUILD_THREAD=auto \
-	    @PERL@ ./mysql-test-run.pl --force --comment=funcs1+ps --ps-protocol --suite=funcs_1
+	    @PERL@ ./mysql-test-run.pl --force --comment=funcs1+ps --ps-protocol --reorder --suite=funcs_1
 	-cd mysql-test ; MTR_BUILD_THREAD=auto \
 	    @PERL@ ./mysql-test-run.pl --force --comment=funcs2 --suite=funcs_2
 	-cd mysql-test ; MTR_BUILD_THREAD=auto \
@@ -190,7 +190,7 @@ test-force-full-pl: test-force-full
 
 test-ext-funcs:
 	cd mysql-test ; \
-	    @PERL@ ./mysql-test-run.pl --force --suite=funcs_1 ; \
+	    @PERL@ ./mysql-test-run.pl --force --reorder --suite=funcs_1 ; \
 	    @PERL@ ./mysql-test-run.pl --force --suite=funcs_2
 
 test-ext-rpl:

mysql-test/r/func_misc.result

@@ -173,7 +173,7 @@ WHERE attempt = 4 - 1 + 1;
 UPDATE t_history SET end_cached = 0
 WHERE attempt = 4 - 1 + 1;
 # Test 1: Does the query with SLEEP need a reasonable time?
-SELECT COUNT(*) > 4 - 1 INTO @aux1 FROM t_history
+SELECT COUNT(*) >= 4 - 1 INTO @aux1 FROM t_history
 WHERE TIMEDIFF(end_ts,start_ts) - @sleep_time_per_result_row * @row_count
 BETWEEN 0 AND @max_acceptable_delay;
 SELECT @aux1 AS "Expect 1";
@@ -181,7 +181,7 @@ Expect 1
 1
 # Test 2: Does the query with SLEEP need a reasonable time even in case
 #         of the non first execution?
-SELECT COUNT(*) > 4 - 1 - 1 INTO @aux2 FROM t_history
+SELECT COUNT(*) >= 4 - 1 - 1 INTO @aux2 FROM t_history
 WHERE TIMEDIFF(end_ts,start_ts) - @sleep_time_per_result_row * @row_count
 BETWEEN 0 AND @max_acceptable_delay
 AND attempt > 1;

mysql-test/suite/funcs_1/include/tb3.inc

+##### suite/funcs_1/include/tb3.inc
+#
+# This auxiliary script is used in several Trigger tests.
+#
+# If the table need data than the file std_data_ln/funcs_1/memory_tb3.txt
+# could be used.
+#
+
+--disable_warnings
+drop table if exists tb3;
+--enable_warnings
+--replace_result $engine_type <engine_to_be_used>
+eval create table tb3 (
+f118 char not null DEFAULT 'a',
+f119 char binary not null DEFAULT b'101',
+f120 char ascii not null DEFAULT b'101',
+f121 char(50),
+f122 char(50),
+f129 binary not null DEFAULT b'101',
+f130 tinyint not null DEFAULT 99,
+f131 tinyint unsigned not null DEFAULT 99,
+f132 tinyint zerofill not null DEFAULT 99,
+f133 tinyint unsigned zerofill not null DEFAULT 99,
+f134 smallint not null DEFAULT 999,
+f135 smallint unsigned not null DEFAULT 999,
+f136 smallint zerofill not null DEFAULT 999,
+f137 smallint unsigned zerofill not null DEFAULT 999,
+f138 mediumint not null DEFAULT 9999,
+f139 mediumint unsigned not null DEFAULT 9999,
+f140 mediumint zerofill not null DEFAULT 9999,
+f141 mediumint unsigned zerofill not null DEFAULT 9999,
+f142 int not null DEFAULT 99999,
+f143 int unsigned not null DEFAULT 99999,
+f144 int zerofill not null DEFAULT 99999,
+f145 int unsigned zerofill not null DEFAULT 99999,
+f146 bigint not null DEFAULT 999999,
+f147 bigint unsigned not null DEFAULT 999999,
+f148 bigint zerofill not null DEFAULT 999999,
+f149 bigint unsigned zerofill not null DEFAULT 999999,
+f150 decimal not null DEFAULT 999.999,
+f151 decimal unsigned not null DEFAULT 999.17,
+f152 decimal zerofill not null DEFAULT 999.999,
+f153 decimal unsigned zerofill,
+f154 decimal (0),
+f155 decimal (64),
+f156 decimal (0) unsigned,
+f157 decimal (64) unsigned,
+f158 decimal (0) zerofill,
+f159 decimal (64) zerofill,
+f160 decimal (0) unsigned zerofill,
+f161 decimal (64) unsigned zerofill,
+f162 decimal (0,0),
+f163 decimal (63,30),
+f164 decimal (0,0) unsigned,
+f165 decimal (63,30) unsigned,
+f166 decimal (0,0) zerofill,
+f167 decimal (63,30) zerofill,
+f168 decimal (0,0) unsigned zerofill,
+f169 decimal (63,30) unsigned zerofill,
+f170 numeric,
+f171 numeric unsigned,
+f172 numeric zerofill,
+f173 numeric unsigned zerofill,
+f174 numeric (0),
+f175 numeric (64)
+) engine = $engine_type;

mysql-test/suite/funcs_1/r/innodb_trig_0102.result

 USE test;
-drop table if exists tb3 ;
+drop table if exists tb3;
 create table tb3 (
 f118 char not null DEFAULT 'a',
 f119 char binary not null DEFAULT b'101',
 f120 char ascii not null DEFAULT b'101',
-f121 tinytext,
-f122 text,
-f123 mediumtext,
-f124 longtext unicode,
-f125 tinyblob,
-f126 blob,
-f127 mediumblob,
-f128 longblob,
+f121 char(50),
+f122 char(50),
 f129 binary not null DEFAULT b'101',
 f130 tinyint not null DEFAULT 99,
 f131 tinyint unsigned not null DEFAULT 99,
@@ -59,13 +53,11 @@ f172 numeric zerofill,
 f173 numeric unsigned zerofill,
 f174 numeric (0),
 f175 numeric (64)
-) engine = innodb;
+) engine = <engine_to_be_used>;
 Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb3.txt'
-into table tb3;
 
 Testcase: 3.5.1.1:
 ------------------
@@ -194,7 +186,7 @@ Testcase 3.5.1.7: - need to fix
 drop table if exists t1;
 Warnings:
 Note	1051	Unknown table 't1'
-create table t1 (f1 int, f2 char(25),f3 int) engine=innodb;
+create table t1 (f1 int, f2 char(25),f3 int) engine = <engine_to_be_used>;
 CREATE TRIGGER trg5_1 BEFORE INSERT on test.t1
 for each row set new.f3 = '14';
 CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ
@@ -238,7 +230,7 @@ ERROR HY000: Trigger in wrong schema
 drop database if exists trig_db;
 create database trig_db;
 use trig_db;
-create table t1 (f1 integer) engine = innodb;
+create table t1 (f1 integer) engine = <engine_to_be_used>;
 use test;
 CREATE TRIGGER trig_db.trg6_2 AFTER INSERT on tb3
 for each row set @ret_trg6_2 = 5;
@@ -266,8 +258,8 @@ Testcase 3.5.1.?:
 -----------------
 drop table if exists t1;
 drop table if exists t2;
-create table t1 (f1 char(50), f2 integer) engine = innodb;
-create table t2 (f1 char(50), f2 integer) engine = innodb;
+create table t1 (f1 char(50), f2 integer) engine = <engine_to_be_used>;
+create table t2 (f1 char(50), f2 integer) engine = <engine_to_be_used>;
 create trigger trig before insert on t1
 for each row set new.f1 ='trig t1';
 create trigger trig before update on t2
@@ -299,15 +291,15 @@ create database trig_db1;
 create database trig_db2;
 create database trig_db3;
 use trig_db1;
-create table t1 (f1 char(50), f2 integer) engine = innodb;
+create table t1 (f1 char(50), f2 integer) engine = <engine_to_be_used>;
 create trigger trig before insert on t1
 for each row set new.f1 ='trig1', @test_var1='trig1';
 use trig_db2;
-create table t2 (f1 char(50), f2 integer) engine = innodb;
+create table t2 (f1 char(50), f2 integer) engine = <engine_to_be_used>;
 create trigger trig before insert on t2
 for each row set new.f1 ='trig2', @test_var2='trig2';
 use trig_db3;
-create table t1 (f1 char(50), f2 integer) engine = innodb;
+create table t1 (f1 char(50), f2 integer) engine = <engine_to_be_used>;
 create trigger trig before insert on t1
 for each row set new.f1 ='trig3', @test_var3='trig3';
 set @test_var1= '', @test_var2= '', @test_var3= '';
@@ -345,8 +337,8 @@ drop database if exists trig_db2;
 create database trig_db1;
 create database trig_db2;
 use trig_db1;
-create table t1 (f1 char(50), f2 integer) engine = innodb;
-create table trig_db2.t1 (f1 char(50), f2 integer) engine = innodb;
+create table t1 (f1 char(50), f2 integer) engine = <engine_to_be_used>;
+create table trig_db2.t1 (f1 char(50), f2 integer) engine = <engine_to_be_used>;
 create trigger trig1_b before insert on t1
 for each row set @test_var1='trig1_b';
 create trigger trig_db1.trig1_a after insert on t1

mysql-test/suite/funcs_1/r/innodb_trig_03.result

 USE test;
-drop table if exists tb3 ;
+drop table if exists tb3;
 create table tb3 (
 f118 char not null DEFAULT 'a',
 f119 char binary not null DEFAULT b'101',
 f120 char ascii not null DEFAULT b'101',
-f121 tinytext,
-f122 text,
-f123 mediumtext,
-f124 longtext unicode,
-f125 tinyblob,
-f126 blob,
-f127 mediumblob,
-f128 longblob,
+f121 char(50),
+f122 char(50),
 f129 binary not null DEFAULT b'101',
 f130 tinyint not null DEFAULT 99,
 f131 tinyint unsigned not null DEFAULT 99,
@@ -59,20 +53,18 @@ f172 numeric zerofill,
 f173 numeric unsigned zerofill,
 f174 numeric (0),
 f175 numeric (64)
-) engine = innodb;
+) engine = <engine_to_be_used>;
 Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb3.txt'
-into table tb3;
 
 Testcase 3.5.3:
 ---------------
 drop database if exists priv_db;
 create database priv_db;
 use priv_db;
-create table t1 (f1 char(20)) engine= innodb;
+create table t1 (f1 char(20)) engine= <engine_to_be_used>;
 create User test_noprivs@localhost;
 set password for test_noprivs@localhost = password('PWD');
 create User test_yesprivs@localhost;
@@ -608,8 +600,8 @@ Testcase: 3.5.3.x:
 use priv_db;
 drop table if exists t1;
 drop table if exists t2;
-create table t1 (f1 int) engine= innodb;
-create table t2 (f2 int) engine= innodb;
+create table t1 (f1 int) engine= <engine_to_be_used>;
+create table t2 (f2 int) engine= <engine_to_be_used>;
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
 grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT, UPDATE on priv_db.t1 to test_yesprivs@localhost;
@@ -698,4 +690,5 @@ drop database if exists priv_db;
 drop user test_yesprivs@localhost;
 drop user test_noprivs@localhost;
 drop user test_noprivs;
-DROP TABLE test.tb3;
+use test;
+drop table tb3;

mysql-test/suite/funcs_1/r/innodb_trig_0407.result

 USE test;
-drop table if exists tb3 ;
+drop table if exists tb3;
 create table tb3 (
 f118 char not null DEFAULT 'a',
 f119 char binary not null DEFAULT b'101',
 f120 char ascii not null DEFAULT b'101',
-f121 tinytext,
-f122 text,
-f123 mediumtext,
-f124 longtext unicode,
-f125 tinyblob,
-f126 blob,
-f127 mediumblob,
-f128 longblob,
+f121 char(50),
+f122 char(50),
 f129 binary not null DEFAULT b'101',
 f130 tinyint not null DEFAULT 99,
 f131 tinyint unsigned not null DEFAULT 99,
@@ -59,13 +53,11 @@ f172 numeric zerofill,
 f173 numeric unsigned zerofill,
 f174 numeric (0),
 f175 numeric (64)
-) engine = innodb;
+) engine = <engine_to_be_used>;
 Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb3.txt'
-into table tb3;
 
 Testcase: 3.5:
 --------------
@@ -86,7 +78,7 @@ Testcase 3.5.4.1:
 -----------------
 create database db_drop;
 Use db_drop;
-create table t1 (f1 char(30)) engine=innodb;
+create table t1 (f1 char(30)) engine = <engine_to_be_used>;
 grant INSERT, SELECT on db_drop.t1 to test_general;
 Use db_drop;
 Create trigger trg1 BEFORE INSERT on t1
@@ -114,7 +106,7 @@ Testcase 3.5.4.2:
 create database db_drop2;
 Use db_drop2;
 drop table if exists t1_432 ;
-create table t1_432 (f1 char (30)) engine=innodb;
+create table t1_432 (f1 char (30)) engine = <engine_to_be_used>;
 Drop trigger tr_does_not_exit;
 ERROR HY000: Trigger does not exist
 drop table if exists t1_432 ;
@@ -126,8 +118,8 @@ create database db_drop3;
 Use db_drop3;
 drop table if exists t1_433 ;
 drop table if exists t1_433a ;
-create table t1_433 (f1 char (30)) engine=innodb;
-create table t1_433a (f1a char (5)) engine=innodb;
+create table t1_433 (f1 char (30)) engine = <engine_to_be_used>;
+create table t1_433a (f1a char (5)) engine = <engine_to_be_used>;
 CREATE TRIGGER trg3 BEFORE INSERT on t1_433 for each row
 set new.f1 = 'Trigger 3.5.4.3';
 Drop trigger t1.433.trg3;
@@ -147,7 +139,7 @@ Testcase 3.5.4.4:
 -----------------
 create database db_drop4;
 Use db_drop4;
-create table t1 (f1 char(30)) engine=innodb;
+create table t1 (f1 char(30)) engine = <engine_to_be_used>;
 grant INSERT, SELECT on db_drop4.t1 to test_general;
 Create trigger trg4 BEFORE INSERT on t1
 for each row set new.f1='Trigger 3.5.4.4';
@@ -168,7 +160,7 @@ where information_schema.triggers.trigger_name='trg4';
 trigger_schema	trigger_name	event_object_table
 create database db_drop4;
 Use db_drop4;
-create table t1 (f1 char(30)) engine=innodb;
+create table t1 (f1 char(30)) engine = <engine_to_be_used>;
 grant INSERT, SELECT on db_drop4.t1 to test_general;
 Insert into t1 values ('2nd Insert 3.5.4.4');
 Select * from t1;
@@ -183,7 +175,7 @@ Testcase 3.5.4.5:
 -----------------
 create database db_drop5;
 Use db_drop5;
-create table t1 (f1 char(50)) engine=innodb;
+create table t1 (f1 char(50)) engine = <engine_to_be_used>;
 grant INSERT, SELECT on t1 to test_general;
 Create trigger trg5 BEFORE INSERT on t1
 for each row set new.f1='Trigger 3.5.4.5';
@@ -199,7 +191,7 @@ select trigger_schema, trigger_name, event_object_table
 from information_schema.triggers
 where information_schema.triggers.trigger_name='trg5';
 trigger_schema	trigger_name	event_object_table
-create table t1 (f1 char(50)) engine=innodb;
+create table t1 (f1 char(50)) engine = <engine_to_be_used>;
 grant INSERT, SELECT on t1 to test_general;
 Insert into t1 values ('2nd Insert 3.5.4.5');
 Select * from t1;
@@ -240,7 +232,7 @@ Testcase 3.5.5.4:
 create database dbtest_one;
 create database dbtest_two;
 use dbtest_two;
-create table t2 (f1 char(15)) engine=innodb;
+create table t2 (f1 char(15)) engine = <engine_to_be_used>;
 use dbtest_one;
 create trigger trg4 before INSERT
 on dbtest_two.t2 for each row set new.f1='trig 3.5.5.4';

mysql-test/suite/funcs_1/r/innodb_trig_08.result

 USE test;
-drop table if exists tb3 ;
+drop table if exists tb3;
 create table tb3 (
 f118 char not null DEFAULT 'a',
 f119 char binary not null DEFAULT b'101',
 f120 char ascii not null DEFAULT b'101',
-f121 tinytext,
-f122 text,
-f123 mediumtext,
-f124 longtext unicode,
-f125 tinyblob,
-f126 blob,
-f127 mediumblob,
-f128 longblob,
+f121 char(50),
+f122 char(50),
 f129 binary not null DEFAULT b'101',
 f130 tinyint not null DEFAULT 99,
 f131 tinyint unsigned not null DEFAULT 99,
@@ -59,13 +53,11 @@ f172 numeric zerofill,
 f173 numeric unsigned zerofill,
 f174 numeric (0),
 f175 numeric (64)
-) engine = innodb;
+) engine = <engine_to_be_used>;
 Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb3.txt'
-into table tb3;
 
 Testcase: 3.5:
 --------------
@@ -94,17 +86,17 @@ create table t1_i (
 i120 char ascii not null DEFAULT b'101',
 i136 smallint zerofill not null DEFAULT 999,
 i144 int zerofill not null DEFAULT 99999,
-i163 decimal (63,30)) engine=innodb;
+i163 decimal (63,30)) engine=<engine_to_be_used>;
 create table t1_u (
 u120 char ascii not null DEFAULT b'101',
 u136 smallint zerofill not null DEFAULT 999,
 u144 int zerofill not null DEFAULT 99999,
-u163 decimal (63,30)) engine=innodb;
+u163 decimal (63,30)) engine=<engine_to_be_used>;
 create table t1_d (
 d120 char ascii not null DEFAULT b'101',
 d136 smallint zerofill not null DEFAULT 999,
 d144 int zerofill not null DEFAULT 99999,
-d163 decimal (63,30)) engine=innodb;
+d163 decimal (63,30)) engine=<engine_to_be_used>;
 Insert into t1_u values ('a',111,99999,999.99);
 Insert into t1_u values ('b',222,99999,999.99);
 Insert into t1_u values ('c',333,99999,999.99);

mysql-test/suite/funcs_1/r/innodb_trig_09.result

 USE test;
-drop table if exists tb3 ;
+drop table if exists tb3;
 create table tb3 (
 f118 char not null DEFAULT 'a',
 f119 char binary not null DEFAULT b'101',
 f120 char ascii not null DEFAULT b'101',
-f121 tinytext,
-f122 text,
-f123 mediumtext,
-f124 longtext unicode,
-f125 tinyblob,
-f126 blob,
-f127 mediumblob,
-f128 longblob,
+f121 char(50),
+f122 char(50),
 f129 binary not null DEFAULT b'101',
 f130 tinyint not null DEFAULT 99,
 f131 tinyint unsigned not null DEFAULT 99,
@@ -59,12 +53,12 @@ f172 numeric zerofill,
 f173 numeric unsigned zerofill,
 f174 numeric (0),
 f175 numeric (64)
-) engine = innodb;
+) engine = <engine_to_be_used>;
 Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb3.txt'
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb3.txt'
 into table tb3;
 
 Testcase 3.5.9.1/2:
@@ -74,9 +68,9 @@ set new.f142 = 94087, @counter=@counter+1;
 TotalRows
 10
 Affected
-8
+9
 NotAffected
-2
+1
 NewValuew
 0
 set @counter=0;
@@ -84,7 +78,7 @@ Update tb3 Set f142='1' where f130<100;
 select count(*) as ExpectedChanged, @counter as TrigCounter
 from tb3 where f142=94087;
 ExpectedChanged	TrigCounter
-8	8
+9	9
 select count(*) as ExpectedNotChange from tb3
 where f130<100 and f142<>94087;
 ExpectedNotChange

mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result

 USE test;
-drop table if exists tb3 ;
+drop table if exists tb3;
 create table tb3 (
 f118 char not null DEFAULT 'a',
 f119 char binary not null DEFAULT b'101',
 f120 char ascii not null DEFAULT b'101',
-f121 tinytext,
-f122 text,
-f123 mediumtext,
-f124 longtext unicode,
-f125 tinyblob,
-f126 blob,
-f127 mediumblob,
-f128 longblob,
+f121 char(50),
+f122 char(50),
 f129 binary not null DEFAULT b'101',
 f130 tinyint not null DEFAULT 99,
 f131 tinyint unsigned not null DEFAULT 99,
@@ -59,12 +53,12 @@ f172 numeric zerofill,
 f173 numeric unsigned zerofill,
 f174 numeric (0),
 f175 numeric (64)
-) engine = innodb;
+) engine = <engine_to_be_used>;
 Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb3.txt'
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb3.txt'
 into table tb3;
 
 Testcase 3.5.10.1/2/3:
@@ -135,7 +129,7 @@ delete from tb3 where f122 like 'Test 3.5.10.1/2/3%';
 
 Testcase 3.5.10.4:
 ------------------
-create table tb_load (f1 int, f2 char(25),f3 int) engine=innodb;
+create table tb_load (f1 int, f2 char(25),f3 int) engine = <engine_to_be_used>;
 Create trigger trg4 before insert on tb_load
 for each row set new.f3=-(new.f1 div 5), @counter= @counter+1;
 set @counter= 0;
@@ -169,7 +163,7 @@ Testcase 3.5.10.6: (implemented in trig_frkey.test)
 
 Testcase 3.5.10.extra:
 ----------------------
-create table t1_sp (var136 tinyint, var151 decimal) engine=innodb;
+create table t1_sp (var136 tinyint, var151 decimal) engine = <engine_to_be_used>;
 create trigger trg before insert on t1_sp
 for each row set @counter=@counter+1;
 create procedure trig_sp()
@@ -218,12 +212,12 @@ drop table if exists t2_2;
 drop table if exists t2_3;
 drop table if exists t2_4;
 drop table if exists t3;
-create table t1 (f1 integer) engine=innodb;
-create table t2_1 (f1 integer) engine=innodb;
-create table t2_2 (f1 integer) engine=innodb;
-create table t2_3 (f1 integer) engine=innodb;
-create table t2_4 (f1 integer) engine=innodb;
-create table t3 (f1 integer) engine=innodb;
+create table t1 (f1 integer) engine = <engine_to_be_used>;
+create table t2_1 (f1 integer) engine = <engine_to_be_used>;
+create table t2_2 (f1 integer) engine = <engine_to_be_used>;
+create table t2_3 (f1 integer) engine = <engine_to_be_used>;
+create table t2_4 (f1 integer) engine = <engine_to_be_used>;
+create table t3 (f1 integer) engine = <engine_to_be_used>;
 insert into t1 values (1);
 create trigger tr1 after insert on t1 for each row
 BEGIN
@@ -261,10 +255,10 @@ drop table if exists t1;
 drop table if exists t2;
 drop table if exists t3;
 drop table if exists t4;
-create table t1 (f1 integer) engine = innodb;
-create table t2 (f2 integer) engine = innodb;
-create table t3 (f3 integer) engine = innodb;
-create table t4 (f4 integer) engine = innodb;
+create table t1 (f1 integer) engine = <engine_to_be_used>;
+create table t2 (f2 integer) engine = <engine_to_be_used>;
+create table t3 (f3 integer) engine = <engine_to_be_used>;
+create table t4 (f4 integer) engine = <engine_to_be_used>;
 insert into t1 values (0);
 create trigger tr1 after insert on t1
 for each row insert into t2 (f2) values (new.f1+1);
@@ -300,7 +294,7 @@ set @sql_mode='traditional';
 create table t1_sp (
 count integer,
 var136 tinyint,
-var151 decimal) engine=innodb;
+var151 decimal) engine = <engine_to_be_used>;
 create procedure trig_sp()
 begin
 declare done int default 0;
@@ -354,7 +348,7 @@ drop procedure trig_sp;
 drop trigger trg;
 drop table t1_sp;
 
-Testcase y.y.y.5: Roleback of nested trigger references
+Testcase y.y.y.5: Rollback of nested trigger references
 -------------------------------------------------------
 set @@sql_mode='traditional';
 use test;
@@ -362,10 +356,10 @@ drop table if exists t1;
 drop table if exists t2;
 drop table if exists t3;
 drop table if exists t4;
-create table t1 (f1 integer) engine = innodb;
-create table t2 (f2 integer) engine = innodb;
-create table t3 (f3 integer) engine = innodb;
-create table t4 (f4 tinyint) engine = innodb;
+create table t1 (f1 integer) engine = <engine_to_be_used>;
+create table t2 (f2 integer) engine = <engine_to_be_used>;
+create table t3 (f3 integer) engine = <engine_to_be_used>;
+create table t4 (f4 tinyint) engine = <engine_to_be_used>;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (

mysql-test/suite/funcs_1/r/memory_trig_0102.result

@@ -53,13 +53,11 @@ f172 numeric zerofill,
 f173 numeric unsigned zerofill,
 f174 numeric (0),
 f175 numeric (64)
-) engine = memory;
+) engine = <engine_to_be_used>;
 Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb3.txt'
-into table tb3;
 
 Testcase: 3.5.1.1:
 ------------------
@@ -188,7 +186,7 @@ Testcase 3.5.1.7: - need to fix
 drop table if exists t1;
 Warnings:
 Note	1051	Unknown table 't1'
-create table t1 (f1 int, f2 char(25),f3 int) engine=memory;
+create table t1 (f1 int, f2 char(25),f3 int) engine = <engine_to_be_used>;
 CREATE TRIGGER trg5_1 BEFORE INSERT on test.t1
 for each row set new.f3 = '14';
 CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ
@@ -232,7 +230,7 @@ ERROR HY000: Trigger in wrong schema
 drop database if exists trig_db;
 create database trig_db;
 use trig_db;
-create table t1 (f1 integer) engine = memory;
+create table t1 (f1 integer) engine = <engine_to_be_used>;
 use test;
 CREATE TRIGGER trig_db.trg6_2 AFTER INSERT on tb3
 for each row set @ret_trg6_2 = 5;
@@ -260,8 +258,8 @@ Testcase 3.5.1.?:
 -----------------
 drop table if exists t1;
 drop table if exists t2;
-create table t1 (f1 char(50), f2 integer) engine = memory;
-create table t2 (f1 char(50), f2 integer) engine = memory;
+create table t1 (f1 char(50), f2 integer) engine = <engine_to_be_used>;
+create table t2 (f1 char(50), f2 integer) engine = <engine_to_be_used>;
 create trigger trig before insert on t1
 for each row set new.f1 ='trig t1';
 create trigger trig before update on t2
@@ -293,15 +291,15 @@ create database trig_db1;
 create database trig_db2;
 create database trig_db3;
 use trig_db1;
-create table t1 (f1 char(50), f2 integer) engine = memory;
+create table t1 (f1 char(50), f2 integer) engine = <engine_to_be_used>;
 create trigger trig before insert on t1
 for each row set new.f1 ='trig1', @test_var1='trig1';
 use trig_db2;
-create table t2 (f1 char(50), f2 integer) engine = memory;
+create table t2 (f1 char(50), f2 integer) engine = <engine_to_be_used>;
 create trigger trig before insert on t2
 for each row set new.f1 ='trig2', @test_var2='trig2';
 use trig_db3;
-create table t1 (f1 char(50), f2 integer) engine = memory;
+create table t1 (f1 char(50), f2 integer) engine = <engine_to_be_used>;
 create trigger trig before insert on t1
 for each row set new.f1 ='trig3', @test_var3='trig3';
 set @test_var1= '', @test_var2= '', @test_var3= '';
@@ -339,8 +337,8 @@ drop database if exists trig_db2;
 create database trig_db1;
 create database trig_db2;
 use trig_db1;
-create table t1 (f1 char(50), f2 integer) engine = memory;
-create table trig_db2.t1 (f1 char(50), f2 integer) engine = memory;
+create table t1 (f1 char(50), f2 integer) engine = <engine_to_be_used>;
+create table trig_db2.t1 (f1 char(50), f2 integer) engine = <engine_to_be_used>;
 create trigger trig1_b before insert on t1
 for each row set @test_var1='trig1_b';
 create trigger trig_db1.trig1_a after insert on t1

mysql-test/suite/funcs_1/r/memory_trig_03.result

@@ -53,20 +53,18 @@ f172 numeric zerofill,
 f173 numeric unsigned zerofill,
 f174 numeric (0),
 f175 numeric (64)
-) engine = memory;
+) engine = <engine_to_be_used>;
 Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb3.txt'
-into table tb3;
 
 Testcase 3.5.3:
 ---------------
 drop database if exists priv_db;
 create database priv_db;
 use priv_db;
-create table t1 (f1 char(20)) engine= memory;
+create table t1 (f1 char(20)) engine= <engine_to_be_used>;
 create User test_noprivs@localhost;
 set password for test_noprivs@localhost = password('PWD');
 create User test_yesprivs@localhost;
@@ -602,8 +600,8 @@ Testcase: 3.5.3.x:
 use priv_db;
 drop table if exists t1;
 drop table if exists t2;
-create table t1 (f1 int) engine= memory;
-create table t2 (f2 int) engine= memory;
+create table t1 (f1 int) engine= <engine_to_be_used>;
+create table t2 (f2 int) engine= <engine_to_be_used>;
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
 grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT, UPDATE on priv_db.t1 to test_yesprivs@localhost;
@@ -692,4 +690,5 @@ drop database if exists priv_db;
 drop user test_yesprivs@localhost;
 drop user test_noprivs@localhost;
 drop user test_noprivs;
-DROP TABLE test.tb3;
+use test;
+drop table tb3;

mysql-test/suite/funcs_1/r/memory_trig_0407.result

@@ -53,13 +53,11 @@ f172 numeric zerofill,
 f173 numeric unsigned zerofill,
 f174 numeric (0),
 f175 numeric (64)
-) engine = memory;
+) engine = <engine_to_be_used>;
 Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb3.txt'
-into table tb3;
 
 Testcase: 3.5:
 --------------
@@ -80,7 +78,7 @@ Testcase 3.5.4.1:
 -----------------
 create database db_drop;
 Use db_drop;
-create table t1 (f1 char(30)) engine=memory;
+create table t1 (f1 char(30)) engine = <engine_to_be_used>;
 grant INSERT, SELECT on db_drop.t1 to test_general;
 Use db_drop;
 Create trigger trg1 BEFORE INSERT on t1
@@ -108,7 +106,7 @@ Testcase 3.5.4.2:
 create database db_drop2;
 Use db_drop2;
 drop table if exists t1_432 ;
-create table t1_432 (f1 char (30)) engine=memory;
+create table t1_432 (f1 char (30)) engine = <engine_to_be_used>;
 Drop trigger tr_does_not_exit;
 ERROR HY000: Trigger does not exist
 drop table if exists t1_432 ;
@@ -120,8 +118,8 @@ create database db_drop3;
 Use db_drop3;
 drop table if exists t1_433 ;
 drop table if exists t1_433a ;
-create table t1_433 (f1 char (30)) engine=memory;
-create table t1_433a (f1a char (5)) engine=memory;
+create table t1_433 (f1 char (30)) engine = <engine_to_be_used>;
+create table t1_433a (f1a char (5)) engine = <engine_to_be_used>;
 CREATE TRIGGER trg3 BEFORE INSERT on t1_433 for each row
 set new.f1 = 'Trigger 3.5.4.3';
 Drop trigger t1.433.trg3;
@@ -141,7 +139,7 @@ Testcase 3.5.4.4:
 -----------------
 create database db_drop4;
 Use db_drop4;
-create table t1 (f1 char(30)) engine=memory;
+create table t1 (f1 char(30)) engine = <engine_to_be_used>;
 grant INSERT, SELECT on db_drop4.t1 to test_general;
 Create trigger trg4 BEFORE INSERT on t1
 for each row set new.f1='Trigger 3.5.4.4';
@@ -162,7 +160,7 @@ where information_schema.triggers.trigger_name='trg4';
 trigger_schema	trigger_name	event_object_table
 create database db_drop4;
 Use db_drop4;
-create table t1 (f1 char(30)) engine=memory;
+create table t1 (f1 char(30)) engine = <engine_to_be_used>;
 grant INSERT, SELECT on db_drop4.t1 to test_general;
 Insert into t1 values ('2nd Insert 3.5.4.4');
 Select * from t1;
@@ -177,7 +175,7 @@ Testcase 3.5.4.5:
 -----------------
 create database db_drop5;
 Use db_drop5;
-create table t1 (f1 char(50)) engine=memory;
+create table t1 (f1 char(50)) engine = <engine_to_be_used>;
 grant INSERT, SELECT on t1 to test_general;
 Create trigger trg5 BEFORE INSERT on t1
 for each row set new.f1='Trigger 3.5.4.5';
@@ -193,7 +191,7 @@ select trigger_schema, trigger_name, event_object_table
 from information_schema.triggers
 where information_schema.triggers.trigger_name='trg5';
 trigger_schema	trigger_name	event_object_table
-create table t1 (f1 char(50)) engine=memory;
+create table t1 (f1 char(50)) engine = <engine_to_be_used>;
 grant INSERT, SELECT on t1 to test_general;
 Insert into t1 values ('2nd Insert 3.5.4.5');
 Select * from t1;
@@ -234,7 +232,7 @@ Testcase 3.5.5.4:
 create database dbtest_one;
 create database dbtest_two;
 use dbtest_two;
-create table t2 (f1 char(15)) engine=memory;
+create table t2 (f1 char(15)) engine = <engine_to_be_used>;
 use dbtest_one;
 create trigger trg4 before INSERT
 on dbtest_two.t2 for each row set new.f1='trig 3.5.5.4';

mysql-test/suite/funcs_1/r/memory_trig_08.result

@@ -53,13 +53,11 @@ f172 numeric zerofill,
 f173 numeric unsigned zerofill,
 f174 numeric (0),
 f175 numeric (64)
-) engine = memory;
+) engine = <engine_to_be_used>;
 Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb3.txt'
-into table tb3;
 
 Testcase: 3.5:
 --------------
@@ -88,17 +86,17 @@ create table t1_i (
 i120 char ascii not null DEFAULT b'101',
 i136 smallint zerofill not null DEFAULT 999,
 i144 int zerofill not null DEFAULT 99999,
-i163 decimal (63,30)) engine=memory;
+i163 decimal (63,30)) engine=<engine_to_be_used>;
 create table t1_u (
 u120 char ascii not null DEFAULT b'101',
 u136 smallint zerofill not null DEFAULT 999,
 u144 int zerofill not null DEFAULT 99999,
-u163 decimal (63,30)) engine=memory;
+u163 decimal (63,30)) engine=<engine_to_be_used>;
 create table t1_d (
 d120 char ascii not null DEFAULT b'101',
 d136 smallint zerofill not null DEFAULT 999,
 d144 int zerofill not null DEFAULT 99999,
-d163 decimal (63,30)) engine=memory;
+d163 decimal (63,30)) engine=<engine_to_be_used>;
 Insert into t1_u values ('a',111,99999,999.99);
 Insert into t1_u values ('b',222,99999,999.99);
 Insert into t1_u values ('c',333,99999,999.99);

mysql-test/suite/funcs_1/r/memory_trig_09.result

@@ -53,7 +53,7 @@ f172 numeric zerofill,
 f173 numeric unsigned zerofill,
 f174 numeric (0),
 f175 numeric (64)
-) engine = memory;
+) engine = <engine_to_be_used>;
 Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1

mysql-test/suite/funcs_1/r/memory_trig_1011ext.result

@@ -53,7 +53,7 @@ f172 numeric zerofill,
 f173 numeric unsigned zerofill,
 f174 numeric (0),
 f175 numeric (64)
-) engine = memory;
+) engine = <engine_to_be_used>;
 Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
@@ -129,7 +129,7 @@ delete from tb3 where f122 like 'Test 3.5.10.1/2/3%';
 
 Testcase 3.5.10.4:
 ------------------
-create table tb_load (f1 int, f2 char(25),f3 int) engine=memory;
+create table tb_load (f1 int, f2 char(25),f3 int) engine = <engine_to_be_used>;
 Create trigger trg4 before insert on tb_load
 for each row set new.f3=-(new.f1 div 5), @counter= @counter+1;
 set @counter= 0;
@@ -163,7 +163,7 @@ Testcase 3.5.10.6: (implemented in trig_frkey.test)
 
 Testcase 3.5.10.extra:
 ----------------------
-create table t1_sp (var136 tinyint, var151 decimal) engine=memory;
+create table t1_sp (var136 tinyint, var151 decimal) engine = <engine_to_be_used>;
 create trigger trg before insert on t1_sp
 for each row set @counter=@counter+1;
 create procedure trig_sp()
@@ -212,12 +212,12 @@ drop table if exists t2_2;
 drop table if exists t2_3;
 drop table if exists t2_4;
 drop table if exists t3;
-create table t1 (f1 integer) engine=memory;
-create table t2_1 (f1 integer) engine=memory;
-create table t2_2 (f1 integer) engine=memory;
-create table t2_3 (f1 integer) engine=memory;
-create table t2_4 (f1 integer) engine=memory;
-create table t3 (f1 integer) engine=memory;
+create table t1 (f1 integer) engine = <engine_to_be_used>;
+create table t2_1 (f1 integer) engine = <engine_to_be_used>;
+create table t2_2 (f1 integer) engine = <engine_to_be_used>;
+create table t2_3 (f1 integer) engine = <engine_to_be_used>;
+create table t2_4 (f1 integer) engine = <engine_to_be_used>;
+create table t3 (f1 integer) engine = <engine_to_be_used>;
 insert into t1 values (1);
 create trigger tr1 after insert on t1 for each row
 BEGIN
@@ -255,10 +255,10 @@ drop table if exists t1;
 drop table if exists t2;
 drop table if exists t3;
 drop table if exists t4;
-create table t1 (f1 integer) engine = memory;
-create table t2 (f2 integer) engine = memory;
-create table t3 (f3 integer) engine = memory;
-create table t4 (f4 integer) engine = memory;
+create table t1 (f1 integer) engine = <engine_to_be_used>;
+create table t2 (f2 integer) engine = <engine_to_be_used>;
+create table t3 (f3 integer) engine = <engine_to_be_used>;
+create table t4 (f4 integer) engine = <engine_to_be_used>;
 insert into t1 values (0);
 create trigger tr1 after insert on t1
 for each row insert into t2 (f2) values (new.f1+1);
@@ -298,7 +298,7 @@ set @sql_mode='traditional';
 create table t1_sp (
 count integer,
 var136 tinyint,
-var151 decimal) engine=memory;
+var151 decimal) engine = <engine_to_be_used>;
 create procedure trig_sp()
 begin
 declare done int default 0;
@@ -352,7 +352,7 @@ drop procedure trig_sp;
 drop trigger trg;
 drop table t1_sp;
 
-Testcase y.y.y.5: Roleback of nested trigger references
+Testcase y.y.y.5: Rollback of nested trigger references
 -------------------------------------------------------
 set @@sql_mode='traditional';
 use test;
@@ -360,10 +360,10 @@ drop table if exists t1;
 drop table if exists t2;
 drop table if exists t3;
 drop table if exists t4;
-create table t1 (f1 integer) engine = memory;
-create table t2 (f2 integer) engine = memory;
-create table t3 (f3 integer) engine = memory;
-create table t4 (f4 tinyint) engine = memory;
+create table t1 (f1 integer) engine = <engine_to_be_used>;
+create table t2 (f2 integer) engine = <engine_to_be_used>;
+create table t3 (f3 integer) engine = <engine_to_be_used>;
+create table t4 (f4 tinyint) engine = <engine_to_be_used>;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (

mysql-test/suite/funcs_1/r/myisam_trig_0102.result

 USE test;
-drop table if exists tb3 ;
+drop table if exists tb3;
 create table tb3 (
 f118 char not null DEFAULT 'a',
 f119 char binary not null DEFAULT b'101',
 f120 char ascii not null DEFAULT b'101',
-f121 tinytext,
-f122 text,
-f123 mediumtext,
-f124 longtext unicode,
-f125 tinyblob,
-f126 blob,
-f127 mediumblob,
-f128 longblob,
+f121 char(50),
+f122 char(50),
 f129 binary not null DEFAULT b'101',
 f130 tinyint not null DEFAULT 99,
 f131 tinyint unsigned not null DEFAULT 99,
@@ -59,13 +53,11 @@ f172 numeric zerofill,
 f173 numeric unsigned zerofill,
 f174 numeric (0),
 f175 numeric (64)
-) Engine = myisam;
+) engine = <engine_to_be_used>;
 Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb3.txt'
-into table tb3;
 
 Testcase: 3.5.1.1:
 ------------------
@@ -194,7 +186,7 @@ Testcase 3.5.1.7: - need to fix
 drop table if exists t1;
 Warnings:
 Note	1051	Unknown table 't1'
-create table t1 (f1 int, f2 char(25),f3 int) engine=myisam;
+create table t1 (f1 int, f2 char(25),f3 int) engine = <engine_to_be_used>;
 CREATE TRIGGER trg5_1 BEFORE INSERT on test.t1
 for each row set new.f3 = '14';
 CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ
@@ -238,7 +230,7 @@ ERROR HY000: Trigger in wrong schema
 drop database if exists trig_db;
 create database trig_db;
 use trig_db;
-create table t1 (f1 integer) engine = myisam;
+create table t1 (f1 integer) engine = <engine_to_be_used>;
 use test;
 CREATE TRIGGER trig_db.trg6_2 AFTER INSERT on tb3
 for each row set @ret_trg6_2 = 5;
@@ -266,8 +258,8 @@ Testcase 3.5.1.?:
 -----------------
 drop table if exists t1;
 drop table if exists t2;
-create table t1 (f1 char(50), f2 integer) engine = myisam;
-create table t2 (f1 char(50), f2 integer) engine = myisam;
+create table t1 (f1 char(50), f2 integer) engine = <engine_to_be_used>;
+create table t2 (f1 char(50), f2 integer) engine = <engine_to_be_used>;
 create trigger trig before insert on t1
 for each row set new.f1 ='trig t1';
 create trigger trig before update on t2
@@ -299,15 +291,15 @@ create database trig_db1;
 create database trig_db2;
 create database trig_db3;
 use trig_db1;
-create table t1 (f1 char(50), f2 integer) engine = myisam;
+create table t1 (f1 char(50), f2 integer) engine = <engine_to_be_used>;
 create trigger trig before insert on t1
 for each row set new.f1 ='trig1', @test_var1='trig1';
 use trig_db2;
-create table t2 (f1 char(50), f2 integer) engine = myisam;
+create table t2 (f1 char(50), f2 integer) engine = <engine_to_be_used>;
 create trigger trig before insert on t2
 for each row set new.f1 ='trig2', @test_var2='trig2';
 use trig_db3;
-create table t1 (f1 char(50), f2 integer) engine = myisam;
+create table t1 (f1 char(50), f2 integer) engine = <engine_to_be_used>;
 create trigger trig before insert on t1
 for each row set new.f1 ='trig3', @test_var3='trig3';
 set @test_var1= '', @test_var2= '', @test_var3= '';
@@ -345,8 +337,8 @@ drop database if exists trig_db2;
 create database trig_db1;
 create database trig_db2;
 use trig_db1;
-create table t1 (f1 char(50), f2 integer) engine = myisam;
-create table trig_db2.t1 (f1 char(50), f2 integer) engine = myisam;
+create table t1 (f1 char(50), f2 integer) engine = <engine_to_be_used>;
+create table trig_db2.t1 (f1 char(50), f2 integer) engine = <engine_to_be_used>;
 create trigger trig1_b before insert on t1
 for each row set @test_var1='trig1_b';
 create trigger trig_db1.trig1_a after insert on t1

mysql-test/suite/funcs_1/r/myisam_trig_03.result

 USE test;
-drop table if exists tb3 ;
+drop table if exists tb3;
 create table tb3 (
 f118 char not null DEFAULT 'a',
 f119 char binary not null DEFAULT b'101',
 f120 char ascii not null DEFAULT b'101',
-f121 tinytext,
-f122 text,
-f123 mediumtext,
-f124 longtext unicode,
-f125 tinyblob,
-f126 blob,
-f127 mediumblob,
-f128 longblob,
+f121 char(50),
+f122 char(50),
 f129 binary not null DEFAULT b'101',
 f130 tinyint not null DEFAULT 99,
 f131 tinyint unsigned not null DEFAULT 99,
@@ -59,20 +53,18 @@ f172 numeric zerofill,
 f173 numeric unsigned zerofill,
 f174 numeric (0),
 f175 numeric (64)
-) Engine = myisam;
+) engine = <engine_to_be_used>;
 Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb3.txt'
-into table tb3;
 
 Testcase 3.5.3:
 ---------------
 drop database if exists priv_db;
 create database priv_db;
 use priv_db;
-create table t1 (f1 char(20)) engine= myisam;
+create table t1 (f1 char(20)) engine= <engine_to_be_used>;
 create User test_noprivs@localhost;
 set password for test_noprivs@localhost = password('PWD');
 create User test_yesprivs@localhost;
@@ -608,8 +600,8 @@ Testcase: 3.5.3.x:
 use priv_db;
 drop table if exists t1;
 drop table if exists t2;
-create table t1 (f1 int) engine= myisam;
-create table t2 (f2 int) engine= myisam;
+create table t1 (f1 int) engine= <engine_to_be_used>;
+create table t2 (f2 int) engine= <engine_to_be_used>;
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
 grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT, UPDATE on priv_db.t1 to test_yesprivs@localhost;
@@ -698,4 +690,5 @@ drop database if exists priv_db;
 drop user test_yesprivs@localhost;
 drop user test_noprivs@localhost;
 drop user test_noprivs;
-DROP TABLE test.tb3;
+use test;
+drop table tb3;

mysql-test/suite/funcs_1/r/myisam_trig_0407.result

 USE test;
-drop table if exists tb3 ;
+drop table if exists tb3;
 create table tb3 (
 f118 char not null DEFAULT 'a',
 f119 char binary not null DEFAULT b'101',
 f120 char ascii not null DEFAULT b'101',
-f121 tinytext,
-f122 text,
-f123 mediumtext,
-f124 longtext unicode,
-f125 tinyblob,
-f126 blob,
-f127 mediumblob,
-f128 longblob,
+f121 char(50),
+f122 char(50),
 f129 binary not null DEFAULT b'101',
 f130 tinyint not null DEFAULT 99,
 f131 tinyint unsigned not null DEFAULT 99,
@@ -59,13 +53,11 @@ f172 numeric zerofill,
 f173 numeric unsigned zerofill,
 f174 numeric (0),
 f175 numeric (64)
-) Engine = myisam;
+) engine = <engine_to_be_used>;
 Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb3.txt'
-into table tb3;
 
 Testcase: 3.5:
 --------------
@@ -86,7 +78,7 @@ Testcase 3.5.4.1:
 -----------------
 create database db_drop;
 Use db_drop;
-create table t1 (f1 char(30)) engine=myisam;
+create table t1 (f1 char(30)) engine = <engine_to_be_used>;
 grant INSERT, SELECT on db_drop.t1 to test_general;
 Use db_drop;
 Create trigger trg1 BEFORE INSERT on t1
@@ -114,7 +106,7 @@ Testcase 3.5.4.2:
 create database db_drop2;
 Use db_drop2;
 drop table if exists t1_432 ;
-create table t1_432 (f1 char (30)) engine=myisam;
+create table t1_432 (f1 char (30)) engine = <engine_to_be_used>;
 Drop trigger tr_does_not_exit;
 ERROR HY000: Trigger does not exist
 drop table if exists t1_432 ;
@@ -126,8 +118,8 @@ create database db_drop3;
 Use db_drop3;
 drop table if exists t1_433 ;
 drop table if exists t1_433a ;
-create table t1_433 (f1 char (30)) engine=myisam;
-create table t1_433a (f1a char (5)) engine=myisam;
+create table t1_433 (f1 char (30)) engine = <engine_to_be_used>;
+create table t1_433a (f1a char (5)) engine = <engine_to_be_used>;
 CREATE TRIGGER trg3 BEFORE INSERT on t1_433 for each row
 set new.f1 = 'Trigger 3.5.4.3';
 Drop trigger t1.433.trg3;
@@ -147,7 +139,7 @@ Testcase 3.5.4.4:
 -----------------
 create database db_drop4;
 Use db_drop4;
-create table t1 (f1 char(30)) engine=myisam;
+create table t1 (f1 char(30)) engine = <engine_to_be_used>;
 grant INSERT, SELECT on db_drop4.t1 to test_general;
 Create trigger trg4 BEFORE INSERT on t1
 for each row set new.f1='Trigger 3.5.4.4';
@@ -168,7 +160,7 @@ where information_schema.triggers.trigger_name='trg4';
 trigger_schema	trigger_name	event_object_table
 create database db_drop4;
 Use db_drop4;
-create table t1 (f1 char(30)) engine=myisam;
+create table t1 (f1 char(30)) engine = <engine_to_be_used>;
 grant INSERT, SELECT on db_drop4.t1 to test_general;
 Insert into t1 values ('2nd Insert 3.5.4.4');
 Select * from t1;
@@ -183,7 +175,7 @@ Testcase 3.5.4.5:
 -----------------
 create database db_drop5;
 Use db_drop5;
-create table t1 (f1 char(50)) engine=myisam;
+create table t1 (f1 char(50)) engine = <engine_to_be_used>;
 grant INSERT, SELECT on t1 to test_general;
 Create trigger trg5 BEFORE INSERT on t1
 for each row set new.f1='Trigger 3.5.4.5';
@@ -199,7 +191,7 @@ select trigger_schema, trigger_name, event_object_table
 from information_schema.triggers
 where information_schema.triggers.trigger_name='trg5';
 trigger_schema	trigger_name	event_object_table
-create table t1 (f1 char(50)) engine=myisam;
+create table t1 (f1 char(50)) engine = <engine_to_be_used>;
 grant INSERT, SELECT on t1 to test_general;
 Insert into t1 values ('2nd Insert 3.5.4.5');
 Select * from t1;
@@ -240,7 +232,7 @@ Testcase 3.5.5.4:
 create database dbtest_one;
 create database dbtest_two;
 use dbtest_two;
-create table t2 (f1 char(15)) engine=myisam;
+create table t2 (f1 char(15)) engine = <engine_to_be_used>;
 use dbtest_one;
 create trigger trg4 before INSERT
 on dbtest_two.t2 for each row set new.f1='trig 3.5.5.4';

mysql-test/suite/funcs_1/r/myisam_trig_08.result

 USE test;
-drop table if exists tb3 ;
+drop table if exists tb3;
 create table tb3 (
 f118 char not null DEFAULT 'a',
 f119 char binary not null DEFAULT b'101',
 f120 char ascii not null DEFAULT b'101',
-f121 tinytext,
-f122 text,
-f123 mediumtext,
-f124 longtext unicode,
-f125 tinyblob,
-f126 blob,
-f127 mediumblob,
-f128 longblob,
+f121 char(50),
+f122 char(50),
 f129 binary not null DEFAULT b'101',
 f130 tinyint not null DEFAULT 99,
 f131 tinyint unsigned not null DEFAULT 99,
@@ -59,13 +53,11 @@ f172 numeric zerofill,
 f173 numeric unsigned zerofill,
 f174 numeric (0),
 f175 numeric (64)
-) Engine = myisam;
+) engine = <engine_to_be_used>;
 Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb3.txt'
-into table tb3;
 
 Testcase: 3.5:
 --------------
@@ -94,17 +86,17 @@ create table t1_i (
 i120 char ascii not null DEFAULT b'101',
 i136 smallint zerofill not null DEFAULT 999,
 i144 int zerofill not null DEFAULT 99999,
-i163 decimal (63,30)) engine=myisam;
+i163 decimal (63,30)) engine=<engine_to_be_used>;
 create table t1_u (
 u120 char ascii not null DEFAULT b'101',
 u136 smallint zerofill not null DEFAULT 999,
 u144 int zerofill not null DEFAULT 99999,
-u163 decimal (63,30)) engine=myisam;
+u163 decimal (63,30)) engine=<engine_to_be_used>;
 create table t1_d (
 d120 char ascii not null DEFAULT b'101',
 d136 smallint zerofill not null DEFAULT 999,
 d144 int zerofill not null DEFAULT 99999,
-d163 decimal (63,30)) engine=myisam;
+d163 decimal (63,30)) engine=<engine_to_be_used>;
 Insert into t1_u values ('a',111,99999,999.99);
 Insert into t1_u values ('b',222,99999,999.99);
 Insert into t1_u values ('c',333,99999,999.99);

mysql-test/suite/funcs_1/r/myisam_trig_09.result

 USE test;
-drop table if exists tb3 ;
+drop table if exists tb3;
 create table tb3 (
 f118 char not null DEFAULT 'a',
 f119 char binary not null DEFAULT b'101',
 f120 char ascii not null DEFAULT b'101',
-f121 tinytext,
-f122 text,
-f123 mediumtext,
-f124 longtext unicode,
-f125 tinyblob,
-f126 blob,
-f127 mediumblob,
-f128 longblob,
+f121 char(50),
+f122 char(50),
 f129 binary not null DEFAULT b'101',
 f130 tinyint not null DEFAULT 99,
 f131 tinyint unsigned not null DEFAULT 99,
@@ -59,12 +53,12 @@ f172 numeric zerofill,
 f173 numeric unsigned zerofill,
 f174 numeric (0),
 f175 numeric (64)
-) Engine = myisam;
+) engine = <engine_to_be_used>;
 Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb3.txt'
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb3.txt'
 into table tb3;
 
 Testcase 3.5.9.1/2:
@@ -74,9 +68,9 @@ set new.f142 = 94087, @counter=@counter+1;
 TotalRows
 10
 Affected
-8
+9
 NotAffected
-2
+1
 NewValuew
 0
 set @counter=0;
@@ -84,7 +78,7 @@ Update tb3 Set f142='1' where f130<100;
 select count(*) as ExpectedChanged, @counter as TrigCounter
 from tb3 where f142=94087;
 ExpectedChanged	TrigCounter
-8	8
+9	9
 select count(*) as ExpectedNotChange from tb3
 where f130<100 and f142<>94087;
 ExpectedNotChange

mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result

 USE test;
-drop table if exists tb3 ;
+drop table if exists tb3;
 create table tb3 (
 f118 char not null DEFAULT 'a',
 f119 char binary not null DEFAULT b'101',
 f120 char ascii not null DEFAULT b'101',
-f121 tinytext,
-f122 text,
-f123 mediumtext,
-f124 longtext unicode,
-f125 tinyblob,
-f126 blob,
-f127 mediumblob,
-f128 longblob,
+f121 char(50),
+f122 char(50),
 f129 binary not null DEFAULT b'101',
 f130 tinyint not null DEFAULT 99,
 f131 tinyint unsigned not null DEFAULT 99,
@@ -59,12 +53,12 @@ f172 numeric zerofill,
 f173 numeric unsigned zerofill,
 f174 numeric (0),
 f175 numeric (64)
-) Engine = myisam;
+) engine = <engine_to_be_used>;
 Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb3.txt'
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb3.txt'
 into table tb3;
 
 Testcase 3.5.10.1/2/3:
@@ -135,7 +129,7 @@ delete from tb3 where f122 like 'Test 3.5.10.1/2/3%';
 
 Testcase 3.5.10.4:
 ------------------
-create table tb_load (f1 int, f2 char(25),f3 int) engine=myisam;
+create table tb_load (f1 int, f2 char(25),f3 int) engine = <engine_to_be_used>;
 Create trigger trg4 before insert on tb_load
 for each row set new.f3=-(new.f1 div 5), @counter= @counter+1;
 set @counter= 0;
@@ -169,7 +163,7 @@ Testcase 3.5.10.6: (implemented in trig_frkey.test)
 
 Testcase 3.5.10.extra:
 ----------------------
-create table t1_sp (var136 tinyint, var151 decimal) engine=myisam;
+create table t1_sp (var136 tinyint, var151 decimal) engine = <engine_to_be_used>;
 create trigger trg before insert on t1_sp
 for each row set @counter=@counter+1;
 create procedure trig_sp()
@@ -218,12 +212,12 @@ drop table if exists t2_2;
 drop table if exists t2_3;
 drop table if exists t2_4;
 drop table if exists t3;
-create table t1 (f1 integer) engine=myisam;
-create table t2_1 (f1 integer) engine=myisam;
-create table t2_2 (f1 integer) engine=myisam;
-create table t2_3 (f1 integer) engine=myisam;
-create table t2_4 (f1 integer) engine=myisam;
-create table t3 (f1 integer) engine=myisam;
+create table t1 (f1 integer) engine = <engine_to_be_used>;
+create table t2_1 (f1 integer) engine = <engine_to_be_used>;
+create table t2_2 (f1 integer) engine = <engine_to_be_used>;
+create table t2_3 (f1 integer) engine = <engine_to_be_used>;
+create table t2_4 (f1 integer) engine = <engine_to_be_used>;
+create table t3 (f1 integer) engine = <engine_to_be_used>;
 insert into t1 values (1);
 create trigger tr1 after insert on t1 for each row
 BEGIN
@@ -261,10 +255,10 @@ drop table if exists t1;
 drop table if exists t2;
 drop table if exists t3;
 drop table if exists t4;
-create table t1 (f1 integer) engine = myisam;
-create table t2 (f2 integer) engine = myisam;
-create table t3 (f3 integer) engine = myisam;
-create table t4 (f4 integer) engine = myisam;
+create table t1 (f1 integer) engine = <engine_to_be_used>;
+create table t2 (f2 integer) engine = <engine_to_be_used>;
+create table t3 (f3 integer) engine = <engine_to_be_used>;
+create table t4 (f4 integer) engine = <engine_to_be_used>;
 insert into t1 values (0);
 create trigger tr1 after insert on t1
 for each row insert into t2 (f2) values (new.f1+1);
@@ -304,7 +298,7 @@ set @sql_mode='traditional';
 create table t1_sp (
 count integer,
 var136 tinyint,
-var151 decimal) engine=myisam;
+var151 decimal) engine = <engine_to_be_used>;
 create procedure trig_sp()
 begin
 declare done int default 0;
@@ -358,7 +352,7 @@ drop procedure trig_sp;
 drop trigger trg;
 drop table t1_sp;
 
-Testcase y.y.y.5: Roleback of nested trigger references
+Testcase y.y.y.5: Rollback of nested trigger references
 -------------------------------------------------------
 set @@sql_mode='traditional';
 use test;
@@ -366,10 +360,10 @@ drop table if exists t1;
 drop table if exists t2;
 drop table if exists t3;
 drop table if exists t4;
-create table t1 (f1 integer) engine = myisam;
-create table t2 (f2 integer) engine = myisam;
-create table t3 (f3 integer) engine = myisam;
-create table t4 (f4 tinyint) engine = myisam;
+create table t1 (f1 integer) engine = <engine_to_be_used>;
+create table t2 (f2 integer) engine = <engine_to_be_used>;
+create table t3 (f3 integer) engine = <engine_to_be_used>;
+create table t4 (f4 tinyint) engine = <engine_to_be_used>;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (

mysql-test/suite/funcs_1/r/ndb_trig_0102.result

 USE test;
-drop table if exists tb3 ;
+drop table if exists tb3;
 create table tb3 (
 f118 char not null DEFAULT 'a',
 f119 char binary not null DEFAULT b'101',
 f120 char ascii not null DEFAULT b'101',
-f121 tinytext,
-f122 text,
-f123 mediumtext,
-f124 longtext unicode,
-f125 tinyblob,
-f126 blob,
-f127 mediumblob,
-f128 longblob,
+f121 char(50),
+f122 char(50),
 f129 binary not null DEFAULT b'101',
 f130 tinyint not null DEFAULT 99,
 f131 tinyint unsigned not null DEFAULT 99,
@@ -59,14 +53,11 @@ f172 numeric zerofill,
 f173 numeric unsigned zerofill,
 f174 numeric (0),
 f175 numeric (64)
-) engine = ndb;
+) engine = <engine_to_be_used>;
 Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-Error	1478	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
-load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/ndb_tb3.txt'
-into table tb3;
 
 Testcase: 3.5.1.1:
 ------------------
@@ -121,8 +112,8 @@ set @test_before = 0;
 set @test_after = 0;
 select f121, f122, f142, f144, f134 from tb3 where f121 = 'Test 3.5.1.1';
 f121	f122	f142	f144	f134
-Test 3.5.1.1	Second Row	2	0000000006	2
 Test 3.5.1.1	Before Update Trigger	27	0000000008	1
+Test 3.5.1.1	Second Row	2	0000000006	2
 select @test_before, @test_after;
 @test_before	@test_after
 0	0
@@ -195,7 +186,7 @@ Testcase 3.5.1.7: - need to fix
 drop table if exists t1;
 Warnings:
 Note	1051	Unknown table 't1'
-create table t1 (f1 int, f2 char(25),f3 int) engine=ndb;
+create table t1 (f1 int, f2 char(25),f3 int) engine = <engine_to_be_used>;
 CREATE TRIGGER trg5_1 BEFORE INSERT on test.t1
 for each row set new.f3 = '14';
 CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ
@@ -239,7 +230,7 @@ ERROR HY000: Trigger in wrong schema
 drop database if exists trig_db;
 create database trig_db;
 use trig_db;
-create table t1 (f1 integer) engine = ndb;
+create table t1 (f1 integer) engine = <engine_to_be_used>;
 use test;
 CREATE TRIGGER trig_db.trg6_2 AFTER INSERT on tb3
 for each row set @ret_trg6_2 = 5;
@@ -267,8 +258,8 @@ Testcase 3.5.1.?:
 -----------------
 drop table if exists t1;
 drop table if exists t2;
-create table t1 (f1 char(50), f2 integer) engine = ndb;
-create table t2 (f1 char(50), f2 integer) engine = ndb;
+create table t1 (f1 char(50), f2 integer) engine = <engine_to_be_used>;
+create table t2 (f1 char(50), f2 integer) engine = <engine_to_be_used>;
 create trigger trig before insert on t1
 for each row set new.f1 ='trig t1';
 create trigger trig before update on t2
@@ -300,15 +291,15 @@ create database trig_db1;
 create database trig_db2;
 create database trig_db3;
 use trig_db1;
-create table t1 (f1 char(50), f2 integer) engine = ndb;
+create table t1 (f1 char(50), f2 integer) engine = <engine_to_be_used>;
 create trigger trig before insert on t1
 for each row set new.f1 ='trig1', @test_var1='trig1';
 use trig_db2;
-create table t2 (f1 char(50), f2 integer) engine = ndb;
+create table t2 (f1 char(50), f2 integer) engine = <engine_to_be_used>;
 create trigger trig before insert on t2
 for each row set new.f1 ='trig2', @test_var2='trig2';
 use trig_db3;
-create table t1 (f1 char(50), f2 integer) engine = ndb;
+create table t1 (f1 char(50), f2 integer) engine = <engine_to_be_used>;
 create trigger trig before insert on t1
 for each row set new.f1 ='trig3', @test_var3='trig3';
 set @test_var1= '', @test_var2= '', @test_var3= '';
@@ -346,8 +337,8 @@ drop database if exists trig_db2;
 create database trig_db1;
 create database trig_db2;
 use trig_db1;
-create table t1 (f1 char(50), f2 integer) engine = ndb;
-create table trig_db2.t1 (f1 char(50), f2 integer) engine = ndb;
+create table t1 (f1 char(50), f2 integer) engine = <engine_to_be_used>;
+create table trig_db2.t1 (f1 char(50), f2 integer) engine = <engine_to_be_used>;
 create trigger trig1_b before insert on t1
 for each row set @test_var1='trig1_b';
 create trigger trig_db1.trig1_a after insert on t1

mysql-test/suite/funcs_1/r/ndb_trig_03.result

 USE test;
-drop table if exists tb3 ;
+drop table if exists tb3;
 create table tb3 (
 f118 char not null DEFAULT 'a',
 f119 char binary not null DEFAULT b'101',
 f120 char ascii not null DEFAULT b'101',
-f121 tinytext,
-f122 text,
-f123 mediumtext,
-f124 longtext unicode,
-f125 tinyblob,
-f126 blob,
-f127 mediumblob,
-f128 longblob,
+f121 char(50),
+f122 char(50),
 f129 binary not null DEFAULT b'101',
 f130 tinyint not null DEFAULT 99,
 f131 tinyint unsigned not null DEFAULT 99,
@@ -59,21 +53,18 @@ f172 numeric zerofill,
 f173 numeric unsigned zerofill,
 f174 numeric (0),
 f175 numeric (64)
-) engine = ndb;
+) engine = <engine_to_be_used>;
 Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-Error	1478	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
-load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/ndb_tb3.txt'
-into table tb3;
 
 Testcase 3.5.3:
 ---------------
 drop database if exists priv_db;
 create database priv_db;
 use priv_db;
-create table t1 (f1 char(20)) engine= ndb;
+create table t1 (f1 char(20)) engine= <engine_to_be_used>;
 create User test_noprivs@localhost;
 set password for test_noprivs@localhost = password('PWD');
 create User test_yesprivs@localhost;
@@ -609,8 +600,8 @@ Testcase: 3.5.3.x:
 use priv_db;
 drop table if exists t1;
 drop table if exists t2;
-create table t1 (f1 int) engine= ndb;
-create table t2 (f2 int) engine= ndb;
+create table t1 (f1 int) engine= <engine_to_be_used>;
+create table t2 (f2 int) engine= <engine_to_be_used>;
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
 grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT, UPDATE on priv_db.t1 to test_yesprivs@localhost;
@@ -699,4 +690,5 @@ drop database if exists priv_db;
 drop user test_yesprivs@localhost;
 drop user test_noprivs@localhost;
 drop user test_noprivs;
-DROP TABLE test.tb3;
+use test;
+drop table tb3;

mysql-test/suite/funcs_1/r/ndb_trig_0407.result

 USE test;
-drop table if exists tb3 ;
+drop table if exists tb3;
 create table tb3 (
 f118 char not null DEFAULT 'a',
 f119 char binary not null DEFAULT b'101',
 f120 char ascii not null DEFAULT b'101',
-f121 tinytext,
-f122 text,
-f123 mediumtext,
-f124 longtext unicode,
-f125 tinyblob,
-f126 blob,
-f127 mediumblob,
-f128 longblob,
+f121 char(50),
+f122 char(50),
 f129 binary not null DEFAULT b'101',
 f130 tinyint not null DEFAULT 99,
 f131 tinyint unsigned not null DEFAULT 99,
@@ -59,14 +53,11 @@ f172 numeric zerofill,
 f173 numeric unsigned zerofill,
 f174 numeric (0),
 f175 numeric (64)
-) engine = ndb;
+) engine = <engine_to_be_used>;
 Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-Error	1478	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
-load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/ndb_tb3.txt'
-into table tb3;
 
 Testcase: 3.5:
 --------------
@@ -87,7 +78,7 @@ Testcase 3.5.4.1:
 -----------------
 create database db_drop;
 Use db_drop;
-create table t1 (f1 char(30)) engine=ndb;
+create table t1 (f1 char(30)) engine = <engine_to_be_used>;
 grant INSERT, SELECT on db_drop.t1 to test_general;
 Use db_drop;
 Create trigger trg1 BEFORE INSERT on t1
@@ -115,7 +106,7 @@ Testcase 3.5.4.2:
 create database db_drop2;
 Use db_drop2;
 drop table if exists t1_432 ;
-create table t1_432 (f1 char (30)) engine=ndb;
+create table t1_432 (f1 char (30)) engine = <engine_to_be_used>;
 Drop trigger tr_does_not_exit;
 ERROR HY000: Trigger does not exist
 drop table if exists t1_432 ;
@@ -127,8 +118,8 @@ create database db_drop3;
 Use db_drop3;
 drop table if exists t1_433 ;
 drop table if exists t1_433a ;
-create table t1_433 (f1 char (30)) engine=ndb;
-create table t1_433a (f1a char (5)) engine=ndb;
+create table t1_433 (f1 char (30)) engine = <engine_to_be_used>;
+create table t1_433a (f1a char (5)) engine = <engine_to_be_used>;
 CREATE TRIGGER trg3 BEFORE INSERT on t1_433 for each row
 set new.f1 = 'Trigger 3.5.4.3';
 Drop trigger t1.433.trg3;
@@ -148,7 +139,7 @@ Testcase 3.5.4.4:
 -----------------
 create database db_drop4;
 Use db_drop4;
-create table t1 (f1 char(30)) engine=ndb;
+create table t1 (f1 char(30)) engine = <engine_to_be_used>;
 grant INSERT, SELECT on db_drop4.t1 to test_general;
 Create trigger trg4 BEFORE INSERT on t1
 for each row set new.f1='Trigger 3.5.4.4';
@@ -169,7 +160,7 @@ where information_schema.triggers.trigger_name='trg4';
 trigger_schema	trigger_name	event_object_table
 create database db_drop4;
 Use db_drop4;
-create table t1 (f1 char(30)) engine=ndb;
+create table t1 (f1 char(30)) engine = <engine_to_be_used>;
 grant INSERT, SELECT on db_drop4.t1 to test_general;
 Insert into t1 values ('2nd Insert 3.5.4.4');
 Select * from t1;
@@ -184,7 +175,7 @@ Testcase 3.5.4.5:
 -----------------
 create database db_drop5;
 Use db_drop5;
-create table t1 (f1 char(50)) engine=ndb;
+create table t1 (f1 char(50)) engine = <engine_to_be_used>;
 grant INSERT, SELECT on t1 to test_general;
 Create trigger trg5 BEFORE INSERT on t1
 for each row set new.f1='Trigger 3.5.4.5';
@@ -200,7 +191,7 @@ select trigger_schema, trigger_name, event_object_table
 from information_schema.triggers
 where information_schema.triggers.trigger_name='trg5';
 trigger_schema	trigger_name	event_object_table
-create table t1 (f1 char(50)) engine=ndb;
+create table t1 (f1 char(50)) engine = <engine_to_be_used>;
 grant INSERT, SELECT on t1 to test_general;
 Insert into t1 values ('2nd Insert 3.5.4.5');
 Select * from t1;
@@ -241,7 +232,7 @@ Testcase 3.5.5.4:
 create database dbtest_one;
 create database dbtest_two;
 use dbtest_two;
-create table t2 (f1 char(15)) engine=ndb;
+create table t2 (f1 char(15)) engine = <engine_to_be_used>;
 use dbtest_one;
 create trigger trg4 before INSERT
 on dbtest_two.t2 for each row set new.f1='trig 3.5.5.4';

mysql-test/suite/funcs_1/r/ndb_trig_08.result

 USE test;
-drop table if exists tb3 ;
+drop table if exists tb3;
 create table tb3 (
 f118 char not null DEFAULT 'a',
 f119 char binary not null DEFAULT b'101',
 f120 char ascii not null DEFAULT b'101',
-f121 tinytext,
-f122 text,
-f123 mediumtext,
-f124 longtext unicode,
-f125 tinyblob,
-f126 blob,
-f127 mediumblob,
-f128 longblob,
+f121 char(50),
+f122 char(50),
 f129 binary not null DEFAULT b'101',
 f130 tinyint not null DEFAULT 99,
 f131 tinyint unsigned not null DEFAULT 99,
@@ -59,14 +53,11 @@ f172 numeric zerofill,
 f173 numeric unsigned zerofill,
 f174 numeric (0),
 f175 numeric (64)
-) engine = ndb;
+) engine = <engine_to_be_used>;
 Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-Error	1478	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
-load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/ndb_tb3.txt'
-into table tb3;
 
 Testcase: 3.5:
 --------------
@@ -95,17 +86,17 @@ create table t1_i (
 i120 char ascii not null DEFAULT b'101',
 i136 smallint zerofill not null DEFAULT 999,
 i144 int zerofill not null DEFAULT 99999,
-i163 decimal (63,30)) engine=ndb;
+i163 decimal (63,30)) engine=<engine_to_be_used>;
 create table t1_u (
 u120 char ascii not null DEFAULT b'101',
 u136 smallint zerofill not null DEFAULT 999,
 u144 int zerofill not null DEFAULT 99999,
-u163 decimal (63,30)) engine=ndb;
+u163 decimal (63,30)) engine=<engine_to_be_used>;
 create table t1_d (
 d120 char ascii not null DEFAULT b'101',
 d136 smallint zerofill not null DEFAULT 999,
 d144 int zerofill not null DEFAULT 99999,
-d163 decimal (63,30)) engine=ndb;
+d163 decimal (63,30)) engine=<engine_to_be_used>;
 Insert into t1_u values ('a',111,99999,999.99);
 Insert into t1_u values ('b',222,99999,999.99);
 Insert into t1_u values ('c',333,99999,999.99);

mysql-test/suite/funcs_1/r/ndb_trig_09.result

 USE test;
-drop table if exists tb3 ;
+drop table if exists tb3;
 create table tb3 (
 f118 char not null DEFAULT 'a',
 f119 char binary not null DEFAULT b'101',
 f120 char ascii not null DEFAULT b'101',
-f121 tinytext,
-f122 text,
-f123 mediumtext,
-f124 longtext unicode,
-f125 tinyblob,
-f126 blob,
-f127 mediumblob,
-f128 longblob,
+f121 char(50),
+f122 char(50),
 f129 binary not null DEFAULT b'101',
 f130 tinyint not null DEFAULT 99,
 f131 tinyint unsigned not null DEFAULT 99,
@@ -59,13 +53,12 @@ f172 numeric zerofill,
 f173 numeric unsigned zerofill,
 f174 numeric (0),
 f175 numeric (64)
-) engine = ndb;
+) engine = <engine_to_be_used>;
 Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-Error	1478	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
-load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/ndb_tb3.txt'
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb3.txt'
 into table tb3;
 
 Testcase 3.5.9.1/2:
@@ -75,9 +68,9 @@ set new.f142 = 94087, @counter=@counter+1;
 TotalRows
 10
 Affected
-8
+9
 NotAffected
-2
+1
 NewValuew
 0
 set @counter=0;
@@ -85,7 +78,7 @@ Update tb3 Set f142='1' where f130<100;
 select count(*) as ExpectedChanged, @counter as TrigCounter
 from tb3 where f142=94087;
 ExpectedChanged	TrigCounter
-8	8
+9	9
 select count(*) as ExpectedNotChange from tb3
 where f130<100 and f142<>94087;
 ExpectedNotChange

mysql-test/suite/funcs_1/t/disabled.def

@@ -9,3 +9,5 @@
 #  Don't use any TAB characters for whitespace.
 #
 ##############################################################################
+
+ndb_trig_1011ext:  Bug#32656 NDB: Duplicate key error aborts transaction in handler. Doesn't talk back to SQL
\ No newline at end of file

mysql-test/suite/funcs_1/t/innodb_trig_0102.test

-#### suite/funcs_1/t/innodb_triggers.test
+#### suite/funcs_1/t/innodb_trig_0102.test
 
 # InnoDB tables should be used
 #
@@ -7,10 +7,4 @@
 # 2. Set $engine_type
 let $engine_type= innodb;
 
-# Create some objects needed in many testcases
-USE test;
---source suite/funcs_1/include/innodb_tb3.inc
-
 --source suite/funcs_1/triggers/triggers_0102.inc
-DROP TABLE test.tb3;
-

mysql-test/suite/funcs_1/t/innodb_trig_03.test

-#### suite/funcs_1/t/innodb_triggers.test
+#### suite/funcs_1/t/innodb_trig_03.test
 
 # InnoDB tables should be used
 #
@@ -7,10 +7,4 @@
 # 2. Set $engine_type
 let $engine_type= innodb;
 
-# Create some objects needed in many testcases
-USE test;
---source suite/funcs_1/include/innodb_tb3.inc
-
 --source suite/funcs_1/triggers/triggers_03.inc
-DROP TABLE test.tb3;
-

mysql-test/suite/funcs_1/t/innodb_trig_0407.test

-#### suite/funcs_1/t/innodb_triggers.test
+#### suite/funcs_1/t/innodb_trig_0407.test
 
 # InnoDB tables should be used
 #
@@ -7,10 +7,4 @@
 # 2. Set $engine_type
 let $engine_type= innodb;
 
-# Create some objects needed in many testcases
-USE test;
---source suite/funcs_1/include/innodb_tb3.inc
-
 --source suite/funcs_1/triggers/triggers_0407.inc
-DROP TABLE test.tb3;
-

sql/sql_cache.cc

@@ -2746,7 +2746,7 @@ my_bool Query_cache::register_all_tables(Query_cache_block *block,
 	 tmp++)
       unlink_table(tmp);
   }
-  return (n);
+  return test(n);
 }