Bug#36788 Multiple funcs_1 'trig' tests are failing on vanilla builds

Fix for this bug and additional improvements/fixes
In detail:
- Remove unicode attribute from several columns
  (unicode properties were nowhere needed/tested)
  of the table tb3
  -> The runnability of these tests depends no more on
     the availibility of some optional collations.
- Use a table tb3 with the same layout for all
  engines to be tested and unify the engine name
  within the protocols.
  -> <engine>_trig_<abc>.result have the same content
- Do not load data into tb3 if these rows have no
  impact on result sets
- Add tests for NDB (they exist already in 5.1)
- "--replace_result" at various places because
  NDB variants of tests failed with "random" row
  order in results
  This fixes a till now unknown weakness within the
  funcs_1 NDB tests existing in 5.1 and 6.0
- Fix the expected result of ndb_trig_1011ext
  which suffered from Bug 32656
  + disable this test
- funcs_1 could be executed with the mysql-test-run.pl
  option "--reorder", which saves some runtime by
  optimizing server restarts.
  Runtimes on tmpfs (one attempt only):
  with    reorder 132 seconds
  without reorder 183 seconds
- Adjust two "check" statements within func_misc.test
  which were incorrect (We had one run with result set
  difference though the server worked good.)
- minor fixes in comments

Makefile.am

@@ -154,7 +154,7 @@ test-bt:
 	-cd mysql-test ; MTR_BUILD_THREAD=auto \
 	    @PERL@ ./mysql-test-run.pl --force --comment=ps --ps-protocol
 	-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
 	-if [ -d mysql-test/suite/nist ] ; then \
@@ -179,7 +179,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:	test-ext-funcs

mysql-test/r/func_misc.result

@@ -168,7 +168,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";
@@ -176,7 +176,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
@@ -233,7 +225,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;
@@ -261,8 +253,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
@@ -294,15 +286,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= '';
@@ -340,8 +332,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;
@@ -609,8 +601,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 SUPER on *.* to test_yesprivs@localhost;
 grant SELECT, UPDATE on priv_db.t1 to test_yesprivs@localhost;
@@ -699,4 +691,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
@@ -227,7 +225,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;
@@ -255,8 +253,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
@@ -288,15 +286,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= '';
@@ -334,8 +332,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;
@@ -603,8 +601,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 SUPER on *.* to test_yesprivs@localhost;
 grant SELECT, UPDATE on priv_db.t1 to test_yesprivs@localhost;
@@ -693,4 +691,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
@@ -233,7 +225,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;
@@ -261,8 +253,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
@@ -294,15 +286,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= '';
@@ -340,8 +332,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;
@@ -609,8 +601,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 SUPER on *.* to test_yesprivs@localhost;
 grant SELECT, UPDATE on priv_db.t1 to test_yesprivs@localhost;
@@ -699,4 +691,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/t/disabled.def

@@ -13,3 +13,4 @@
 innodb_storedproc: (changes of WL#2984, using storeproc_nn instead)
 memory_storedproc: (changes of WL#2984, using storeproc_nn instead)
 myisam_storedproc: (changes of WL#2984, using storeproc_nn instead)
+ndb_trig_1011ext:  Bug#32656 NDB: Duplicate key error aborts transaction in handler. Doesn't talk back to SQL

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;
-

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

-#### suite/funcs_1/t/innodb_triggers.test
+#### suite/funcs_1/t/innodb_trig_08.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_08.inc
-DROP TABLE test.tb3;
-

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

-#### suite/funcs_1/t/innodb_triggers.test
+#### suite/funcs_1/t/innodb_trig_09.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_09.inc
-DROP TABLE test.tb3;
-

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

-#### suite/funcs_1/t/innodb_triggers.test
+#### suite/funcs_1/t/innodb_trig_1011ext.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_1011ext.inc
-DROP TABLE test.tb3;
-

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

-#### suite/funcs_1/t/memory_triggers.test
+#### suite/funcs_1/t/memory_trig_0102.test
 
 # Memory tables should be used
 #
 # Set $engine_type
 let $engine_type= memory;
 
-# Create some objects needed in many testcases
-USE test;
---source suite/funcs_1/include/memory_tb3.inc
-
 --source suite/funcs_1/triggers/triggers_0102.inc
-DROP TABLE test.tb3;
-

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

-#### suite/funcs_1/t/memory_triggers.test
+#### suite/funcs_1/t/memory_trig_03.test
 
 # Memory tables should be used
 #
 # Set $engine_type
 let $engine_type= memory;
 
-# Create some objects needed in many testcases
-USE test;
---source suite/funcs_1/include/memory_tb3.inc
-
 --source suite/funcs_1/triggers/triggers_03.inc
-DROP TABLE test.tb3;
-

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

-#### suite/funcs_1/t/memory_triggers.test
+#### suite/funcs_1/t/memory_trig_0407.test
 
 # Memory tables should be used
 #
 # Set $engine_type
 let $engine_type= memory;
 
-# Create some objects needed in many testcases
-USE test;
---source suite/funcs_1/include/memory_tb3.inc
-
 --source suite/funcs_1/triggers/triggers_0407.inc
-DROP TABLE test.tb3;
-

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

-#### suite/funcs_1/t/memory_triggers.test
+#### suite/funcs_1/t/memory_trig_08.test
 
 # Memory tables should be used
 #
 # Set $engine_type
 let $engine_type= memory;
 
-# Create some objects needed in many testcases
-USE test;
---source suite/funcs_1/include/memory_tb3.inc
-
 --source suite/funcs_1/triggers/triggers_08.inc
-DROP TABLE test.tb3;
-

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

-#### suite/funcs_1/t/memory_triggers.test
+#### suite/funcs_1/t/memory_trig_09.test
 
 # Memory tables should be used
 #
 # Set $engine_type
 let $engine_type= memory;
 
-# Create some objects needed in many testcases
-USE test;
---source suite/funcs_1/include/memory_tb3.inc
-
 --source suite/funcs_1/triggers/triggers_09.inc
-DROP TABLE test.tb3;
-

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

-#### suite/funcs_1/t/memory_triggers.test
+#### suite/funcs_1/t/memory_trig_1011ext.test
 
 # Memory tables should be used
 #
 # Set $engine_type
 let $engine_type= memory;
 
-# Create some objects needed in many testcases
-USE test;
---source suite/funcs_1/include/memory_tb3.inc
-
 --source suite/funcs_1/triggers/triggers_1011ext.inc
-DROP TABLE test.tb3;
-

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

-#### suite/funcs_1/t/myisam_triggers.test
+#### suite/funcs_1/t/myisam_trig_0102.test
 
 # MyISAM tables should be used
 #
 # Set $engine_type
 let $engine_type= myisam;
 
-# Create some objects needed in many testcases
-USE test;
---source suite/funcs_1/include/myisam_tb3.inc
-
 --source suite/funcs_1/triggers/triggers_0102.inc
-DROP TABLE test.tb3;
-

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

-#### suite/funcs_1/t/myisam_triggers.test
+#### suite/funcs_1/t/myisam_trig_03.test
 
 # MyISAM tables should be used
 #
 # Set $engine_type
 let $engine_type= myisam;
 
-# Create some objects needed in many testcases
-USE test;
---source suite/funcs_1/include/myisam_tb3.inc
-
 --source suite/funcs_1/triggers/triggers_03.inc
-DROP TABLE test.tb3;
-

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

-#### suite/funcs_1/t/myisam_triggers.test
+#### suite/funcs_1/t/myisam_trig_0407.test
 
 # MyISAM tables should be used
 #
 # Set $engine_type
 let $engine_type= myisam;
 
-# Create some objects needed in many testcases
-USE test;
---source suite/funcs_1/include/myisam_tb3.inc
-
 --source suite/funcs_1/triggers/triggers_0407.inc
-DROP TABLE test.tb3;
-

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

-#### suite/funcs_1/t/myisam_triggers.test
+#### suite/funcs_1/t/myisam_trig_08.test
 
 # MyISAM tables should be used
 #
 # Set $engine_type
 let $engine_type= myisam;
 
-# Create some objects needed in many testcases
-USE test;
---source suite/funcs_1/include/myisam_tb3.inc
-
 --source suite/funcs_1/triggers/triggers_08.inc
-DROP TABLE test.tb3;
-

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

-#### suite/funcs_1/t/myisam_triggers.test
+#### suite/funcs_1/t/myisam_trig_09.test
 
 # MyISAM tables should be used
 #
 # Set $engine_type
 let $engine_type= myisam;
 
-# Create some objects needed in many testcases
-USE test;
---source suite/funcs_1/include/myisam_tb3.inc
-
 --source suite/funcs_1/triggers/triggers_09.inc
-DROP TABLE test.tb3;
-

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

-#### suite/funcs_1/t/myisam_triggers.test
+#### suite/funcs_1/t/myisam_trig_1011ext.test
 
 # MyISAM tables should be used
 #
 # Set $engine_type
 let $engine_type= myisam;
 
-# Create some objects needed in many testcases
-USE test;
---source suite/funcs_1/include/myisam_tb3.inc
-
 --source suite/funcs_1/triggers/triggers_1011ext.inc
-DROP TABLE test.tb3;
-

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

+#### suite/funcs_1/t/ndb_trig_0102.test
+
+# NDB tables should be used
+#
+# 1. Check if NDB is available
+--source include/have_ndb.inc
+# 2. Set $engine_type
+let $engine_type= ndbcluster;
+
+--source suite/funcs_1/triggers/triggers_0102.inc

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

+#### suite/funcs_1/t/ndb_trig_03.test
+
+# NDB tables should be used
+#
+# 1. Check if NDB is available
+--source include/have_ndb.inc
+# 2. Set $engine_type
+let $engine_type= ndbcluster;
+
+--source suite/funcs_1/triggers/triggers_03.inc

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

+#### suite/funcs_1/t/ndb_trig_0407.test
+
+# NDB tables should be used
+#
+# 1. Check if NDB is available
+--source include/have_ndb.inc
+# 2. Set $engine_type
+let $engine_type= ndbcluster;
+
+--source suite/funcs_1/triggers/triggers_0407.inc

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

+#### suite/funcs_1/t/ndb_trig_08.test
+
+# NDB tables should be used
+#
+# 1. Check if NDB is available
+--source include/have_ndb.inc
+# 2. Set $engine_type
+let $engine_type= ndbcluster;
+
+--source suite/funcs_1/triggers/triggers_08.inc

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

+#### suite/funcs_1/t/ndb_trig_09.test
+
+# NDB tables should be used
+#
+# 1. Check if NDB is available
+--source include/have_ndb.inc
+# 2. Set $engine_type
+let $engine_type= ndbcluster;
+
+--source suite/funcs_1/triggers/triggers_09.inc

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

+#### suite/funcs_1/t/ndb_trig_1011ext.test
+
+# NDB tables should be used
+#
+# 1. Check if NDB is available
+--source include/have_ndb.inc
+# 2. Set $engine_type
+let $engine_type= ndbcluster;
+
+--source suite/funcs_1/triggers/triggers_1011ext.inc

mysql-test/suite/funcs_1/triggers/triggers_0102.inc

@@ -4,6 +4,9 @@
 # (test case numbering refer to requirement document TP v1.1)
 #======================================================================
 
+USE test;
+--source suite/funcs_1/include/tb3.inc
+
 # OBM - ToDo
 ############
 # 1. Performace
@@ -52,6 +55,7 @@ use test;
         select @test_before, @test_after;
 	Insert into tb3 (f121, f122, f142, f144, f134)
 		values ('Test 3.5.1.1', 'First Row', @test_before, @test_after, 1);
+        --sorted_result
 	select f121, f122, f142, f144, f134 from tb3 where f121 = 'Test 3.5.1.1';
         select @test_before, @test_after;
 
@@ -63,6 +67,7 @@ use test;
 			tb3.f142 = @test_before,
 			tb3.f144 = @test_after
 		where tb3.f121 = 'Test 3.5.1.1';
+        --sorted_result
 	select f121, f122, f142, f144, f134 from tb3 where f121 = 'Test 3.5.1.1';
         select @test_before, @test_after;
 
@@ -71,9 +76,11 @@ use test;
 		values ('Test 3.5.1.1', 'Second Row', 5, 6, 2);
 	set @test_before = 0;
 	set @test_after = 0;
+        --sorted_result
 	select f121, f122, f142, f144, f134 from tb3 where f121 = 'Test 3.5.1.1';
         select @test_before, @test_after;
 	Delete from tb3 where f121 = 'Test 3.5.1.1' and f134 = 2;
+        --sorted_result
 	select f121, f122, f142, f144, f134 from tb3 where f121 = 'Test 3.5.1.1';
         select @test_before, @test_after;
 
@@ -211,7 +218,8 @@ let $message= Testcase 3.5.1.7: - need to fix;
 --source include/show_msg.inc
 
 	drop table if exists t1;
-	eval create table t1 (f1 int, f2 char(25),f3 int) engine=$engine_type;
+        --replace_result $engine_type <engine_to_be_used>
+	eval create table t1 (f1 int, f2 char(25),f3 int) engine = $engine_type;
 	CREATE TRIGGER trg5_1 BEFORE INSERT on test.t1
 		for each row set new.f3 = '14';
 	CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ
@@ -261,6 +269,7 @@ let $message= Testcase 3.5.1.8:;
 	--enable_warnings
 	create database trig_db;
 	use trig_db;
+        --replace_result $engine_type <engine_to_be_used>
 	eval create table t1 (f1 integer) engine = $engine_type;
 
 	# Can't create a trigger in a different database
@@ -324,7 +333,9 @@ let $message= Testcase 3.5.1.?:;
 	drop table if exists t1;
 	drop table if exists t2;
 	--enable_warnings
+        --replace_result $engine_type <engine_to_be_used>
 	eval create table t1 (f1 char(50), f2 integer) engine = $engine_type;
+        --replace_result $engine_type <engine_to_be_used>
 	eval create table t2 (f1 char(50), f2 integer) engine = $engine_type;
 
 	create trigger trig before insert on t1
@@ -366,14 +377,17 @@ let $message= Testcase 3.5.1.11:;
 	create database trig_db2;
 	create database trig_db3;
 	use trig_db1;
+        --replace_result $engine_type <engine_to_be_used>
 	eval create table t1 (f1 char(50), f2 integer) engine = $engine_type;
 	create trigger trig before insert on t1
 		for each row set new.f1 ='trig1', @test_var1='trig1';
 	use trig_db2;
+        --replace_result $engine_type <engine_to_be_used>
 	eval create table t2 (f1 char(50), f2 integer) engine = $engine_type;
 	create trigger trig before insert on t2
 		for each row set new.f1 ='trig2', @test_var2='trig2';
 	use trig_db3;
+        --replace_result $engine_type <engine_to_be_used>
 	eval create table t1 (f1 char(50), f2 integer) engine = $engine_type;
 	create trigger trig before insert on t1
 		for each row set new.f1 ='trig3', @test_var3='trig3';
@@ -425,7 +439,9 @@ let $message= Testcase 3.5.2.1/2/3:;
 	create database trig_db1;
 	create database trig_db2;
 	use trig_db1;
+        --replace_result $engine_type <engine_to_be_used>
 	eval create table t1 (f1 char(50), f2 integer) engine = $engine_type;
+        --replace_result $engine_type <engine_to_be_used>
 	eval create table trig_db2.t1 (f1 char(50), f2 integer) engine = $engine_type;
 	create trigger trig1_b before insert on t1
 		for each row set @test_var1='trig1_b';
@@ -445,3 +461,4 @@ let $message= Testcase 3.5.2.1/2/3:;
 	--disable_warnings
 	drop database trig_db1;
 	drop database trig_db2;
+DROP TABLE test.tb3;

mysql-test/suite/funcs_1/triggers/triggers_03.inc

+#### suite/funcs_1/triggers/triggers_03.inc
 #======================================================================
 #
 # Trigger Tests
 # (test case numbering refer to requirement document TP v1.1)
 #======================================================================
 
+USE test;
+--source suite/funcs_1/include/tb3.inc
+
 --disable_abort_on_error
 
 ###########################################
@@ -20,6 +24,7 @@ let $message= Testcase 3.5.3:;
 	--enable_warnings
 	create database priv_db;
 	use priv_db;
+        --replace_result $engine_type <engine_to_be_used>
 	eval create table t1 (f1 char(20)) engine= $engine_type;
 
 	create User test_noprivs@localhost;
@@ -569,7 +574,9 @@ let $message=Testcase: 3.5.3.x:;
         drop table if exists t2;
         --enable_warnings
 
+        --replace_result $engine_type <engine_to_be_used>
         eval create table t1 (f1 int) engine= $engine_type;
+        --replace_result $engine_type <engine_to_be_used>
         eval create table t2 (f2 int) engine= $engine_type;
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
@@ -656,3 +663,5 @@ let $message=Testcase: 3.5.3.x:;
 	drop user test_noprivs;
 	--enable_warnings
 
+use test;
+drop table tb3;

mysql-test/suite/funcs_1/triggers/triggers_0407.inc

@@ -4,6 +4,9 @@
 # (test case numbering refer to requirement document TP v1.1)
 #======================================================================
 
+USE test;
+--source suite/funcs_1/include/tb3.inc
+
 --disable_abort_on_error
 
 # General setup for Trigger tests
@@ -43,7 +46,8 @@ let $message= Testcase 3.5.4.1:;
 	connection con1_super;
 	create database db_drop;
 	Use db_drop;
-	eval create table t1 (f1 char(30)) engine=$engine_type;
+        --replace_result $engine_type <engine_to_be_used>
+	eval create table t1 (f1 char(30)) engine = $engine_type;
 	grant INSERT, SELECT on db_drop.t1 to test_general;
 	Use db_drop;
 	Create trigger trg1 BEFORE INSERT on t1
@@ -82,7 +86,8 @@ let $message= Testcase 3.5.4.2:;
 	--disable_warnings
 	drop table if exists t1_432 ;
 	--enable_warnings
-	eval create table t1_432 (f1 char (30)) engine=$engine_type;
+        --replace_result $engine_type <engine_to_be_used>
+	eval create table t1_432 (f1 char (30)) engine = $engine_type;
 	--error ER_TRG_DOES_NOT_EXIST
 	Drop trigger tr_does_not_exit;
 #cleanup
@@ -104,8 +109,10 @@ let $message= Testcase 3.5.4.3:;
 	drop table if exists t1_433 ;
 	drop table if exists t1_433a ;
 	--enable_warnings
-	eval create table t1_433 (f1 char (30)) engine=$engine_type;
-	eval create table t1_433a (f1a char (5)) engine=$engine_type;
+        --replace_result $engine_type <engine_to_be_used>
+	eval create table t1_433 (f1 char (30)) engine = $engine_type;
+        --replace_result $engine_type <engine_to_be_used>
+	eval create table t1_433a (f1a char (5)) engine = $engine_type;
 
 	CREATE TRIGGER trg3 BEFORE INSERT on t1_433 for each row
 		set new.f1 = 'Trigger 3.5.4.3';
@@ -141,7 +148,8 @@ let $message= Testcase 3.5.4.4:;
 	connection con1_super;
 	create database db_drop4;
 	Use db_drop4;
-	eval create table t1 (f1 char(30)) engine=$engine_type;
+        --replace_result $engine_type <engine_to_be_used>
+	eval create table t1 (f1 char(30)) engine = $engine_type;
 	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';
@@ -157,7 +165,8 @@ let $message= Testcase 3.5.4.4:;
 		where information_schema.triggers.trigger_name='trg4';
 	create database db_drop4;
 	Use db_drop4;
-	eval create table t1 (f1 char(30)) engine=$engine_type;
+        --replace_result $engine_type <engine_to_be_used>
+	eval create table t1 (f1 char(30)) engine = $engine_type;
 	grant INSERT, SELECT on db_drop4.t1 to test_general;
 	connection con1_general;
 	Insert into t1 values ('2nd Insert 3.5.4.4');
@@ -181,7 +190,8 @@ let $message= Testcase 3.5.4.5:;
 	connection con1_super;
 	create database db_drop5;
 	Use db_drop5;
-	eval create table t1 (f1 char(50)) engine=$engine_type;
+        --replace_result $engine_type <engine_to_be_used>
+	eval create table t1 (f1 char(50)) engine = $engine_type;
 	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';
@@ -195,7 +205,8 @@ let $message= Testcase 3.5.4.5:;
 	select trigger_schema, trigger_name, event_object_table
 		from information_schema.triggers
 		where information_schema.triggers.trigger_name='trg5';
-	eval create table t1 (f1 char(50)) engine=$engine_type;
+        --replace_result $engine_type <engine_to_be_used>
+	eval create table t1 (f1 char(50)) engine = $engine_type;
 	grant INSERT, SELECT on t1 to test_general;
 	connection con1_general;
 	Insert into t1 values ('2nd Insert 3.5.4.5');
@@ -281,7 +292,8 @@ let $message= Testcase 3.5.5.4:;
 	create database dbtest_one;
 	create database dbtest_two;
 	use dbtest_two;
-	eval create table t2 (f1 char(15)) engine=$engine_type;
+        --replace_result $engine_type <engine_to_be_used>
+	eval create table t2 (f1 char(15)) engine = $engine_type;
 	use dbtest_one;
 	--error ER_TRG_IN_WRONG_SCHEMA
 	create trigger trg4 before INSERT
@@ -609,3 +621,4 @@ let $message= Testcase 3.5.7.17 (see Testcase 3.5.1.1);
 	drop user test_general;
 	drop user test_super@localhost;
 
+DROP TABLE test.tb3;

mysql-test/suite/funcs_1/triggers/triggers_08.inc

@@ -4,6 +4,9 @@
 # (test case numbering refer to requirement document TP v1.1)
 #======================================================================
 
+USE test;
+--source suite/funcs_1/include/tb3.inc
+
 # General setup for Trigger tests
 let $message= Testcase: 3.5:;
 --source include/show_msg.inc
@@ -56,16 +59,19 @@ let $message= Testcase 3.5.8.3/4:;
 	grant SELECT, INSERT, UPDATE, DELETE on db_test.* to test_general;
 	grant LOCK TABLES on db_test.* to test_general;
 	Use db_test;
+        --replace_result $engine_type <engine_to_be_used>
 	eval 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=$engine_type;
+        --replace_result $engine_type <engine_to_be_used>
 	eval 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=$engine_type;
+        --replace_result $engine_type <engine_to_be_used>
 	eval create table t1_d (
 		d120 char ascii not null DEFAULT b'101',
 		d136 smallint zerofill not null DEFAULT 999,
@@ -549,4 +555,4 @@ let $message= Testcase 3.5.8.7;
 	drop user test_general;
 	drop user test_super@localhost;
 
-
+DROP TABLE test.tb3;

mysql-test/suite/funcs_1/triggers/triggers_09.inc

@@ -4,6 +4,13 @@
 # (test case numbering refer to requirement document TP v1.1)
 #======================================================================
 
+USE test;
+--source suite/funcs_1/include/tb3.inc
+
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/memory_tb3.txt'
+into table tb3;
 
 #################################
 ####### Section 3.5.9 ###########
@@ -313,4 +320,4 @@ let $message= Testcase 3.5.9.13:;
 let $message= Testcase 3.5.9.14: (implied in previous tests);
 --source include/show_msg.inc
 
-	
+DROP TABLE test.tb3;

mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc

@@ -4,6 +4,14 @@
 # (test case numbering refer to requirement document TP v1.1)
 #======================================================================
 
+USE test;
+--source suite/funcs_1/include/tb3.inc
+
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/memory_tb3.txt'
+into table tb3;
+
 --disable_abort_on_error
 
 ##############################################
@@ -49,6 +57,7 @@ let $message= Testcase 3.5.10.1/2/3:;
 	Insert into vw11 (f122, f151) values ('Not in View', 3);
 	select f121, f122, f151, f163
 		from tb3 where f122 like 'Test 3.5.10.1/2/3%' order by f151;
+        --sorted_result
 	select f121, f122, f151, f163 from vw11;
 	select f121, f122, f151, f163
 		from tb3 where f122 like 'Not in View';
@@ -57,6 +66,7 @@ let $message= Testcase 3.5.10.1/2/3:;
 	Update vw11 set f163=1;
 	select f121, f122, f151, f163 from tb3
 		where f122 like 'Test 3.5.10.1/2/3%' order by f151;
+        --sorted_result
 	select f121, f122, f151, f163 from vw11;
 
 #Section 3.5.10.3
@@ -65,6 +75,7 @@ let $message= Testcase 3.5.10.1/2/3:;
 	delete from vw11 where f151=1;
 	select f121, f122, f151, f163 from tb3
 		where f122 like 'Test 3.5.10.1/2/3%' order by f151;
+        --sorted_result
 	select f121, f122, f151, f163 from vw11;
 	Select @test_var as 'after delete';
 
@@ -88,7 +99,8 @@ let $message= Testcase 3.5.10.1/2/3:;
 let $message= Testcase 3.5.10.4:;
 --source include/show_msg.inc
 
-	eval create table tb_load (f1 int, f2 char(25),f3 int) engine=$engine_type;
+        --replace_result $engine_type <engine_to_be_used>
+	eval create table tb_load (f1 int, f2 char(25),f3 int) engine = $engine_type;
 	Create trigger trg4 before insert on tb_load
 		for each row set new.f3=-(new.f1 div 5), @counter= @counter+1;
 
@@ -131,7 +143,8 @@ let $message= Testcase 3.5.10.6: (implemented in trig_frkey.test);
 let $message= Testcase 3.5.10.extra:;
 --source include/show_msg.inc
 
-	eval create table t1_sp (var136 tinyint, var151 decimal) engine=$engine_type;
+        --replace_result $engine_type <engine_to_be_used>
+	eval create table t1_sp (var136 tinyint, var151 decimal) engine = $engine_type;
 
 	create trigger trg before insert on t1_sp
 		for each row set @counter=@counter+1;
@@ -203,12 +216,18 @@ let $message= Testcase y.y.y.2: Check for triggers starting triggers;
 	drop table if exists t3;
 	--enable_warnings
 
-	eval create table t1 (f1 integer) engine=$engine_type;
-	eval create table t2_1 (f1 integer) engine=$engine_type;
-	eval create table t2_2 (f1 integer) engine=$engine_type;
-	eval create table t2_3 (f1 integer) engine=$engine_type;
-	eval create table t2_4 (f1 integer) engine=$engine_type;
-	eval create table t3 (f1 integer) engine=$engine_type;
+        --replace_result $engine_type <engine_to_be_used>
+	eval create table t1 (f1 integer) engine = $engine_type;
+        --replace_result $engine_type <engine_to_be_used>
+	eval create table t2_1 (f1 integer) engine = $engine_type;
+        --replace_result $engine_type <engine_to_be_used>
+	eval create table t2_2 (f1 integer) engine = $engine_type;
+        --replace_result $engine_type <engine_to_be_used>
+	eval create table t2_3 (f1 integer) engine = $engine_type;
+        --replace_result $engine_type <engine_to_be_used>
+	eval create table t2_4 (f1 integer) engine = $engine_type;
+        --replace_result $engine_type <engine_to_be_used>
+	eval create table t3 (f1 integer) engine = $engine_type;
 
 	insert into t1 values (1);
 	delimiter //;
@@ -256,9 +275,13 @@ let $message= Testcase y.y.y.3: Circular trigger reference;
 	drop table if exists t3;
 	drop table if exists t4;
 	--enable_warnings
+        --replace_result $engine_type <engine_to_be_used>
 	eval create table t1 (f1 integer) engine = $engine_type;
+        --replace_result $engine_type <engine_to_be_used>
 	eval create table t2 (f2 integer) engine = $engine_type;
+        --replace_result $engine_type <engine_to_be_used>
 	eval create table t3 (f3 integer) engine = $engine_type;
+        --replace_result $engine_type <engine_to_be_used>
 	eval create table t4 (f4 integer) engine = $engine_type;
 
 	insert into t1 values (0);
@@ -298,10 +321,11 @@ let $message= Testcase y.y.y.4: Recursive trigger/SP references;
 --source include/show_msg.inc
 
 set @sql_mode='traditional';
+        --replace_result $engine_type <engine_to_be_used>
 	eval create table t1_sp (
 		count integer,
 		var136 tinyint,
-		var151 decimal) engine=$engine_type;
+		var151 decimal) engine = $engine_type;
 
 	delimiter //;
 	create procedure trig_sp()
@@ -353,7 +377,7 @@ set @sql_mode='traditional';
 
 # Testcase: y.y.y.5:
 # Checking rollback of nested trigger definitions
-let $message= Testcase y.y.y.5: Roleback of nested trigger references;
+let $message= Testcase y.y.y.5: Rollback of nested trigger references;
 --source include/show_msg.inc
 
 	set @@sql_mode='traditional';
@@ -364,10 +388,15 @@ let $message= Testcase y.y.y.5: Roleback of nested trigger references;
 	drop table if exists t3;
 	drop table if exists t4;
 	--enable_warnings
+        --replace_result $engine_type <engine_to_be_used>
 	eval create table t1 (f1 integer) engine = $engine_type;
+        --replace_result $engine_type <engine_to_be_used>
 	eval create table t2 (f2 integer) engine = $engine_type;
+        --replace_result $engine_type <engine_to_be_used>
 	eval create table t3 (f3 integer) engine = $engine_type;
+        --replace_result $engine_type <engine_to_be_used>
 	eval create table t4 (f4 tinyint) engine = $engine_type;
+        --replace_result $engine_type <engine_to_be_used>
 	show create table t1;
 	insert into t1 values (1);
 	create trigger tr1 after insert on t1
@@ -377,19 +406,18 @@ let $message= Testcase y.y.y.5: Roleback of nested trigger references;
 	create trigger tr3 after insert on t3
 		for each row insert into t4 (f4) values (new.f3+1000);
 
-#lock tables t1 write, t2 write, t3 write, t4 write;
-
 	set autocommit=0;
 	start transaction;
+# Bug#32656 NDB: Duplicate key error aborts transaction in handler.
+#           Doesn't talk back to SQL
 	--error ER_WARN_DATA_OUT_OF_RANGE
 	insert into t1 values (1);
 	commit;
 	select * from t1 order by f1;
 	select * from t2 order by f2;
 	select * from t3 order by f3;
-#unlock tables;
+
 #Cleanup
-	--disable_warnings
 	drop trigger tr1;
 	drop trigger tr2;
 	drop trigger tr3;
@@ -397,5 +425,5 @@ let $message= Testcase y.y.y.5: Roleback of nested trigger references;
 	drop table t2;
 	drop table t3;
 	drop table t4;
-	--enable_warnings
 
+DROP TABLE test.tb3;

mysql-test/t/func_misc.test

@@ -178,7 +178,7 @@ SET @sleep_time_per_result_row = 1;
 SET @max_acceptable_delay = 2;
 # TIMEDIFF = time for query with sleep (mostly the time caused by SLEEP)
 #            + time for delays caused by high load on testing box
-# Ensure that at least a reasonable fraction of TIMEDIFF is belongs to the SLEEP
+# Ensure that at least a reasonable fraction of TIMEDIFF belongs to the SLEEP
 # by appropriate setting of variables.
 # Ensure that any "judging" has a base of minimum three attempts.
 # (Test 2 uses all attempts except the first one.)
@@ -242,7 +242,7 @@ while ($num)
 #    -> total runtime is clear more needed than for one result row needed
 #       = Replacement for one of the original Bug#12689 tests
 --echo # Test 1: Does the query with SLEEP need a reasonable time?
-eval SELECT COUNT(*) > $loops - 1 INTO @aux1 FROM t_history
+eval SELECT COUNT(*) >= $loops - 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";
@@ -257,7 +257,7 @@ SELECT @aux1 AS "Expect 1";
 #    = Replacement for one of the original Bug#12689 tests
 --echo # Test 2: Does the query with SLEEP need a reasonable time even in case
 --echo #         of the non first execution?
-eval SELECT COUNT(*) > $loops - 1 - 1 INTO @aux2 FROM t_history
+eval SELECT COUNT(*) >= $loops - 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;