diff options
71 files changed, 3365 insertions, 638 deletions
diff --git a/Makefile.am b/Makefile.am index 55f54476212..fc5138e2778 100644 --- a/Makefile.am +++ b/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: diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result index 1c41b6e67c1..c35c2eaccd7 100644 --- a/mysql-test/r/func_misc.result +++ b/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; diff --git a/mysql-test/suite/funcs_1/include/tb3.inc b/mysql-test/suite/funcs_1/include/tb3.inc new file mode 100644 index 00000000000..5e7dc369ddb --- /dev/null +++ b/mysql-test/suite/funcs_1/include/tb3.inc @@ -0,0 +1,66 @@ +##### 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; diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_0102.result b/mysql-test/suite/funcs_1/r/innodb_trig_0102.result index 1f7a5e6262d..2cd4b447367 100644 --- a/mysql-test/suite/funcs_1/r/innodb_trig_0102.result +++ b/mysql-test/suite/funcs_1/r/innodb_trig_0102.result @@ -1,17 +1,11 @@ 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 diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_03.result b/mysql-test/suite/funcs_1/r/innodb_trig_03.result index 58fbdc053b7..b02fba0f38d 100644 --- a/mysql-test/suite/funcs_1/r/innodb_trig_03.result +++ b/mysql-test/suite/funcs_1/r/innodb_trig_03.result @@ -1,17 +1,11 @@ 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; diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_0407.result b/mysql-test/suite/funcs_1/r/innodb_trig_0407.result index bd190c7ed2f..a4871065c04 100644 --- a/mysql-test/suite/funcs_1/r/innodb_trig_0407.result +++ b/mysql-test/suite/funcs_1/r/innodb_trig_0407.result @@ -1,17 +1,11 @@ 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'; diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_08.result b/mysql-test/suite/funcs_1/r/innodb_trig_08.result index 19e42143a5d..6ced07cef73 100644 --- a/mysql-test/suite/funcs_1/r/innodb_trig_08.result +++ b/mysql-test/suite/funcs_1/r/innodb_trig_08.result @@ -1,17 +1,11 @@ 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); diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_09.result b/mysql-test/suite/funcs_1/r/innodb_trig_09.result index 490afb21d94..0af360c5bfb 100644 --- a/mysql-test/suite/funcs_1/r/innodb_trig_09.result +++ b/mysql-test/suite/funcs_1/r/innodb_trig_09.result @@ -1,17 +1,11 @@ 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 diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result b/mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result index 927c0d1a1a9..78265fac296 100644 --- a/mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result +++ b/mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result @@ -1,17 +1,11 @@ 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` ( diff --git a/mysql-test/suite/funcs_1/r/memory_trig_0102.result b/mysql-test/suite/funcs_1/r/memory_trig_0102.result index db58d5c3ce5..2cd4b447367 100644 --- a/mysql-test/suite/funcs_1/r/memory_trig_0102.result +++ b/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 diff --git a/mysql-test/suite/funcs_1/r/memory_trig_03.result b/mysql-test/suite/funcs_1/r/memory_trig_03.result index c6b6e1bc216..b02fba0f38d 100644 --- a/mysql-test/suite/funcs_1/r/memory_trig_03.result +++ b/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; diff --git a/mysql-test/suite/funcs_1/r/memory_trig_0407.result b/mysql-test/suite/funcs_1/r/memory_trig_0407.result index 65bb3b91c9e..a4871065c04 100644 --- a/mysql-test/suite/funcs_1/r/memory_trig_0407.result +++ b/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'; diff --git a/mysql-test/suite/funcs_1/r/memory_trig_08.result b/mysql-test/suite/funcs_1/r/memory_trig_08.result index 3224df54f4d..6ced07cef73 100644 --- a/mysql-test/suite/funcs_1/r/memory_trig_08.result +++ b/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); diff --git a/mysql-test/suite/funcs_1/r/memory_trig_09.result b/mysql-test/suite/funcs_1/r/memory_trig_09.result index 6c7346e9692..0af360c5bfb 100644 --- a/mysql-test/suite/funcs_1/r/memory_trig_09.result +++ b/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 diff --git a/mysql-test/suite/funcs_1/r/memory_trig_1011ext.result b/mysql-test/suite/funcs_1/r/memory_trig_1011ext.result index 4c06a71588a..02a18e1e669 100644 --- a/mysql-test/suite/funcs_1/r/memory_trig_1011ext.result +++ b/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` ( diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_0102.result b/mysql-test/suite/funcs_1/r/myisam_trig_0102.result index 5e25510cd0f..2cd4b447367 100644 --- a/mysql-test/suite/funcs_1/r/myisam_trig_0102.result +++ b/mysql-test/suite/funcs_1/r/myisam_trig_0102.result @@ -1,17 +1,11 @@ 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 diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_03.result b/mysql-test/suite/funcs_1/r/myisam_trig_03.result index 211bb4dec70..b02fba0f38d 100644 --- a/mysql-test/suite/funcs_1/r/myisam_trig_03.result +++ b/mysql-test/suite/funcs_1/r/myisam_trig_03.result @@ -1,17 +1,11 @@ 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; diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_0407.result b/mysql-test/suite/funcs_1/r/myisam_trig_0407.result index ade033fa852..a4871065c04 100644 --- a/mysql-test/suite/funcs_1/r/myisam_trig_0407.result +++ b/mysql-test/suite/funcs_1/r/myisam_trig_0407.result @@ -1,17 +1,11 @@ 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'; diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_08.result b/mysql-test/suite/funcs_1/r/myisam_trig_08.result index dcfa0aa7ddf..6ced07cef73 100644 --- a/mysql-test/suite/funcs_1/r/myisam_trig_08.result +++ b/mysql-test/suite/funcs_1/r/myisam_trig_08.result @@ -1,17 +1,11 @@ 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); diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_09.result b/mysql-test/suite/funcs_1/r/myisam_trig_09.result index d1af3c562e2..0af360c5bfb 100644 --- a/mysql-test/suite/funcs_1/r/myisam_trig_09.result +++ b/mysql-test/suite/funcs_1/r/myisam_trig_09.result @@ -1,17 +1,11 @@ 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 diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result b/mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result index c12b0e0f7ad..c36db962bd5 100644 --- a/mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result +++ b/mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result @@ -1,17 +1,11 @@ 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` ( diff --git a/mysql-test/suite/funcs_1/r/ndb_trig_0102.result b/mysql-test/suite/funcs_1/r/ndb_trig_0102.result index 07e219ab738..2cd4b447367 100644 --- a/mysql-test/suite/funcs_1/r/ndb_trig_0102.result +++ b/mysql-test/suite/funcs_1/r/ndb_trig_0102.result @@ -1,17 +1,11 @@ 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 diff --git a/mysql-test/suite/funcs_1/r/ndb_trig_0102.result.moved b/mysql-test/suite/funcs_1/r/ndb_trig_0102.result.moved new file mode 100644 index 00000000000..07e219ab738 --- /dev/null +++ b/mysql-test/suite/funcs_1/r/ndb_trig_0102.result.moved @@ -0,0 +1,371 @@ +USE test; +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, +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 = ndb; +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: +------------------ +use test; +Create trigger trg1_1 BEFORE INSERT +on tb3 for each row set @test_before = 2, new.f142 = @test_before; +Create trigger trg1_2 AFTER INSERT +on tb3 for each row set @test_after = 6; +Create trigger trg1_4 BEFORE UPDATE +on tb3 for each row set @test_before = 27, +new.f142 = @test_before, +new.f122 = 'Before Update Trigger'; +Create trigger trg1_3 AFTER UPDATE +on tb3 for each row set @test_after = '15'; +Create trigger trg1_5 BEFORE DELETE on tb3 for each row +select count(*) into @test_before from tb3 as tr_tb3 +where f121 = 'Test 3.5.1.1'; +Create trigger trg1_6 AFTER DELETE on tb3 for each row +select count(*) into @test_after from tb3 as tr_tb3 +where f121 = 'Test 3.5.1.1'; +set @test_before = 1; +set @test_after = 5; +select @test_before, @test_after; +@test_before @test_after +1 5 +Insert into tb3 (f121, f122, f142, f144, f134) +values ('Test 3.5.1.1', 'First Row', @test_before, @test_after, 1); +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 First Row 2 0000000005 1 +select @test_before, @test_after; +@test_before @test_after +2 6 +set @test_before = 18; +set @test_after = 8; +select @test_before, @test_after; +@test_before @test_after +18 8 +Update tb3 set tb3.f122 = 'Update', +tb3.f142 = @test_before, +tb3.f144 = @test_after +where tb3.f121 = 'Test 3.5.1.1'; +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 Before Update Trigger 27 0000000008 1 +select @test_before, @test_after; +@test_before @test_after +27 15 +Insert into tb3 (f121, f122, f142, f144, f134) +values ('Test 3.5.1.1', 'Second Row', 5, 6, 2); +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 +select @test_before, @test_after; +@test_before @test_after +0 0 +Delete from tb3 where f121 = 'Test 3.5.1.1' and f134 = 2; +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 Before Update Trigger 27 0000000008 1 +select @test_before, @test_after; +@test_before @test_after +2 1 +drop trigger trg1_1; +drop trigger trg1_2; +drop trigger trg1_3; +drop trigger trg1_4; +drop trigger trg1_5; +drop trigger trg1_6; +delete from tb3 where f121='Test 3.5.1.1'; + +Testcase: 3.5.1.2: +------------------ +Create trigger trg_1 after insert +on tb3 for each statement set @x= 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'statement set @x= 1' at line 2 +drop trigger trg_1; + +Testcase 3.5.1.3: +----------------- +CREATE TRIGGER trg3_1 on tb3 BEFORE INSERT for each row set new.f120 = 't'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'on tb3 BEFORE INSERT for each row set new.f120 = 't'' at line 1 +CREATE trg3_2 TRIGGER AFTER INSERT on tb3 for each row set new.f120 = 's'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'trg3_2 TRIGGER AFTER INSERT on tb3 for each row set new.f120 = 's'' at line 1 +CREATE TRIGGER trg3_3 Before DELETE on tb3 set @ret1 = 'test' for each row; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'set @ret1 = 'test' for each row' at line 1 +CREATE TRIGGER trg3_4 DELETE AFTER on tb3 set @ret1 = 'test' for each row; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DELETE AFTER on tb3 set @ret1 = 'test' for each row' at line 1 +CREATE for each row TRIGGER trg3_5 AFTER UPDATE on tb3 set @ret1 = 'test'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'for each row TRIGGER trg3_5 AFTER UPDATE on tb3 set @ret1 = 'test'' at line 1 +drop trigger trg3_1; +drop trigger trg3_2; +drop trigger trg3_3; +drop trigger trg3_4; +drop trigger trg3_5; + +Testcase: 3.5.1.5: +------------------ +CREATE TRIGGER trg4_1 AFTER on tb3 for each row set new.f120 = 'e'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'on tb3 for each row set new.f120 = 'e'' at line 1 +CREATE TRIGGER trg4_2 INSERT on tb3 for each set row new.f120 = 'f'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INSERT on tb3 for each set row new.f120 = 'f'' at line 1 +CREATE TRIGGER trg4_3 BEFORE INSERT tb3 for each row set new.f120 = 'g'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tb3 for each row set new.f120 = 'g'' at line 1 +CREATE TRIGGER trg4_4 AFTER UPDATE on tb3 for each set new.f120 = 'g'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'set new.f120 = 'g'' at line 1 +CREATE trg4_5 AFTER DELETE on tb3 for each set new.f120 = 'g'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'trg4_5 AFTER DELETE on tb3 for each set new.f120 = 'g'' at line 1 +CREATE TRIGGER trg4_6 BEFORE DELETE for each row set new.f120 = 'g'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'for each row set new.f120 = 'g'' at line 1 +drop trigger trg4_1; +drop trigger trg4_2; +drop trigger trg4_3; +drop trigger trg4_4; +drop trigger trg4_5; +drop trigger trg4_6; + +Testcase 3.5.1.6: - Need to fix +------------------------------- + +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 TRIGGER trg5_1 BEFORE INSERT on test.t1 +for each row set new.f3 = '14'; +CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ +BEFORE UPDATE on test.t1 for each row set new.f3 = '42'; +ERROR 42000: Identifier name 'trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ' is too long +CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX +BEFORE UPDATE on test.t1 for each row set new.f3 = '42'; +insert into t1 (f2) values ('insert 3.5.1.7'); +select * from t1; +f1 f2 f3 +NULL insert 3.5.1.7 14 +update t1 set f2='update 3.5.1.7'; +select * from t1; +f1 f2 f3 +NULL update 3.5.1.7 42 +select trigger_name from information_schema.triggers order by trigger_name; +trigger_name +trg5_1 +trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX +drop trigger trg5_1; +drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ; +ERROR 42000: Identifier name 'trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ' is too long +drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX; +drop table t1; + +Testcase 3.5.1.8: +----------------- +CREATE TRIGGER trg12* before insert on tb3 for each row set new.f120 = 't'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '* before insert on tb3 for each row set new.f120 = 't'' at line 1 +CREATE TRIGGER trigger before insert on tb3 for each row set new.f120 = 't'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'trigger before insert on tb3 for each row set new.f120 = 't'' at line 1 +CREATE TRIGGER 100 before insert on tb3 for each row set new.f120 = 't'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '100 before insert on tb3 for each row set new.f120 = 't'' at line 1 +CREATE TRIGGER @@view before insert on tb3 for each row set new.f120 = 't'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@@view before insert on tb3 for each row set new.f120 = 't'' at line 1 +CREATE TRIGGER @name before insert on tb3 for each row set new.f120 = 't'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@name before insert on tb3 for each row set new.f120 = 't'' at line 1 +CREATE TRIGGER tb3.trg6_1 BEFORE INSERT on test.tb3 +for each row set new.f120 ='X'; +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; +use test; +CREATE TRIGGER trig_db.trg6_2 AFTER INSERT on tb3 +for each row set @ret_trg6_2 = 5; +ERROR 42S02: Table 'trig_db.tb3' doesn't exist +use trig_db; +CREATE TRIGGER trg6_3 AFTER INSERT on test.tb3 +for each row set @ret_trg6_3 = 18; +ERROR HY000: Trigger in wrong schema +use test; +drop database trig_db; +drop trigger trg6_1; +drop trigger trg6_3; + +Testcase 3.5.1.9:(cannot be inplemented at this point) +------------------------------------------------------ + +Testcase 3.5.1.10: +------------------ +CREATE TRIGGER trg7_1 BEFORE UPDATE on tb3 for each row set new.f120 ='X'; +CREATE TRIGGER trg7_1 AFTER INSERT on tb3 for each row set @x ='Y'; +ERROR HY000: Trigger already exists +drop trigger trg7_1; + +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 trigger trig before insert on t1 +for each row set new.f1 ='trig t1'; +create trigger trig before update on t2 +for each row set new.f1 ='trig t2'; +ERROR HY000: Trigger already exists +insert into t1 value ('insert to t1',1); +select * from t1; +f1 f2 +trig t1 1 +update t1 set f1='update to t1'; +select * from t1; +f1 f2 +update to t1 1 +insert into t2 value ('insert to t2',2); +update t2 set f1='update to t1'; +select * from t2; +f1 f2 +update to t1 2 +drop table t1; +drop table t2; +drop trigger trig; + +Testcase 3.5.1.11: +------------------ +drop database if exists trig_db1; +drop database if exists trig_db2; +drop database if exists trig_db3; +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 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 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 trigger trig before insert on t1 +for each row set new.f1 ='trig3', @test_var3='trig3'; +set @test_var1= '', @test_var2= '', @test_var3= ''; +use trig_db1; +insert into t1 (f1,f2) values ('insert to db1 t1',1); +insert into trig_db1.t1 (f1,f2) values ('insert to db1 t1 from db1',2); +insert into trig_db2.t2 (f1,f2) values ('insert to db2 t2 from db1',3); +insert into trig_db3.t1 (f1,f2) values ('insert to db3 t1 from db1',4); +select @test_var1, @test_var2, @test_var3; +@test_var1 @test_var2 @test_var3 +trig1 trig2 trig3 +select * from t1 order by f2; +f1 f2 +trig1 1 +trig1 2 +select * from trig_db2.t2; +f1 f2 +trig2 3 +select * from trig_db3.t1; +f1 f2 +trig3 4 +select * from t1 order by f2; +f1 f2 +trig1 1 +trig1 2 +use test; +drop database trig_db1; +drop database trig_db2; +drop database trig_db3; + +Testcase 3.5.2.1/2/3: +--------------------- +drop database if exists trig_db1; +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 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 +for each row set @test_var2='trig1_a'; +create trigger trig_db2.trig2 before insert on trig_db2.t1 +for each row set @test_var3='trig2'; +select trigger_schema, trigger_name, event_object_table +from information_schema.triggers order by trigger_name; +trigger_schema trigger_name event_object_table +trig_db1 trig1_a t1 +trig_db1 trig1_b t1 +trig_db2 trig2 t1 +set @test_var1= '', @test_var2= '', @test_var3= ''; +insert into t1 (f1,f2) values ('insert to db1 t1 from db1',352); +insert into trig_db2.t1 (f1,f2) values ('insert to db2 t1 from db1',352); +select @test_var1, @test_var2, @test_var3; +@test_var1 @test_var2 @test_var3 +trig1_b trig1_a trig2 +drop database trig_db1; +drop database trig_db2; +DROP TABLE test.tb3; diff --git a/mysql-test/suite/funcs_1/r/ndb_trig_03.result b/mysql-test/suite/funcs_1/r/ndb_trig_03.result index 8f935113997..b02fba0f38d 100644 --- a/mysql-test/suite/funcs_1/r/ndb_trig_03.result +++ b/mysql-test/suite/funcs_1/r/ndb_trig_03.result @@ -1,17 +1,11 @@ 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; diff --git a/mysql-test/suite/funcs_1/r/ndb_trig_03.result.moved b/mysql-test/suite/funcs_1/r/ndb_trig_03.result.moved new file mode 100644 index 00000000000..8f935113997 --- /dev/null +++ b/mysql-test/suite/funcs_1/r/ndb_trig_03.result.moved @@ -0,0 +1,702 @@ +USE test; +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, +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 = ndb; +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 User test_noprivs@localhost; +set password for test_noprivs@localhost = password('PWD'); +create User test_yesprivs@localhost; +set password for test_yesprivs@localhost = password('PWD'); + +Testcase 3.5.3.2/6: +------------------- +revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost; +grant ALL on *.* to test_noprivs@localhost; +revoke TRIGGER on *.* from test_noprivs@localhost; +show grants for test_noprivs@localhost; +Grants for test_noprivs@localhost +GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576' +revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost; +grant TRIGGER on *.* to test_yesprivs@localhost; +grant SELECT on priv_db.t1 to test_yesprivs@localhost; +show grants for test_yesprivs@localhost; +Grants for test_yesprivs@localhost +GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576' +GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost' +connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK); +connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK); + +Testcase 3.5.3.2: +----------------- +select current_user; +current_user +test_noprivs@localhost +use priv_db; +create trigger trg1_1 before INSERT on t1 for each row +set new.f1 = 'trig 3.5.3.2_1-no'; +ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1' +use priv_db; +insert into t1 (f1) values ('insert 3.5.3.2-no'); +select f1 from t1 order by f1; +f1 +insert 3.5.3.2-no +select current_user; +current_user +test_yesprivs@localhost +use priv_db; +create trigger trg1_2 before INSERT on t1 for each row +set new.f1 = 'trig 3.5.3.2_2-yes'; +select current_user; +current_user +root@localhost +use priv_db; +insert into t1 (f1) values ('insert 3.5.3.2-yes'); +ERROR 42000: UPDATE command denied to user 'test_yesprivs'@'localhost' for column 'f1' in table 't1' +select f1 from t1 order by f1; +f1 +insert 3.5.3.2-no +grant UPDATE on priv_db.t1 to test_yesprivs@localhost; +insert into t1 (f1) values ('insert 3.5.3.2-yes'); +select f1 from t1 order by f1; +f1 +insert 3.5.3.2-no +trig 3.5.3.2_2-yes + +Testcase 3.5.3.6: +----------------- +use priv_db; +drop trigger trg1_2; +ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1' +use priv_db; +insert into t1 (f1) values ('insert 3.5.3.6-yes'); +select f1 from t1 order by f1; +f1 +insert 3.5.3.2-no +trig 3.5.3.2_2-yes +trig 3.5.3.2_2-yes +use priv_db; +drop trigger trg1_2; +use priv_db; +insert into t1 (f1) values ('insert 3.5.3.6-no'); +select f1 from t1 order by f1; +f1 +insert 3.5.3.2-no +insert 3.5.3.6-no +trig 3.5.3.2_2-yes +trig 3.5.3.2_2-yes +drop trigger trg1_2; + +Testcase 3.5.3.7a: +------------------ +revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost; +grant ALL on *.* to test_noprivs@localhost; +revoke UPDATE on *.* from test_noprivs@localhost; +show grants for test_noprivs@localhost; +Grants for test_noprivs@localhost +GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576' +revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost; +grant TRIGGER, UPDATE on *.* to test_yesprivs@localhost; +show grants for test_yesprivs@localhost; +Grants for test_yesprivs@localhost +GRANT UPDATE, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576' +connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK); +connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK); +select current_user; +current_user +test_noprivs@localhost +use priv_db; +show grants; +Grants for test_noprivs@localhost +GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576' +select f1 from t1 order by f1; +f1 +insert 3.5.3.2-no +insert 3.5.3.6-no +trig 3.5.3.2_2-yes +trig 3.5.3.2_2-yes +create trigger trg4a_1 before INSERT on t1 for each row +set new.f1 = 'trig 3.5.3.7-1a'; +insert into t1 (f1) values ('insert 3.5.3.7-1a'); +ERROR 42000: UPDATE command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1' +select f1 from t1 order by f1; +f1 +insert 3.5.3.2-no +insert 3.5.3.6-no +trig 3.5.3.2_2-yes +trig 3.5.3.2_2-yes +drop trigger trg4a_1; +use priv_db; +select current_user; +current_user +test_yesprivs@localhost +show grants; +Grants for test_yesprivs@localhost +GRANT UPDATE, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576' +create trigger trg4a_2 before INSERT on t1 for each row +set new.f1 = 'trig 3.5.3.7-2a'; +insert into t1 (f1) values ('insert 3.5.3.7-2b'); +select f1 from t1 order by f1; +f1 +insert 3.5.3.2-no +insert 3.5.3.6-no +trig 3.5.3.2_2-yes +trig 3.5.3.2_2-yes +trig 3.5.3.7-2a +drop trigger trg4a_2; + +Testcase 3.5.3.7b: +------------------ +revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost; +grant TRIGGER on *.* to test_noprivs; +grant ALL on priv_db.* to test_noprivs@localhost; +revoke UPDATE on priv_db.* from test_noprivs@localhost; +show grants for test_noprivs; +Grants for test_noprivs@% +GRANT TRIGGER ON *.* TO 'test_noprivs'@'%' +revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost; +grant TRIGGER on *.* to test_yesprivs@localhost; +grant UPDATE on priv_db.* to test_yesprivs@localhost; +show grants for test_yesprivs@localhost; +Grants for test_yesprivs@localhost +GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576' +GRANT UPDATE ON `priv_db`.* TO 'test_yesprivs'@'localhost' +connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK); +connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK); +show grants; +Grants for test_noprivs@localhost +GRANT USAGE ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576' +GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost' +use priv_db; +create trigger trg4b_1 before UPDATE on t1 for each row +set new.f1 = 'trig 3.5.3.7-1b'; +insert into t1 (f1) values ('insert 3.5.3.7-1b'); +select f1 from t1 order by f1; +f1 +insert 3.5.3.2-no +insert 3.5.3.6-no +insert 3.5.3.7-1b +trig 3.5.3.2_2-yes +trig 3.5.3.2_2-yes +trig 3.5.3.7-2a +update t1 set f1 = 'update 3.5.3.7-1b' where f1 = 'insert 3.5.3.7-1b'; +ERROR 42000: UPDATE command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1' +select f1 from t1 order by f1; +f1 +insert 3.5.3.2-no +insert 3.5.3.6-no +insert 3.5.3.7-1b +trig 3.5.3.2_2-yes +trig 3.5.3.2_2-yes +trig 3.5.3.7-2a +drop trigger trg4b_1; +show grants; +Grants for test_yesprivs@localhost +GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576' +GRANT UPDATE ON `priv_db`.* TO 'test_yesprivs'@'localhost' +use priv_db; +create trigger trg4b_2 before UPDATE on t1 for each row +set new.f1 = 'trig 3.5.3.7-2b'; +insert into t1 (f1) values ('insert 3.5.3.7-2b'); +select f1 from t1 order by f1; +f1 +insert 3.5.3.2-no +insert 3.5.3.6-no +insert 3.5.3.7-1b +insert 3.5.3.7-2b +trig 3.5.3.2_2-yes +trig 3.5.3.2_2-yes +trig 3.5.3.7-2a +update t1 set f1 = 'update 3.5.3.7-2b' where f1 = 'insert 3.5.3.7-2b'; +select f1 from t1 order by f1; +f1 +insert 3.5.3.2-no +insert 3.5.3.6-no +insert 3.5.3.7-1b +trig 3.5.3.2_2-yes +trig 3.5.3.2_2-yes +trig 3.5.3.7-2a +trig 3.5.3.7-2b +drop trigger trg4b_2; + +Testcase 3.5.3.7c +----------------- +revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost; +grant TRIGGER on *.* to test_noprivs@localhost; +grant ALL on priv_db.t1 to test_noprivs@localhost; +revoke UPDATE on priv_db.t1 from test_noprivs@localhost; +show grants for test_noprivs; +Grants for test_noprivs@% +GRANT TRIGGER ON *.* TO 'test_noprivs'@'%' +revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost; +grant TRIGGER on *.* to test_yesprivs@localhost; +grant UPDATE on priv_db.t1 to test_yesprivs@localhost; +show grants for test_yesprivs@localhost; +Grants for test_yesprivs@localhost +GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576' +GRANT UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost' +connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK); +connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK); +show grants; +Grants for test_noprivs@localhost +GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576' +GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost' +use priv_db; +create trigger trg4c_1 before INSERT on t1 for each row +set new.f1 = 'trig 3.5.3.7-1c'; +insert into t1 (f1) values ('insert 3.5.3.7-1c'); +ERROR 42000: UPDATE command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1' +select f1 from t1 order by f1; +f1 +insert 3.5.3.2-no +insert 3.5.3.6-no +insert 3.5.3.7-1b +trig 3.5.3.2_2-yes +trig 3.5.3.2_2-yes +trig 3.5.3.7-2a +trig 3.5.3.7-2b +drop trigger trg4c_1; +show grants; +Grants for test_yesprivs@localhost +GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576' +GRANT UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost' +use priv_db; +create trigger trg4c_2 before INSERT on t1 for each row +set new.f1 = 'trig 3.5.3.7-2c'; +insert into t1 (f1) values ('insert 3.5.3.7-2c'); +select f1 from t1 order by f1; +f1 +insert 3.5.3.2-no +insert 3.5.3.6-no +insert 3.5.3.7-1b +trig 3.5.3.2_2-yes +trig 3.5.3.2_2-yes +trig 3.5.3.7-2a +trig 3.5.3.7-2b +trig 3.5.3.7-2c +drop trigger trg4c_2; + +Testcase 3.5.3.7d: +------------------ +revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost; +grant TRIGGER on *.* to test_noprivs@localhost; +grant SELECT (f1), INSERT (f1) on priv_db.t1 to test_noprivs@localhost; +show grants for test_noprivs; +Grants for test_noprivs@% +GRANT TRIGGER ON *.* TO 'test_noprivs'@'%' +revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost; +grant TRIGGER on *.* to test_yesprivs@localhost; +grant UPDATE (f1) on priv_db.t1 to test_yesprivs@localhost; +show grants for test_noprivs; +Grants for test_noprivs@% +GRANT TRIGGER ON *.* TO 'test_noprivs'@'%' +connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK); +connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK); +show grants; +Grants for test_noprivs@localhost +GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576' +GRANT SELECT (f1), INSERT (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost' +use priv_db; +create trigger trg4d_1 before INSERT on t1 for each row +set new.f1 = 'trig 3.5.3.7-1d'; +insert into t1 (f1) values ('insert 3.5.3.7-1d'); +ERROR 42000: UPDATE command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1' +select f1 from t1 order by f1; +f1 +insert 3.5.3.2-no +insert 3.5.3.6-no +insert 3.5.3.7-1b +trig 3.5.3.2_2-yes +trig 3.5.3.2_2-yes +trig 3.5.3.7-2a +trig 3.5.3.7-2b +trig 3.5.3.7-2c +drop trigger trg4d_1; +show grants; +Grants for test_yesprivs@localhost +GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576' +GRANT UPDATE (f1) ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost' +use priv_db; +create trigger trg4d_2 before INSERT on t1 for each row +set new.f1 = 'trig 3.5.3.7-2d'; +insert into t1 (f1) values ('insert 3.5.3.7-2d'); +select f1 from t1 order by f1; +f1 +insert 3.5.3.2-no +insert 3.5.3.6-no +insert 3.5.3.7-1b +trig 3.5.3.2_2-yes +trig 3.5.3.2_2-yes +trig 3.5.3.7-2a +trig 3.5.3.7-2b +trig 3.5.3.7-2c +trig 3.5.3.7-2d +drop trigger trg4d_2; + +Testcase 3.5.3.8a: +------------------ +revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost; +grant ALL on *.* to test_noprivs@localhost; +revoke SELECT on *.* from test_noprivs@localhost; +show grants for test_noprivs@localhost; +Grants for test_noprivs@localhost +GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576' +revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost; +grant TRIGGER, SELECT on *.* to test_yesprivs@localhost; +show grants for test_yesprivs@localhost; +Grants for test_yesprivs@localhost +GRANT SELECT, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576' +connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK); +connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK); +select current_user; +current_user +test_noprivs@localhost +use priv_db; +show grants; +Grants for test_noprivs@localhost +GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576' +create trigger trg5a_1 before INSERT on t1 for each row +set @test_var = new.f1; +set @test_var = 'before trig 3.5.3.8-1a'; +select @test_var; +@test_var +before trig 3.5.3.8-1a +insert into t1 (f1) values ('insert 3.5.3.8-1a'); +ERROR 42000: SELECT command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1' +select @test_var; +@test_var +before trig 3.5.3.8-1a +drop trigger trg5a_1; +use priv_db; +select current_user; +current_user +test_yesprivs@localhost +show grants; +Grants for test_yesprivs@localhost +GRANT SELECT, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576' +create trigger trg5a_2 before INSERT on t1 for each row +set @test_var= new.f1; +set @test_var= 'before trig 3.5.3.8-2a'; +select @test_var; +@test_var +before trig 3.5.3.8-2a +insert into t1 (f1) values ('insert 3.5.3.8-2a'); +select @test_var; +@test_var +insert 3.5.3.8-2a +drop trigger trg5a_2; + +Testcase: 3.5.3.8b +------------------ +revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost; +grant TRIGGER on *.* to test_noprivs@localhost; +grant ALL on priv_db.* to test_noprivs@localhost; +revoke SELECT on priv_db.* from test_noprivs@localhost; +show grants for test_noprivs@localhost; +Grants for test_noprivs@localhost +GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576' +GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost' +revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost; +grant TRIGGER on *.* to test_yesprivs@localhost; +grant SELECT on priv_db.* to test_yesprivs@localhost; +show grants for test_yesprivs@localhost; +Grants for test_yesprivs@localhost +GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576' +GRANT SELECT ON `priv_db`.* TO 'test_yesprivs'@'localhost' +connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK); +connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK); +show grants; +Grants for test_noprivs@localhost +GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576' +GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost' +use priv_db; +create trigger trg5b_1 before UPDATE on t1 for each row +set @test_var= new.f1; +set @test_var= 'before trig 3.5.3.8-1b'; +insert into t1 (f1) values ('insert 3.5.3.8-1b'); +select @test_var; +@test_var +before trig 3.5.3.8-1b +update t1 set f1= 'update 3.5.3.8-1b' where f1 = 'insert 3.5.3.8-1b'; +ERROR 42000: SELECT command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1' +select @test_var; +@test_var +before trig 3.5.3.8-1b +drop trigger trg5b_1; +show grants; +Grants for test_yesprivs@localhost +GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576' +GRANT SELECT ON `priv_db`.* TO 'test_yesprivs'@'localhost' +use priv_db; +create trigger trg5b_2 before UPDATE on t1 for each row +set @test_var= new.f1; +set @test_var= 'before trig 3.5.3.8-2b'; +insert into t1 (f1) values ('insert 3.5.3.8-2b'); +select @test_var; +@test_var +before trig 3.5.3.8-2b +update t1 set f1= 'update 3.5.3.8-2b' where f1 = 'insert 3.5.3.8-2b'; +select @test_var; +@test_var +update 3.5.3.8-2b +drop trigger trg5b_2; + +Testcase 3.5.3.8c: +------------------ +revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost; +grant TRIGGER on *.* to test_noprivs@localhost; +grant ALL on priv_db.t1 to test_noprivs@localhost; +revoke SELECT on priv_db.t1 from test_noprivs@localhost; +show grants for test_noprivs@localhost; +Grants for test_noprivs@localhost +GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576' +GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost' +revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost; +grant TRIGGER on *.* to test_yesprivs@localhost; +grant SELECT on priv_db.t1 to test_yesprivs@localhost; +show grants for test_yesprivs@localhost; +Grants for test_yesprivs@localhost +GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576' +GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost' +connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK); +connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK); +show grants; +Grants for test_noprivs@localhost +GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576' +GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost' +use priv_db; +create trigger trg5c_1 before INSERT on t1 for each row +set @test_var= new.f1; +set @test_var= 'before trig 3.5.3.8-1c'; +insert into t1 (f1) values ('insert 3.5.3.8-1c'); +ERROR 42000: SELECT command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1' +select @test_var; +@test_var +before trig 3.5.3.8-1c +drop trigger trg5c_1; +show grants; +Grants for test_yesprivs@localhost +GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576' +GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost' +use priv_db; +create trigger trg5c_2 before INSERT on t1 for each row +set @test_var= new.f1; +set @test_var='before trig 3.5.3.8-2c'; +insert into t1 (f1) values ('insert 3.5.3.8-2c'); +select @test_var; +@test_var +insert 3.5.3.8-2c +drop trigger trg5c_2; + +Testcase: 3.5.3.8d: +------------------- +revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost; +grant TRIGGER on *.* to test_noprivs@localhost; +grant UPDATE (f1), INSERT (f1) on priv_db.t1 to test_noprivs@localhost; +show grants for test_noprivs@localhost; +Grants for test_noprivs@localhost +GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576' +GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost' +revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost; +grant TRIGGER on *.* to test_yesprivs@localhost; +grant SELECT (f1) on priv_db.t1 to test_yesprivs@localhost; +show grants for test_noprivs@localhost; +Grants for test_noprivs@localhost +GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576' +GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost' +connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK); +connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK); +show grants; +Grants for test_noprivs@localhost +GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576' +GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost' +use priv_db; +create trigger trg5d_1 before INSERT on t1 for each row +set @test_var= new.f1; +set @test_var='before trig 3.5.3.8-1d'; +insert into t1 (f1) values ('insert 3.5.3.8-1d'); +ERROR 42000: SELECT command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1' +select @test_var; +@test_var +before trig 3.5.3.8-1d +drop trigger trg5d_1; +show grants; +Grants for test_yesprivs@localhost +GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576' +GRANT SELECT (f1) ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost' +use priv_db; +create trigger trg5d_2 before INSERT on t1 for each row +set @test_var= new.f1; +set @test_var='before trig 3.5.3.8-2d'; +insert into t1 (f1) values ('insert 3.5.3.8-2d'); +select @test_var; +@test_var +insert 3.5.3.8-2d +drop trigger trg5d_2; + +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; +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; +grant SELECT on priv_db.t2 to test_yesprivs@localhost; +show grants for test_yesprivs@localhost; +Grants for test_yesprivs@localhost +GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576' +GRANT SELECT ON `priv_db`.`t2` TO 'test_yesprivs'@'localhost' +GRANT SELECT, UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost' +connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK); +select current_user; +current_user +test_yesprivs@localhost +use priv_db; +create trigger trg1 before insert on t1 for each row +insert into t2 values (new.f1); +use priv_db; +insert into t1 (f1) values (4); +ERROR 42000: INSERT command denied to user 'test_yesprivs'@'localhost' for table 't2' +revoke SELECT on priv_db.t2 from test_yesprivs@localhost; +grant INSERT on priv_db.t2 to test_yesprivs@localhost; +insert into t1 (f1) values (4); +select f1 from t1 order by f1; +f1 +4 +select f2 from t2 order by f2; +f2 +4 +use priv_db; +drop trigger trg1; +create trigger trg2 before insert on t1 for each row +update t2 set f2=new.f1-1; +use priv_db; +insert into t1 (f1) values (2); +ERROR 42000: UPDATE command denied to user 'test_yesprivs'@'localhost' for table 't2' +revoke INSERT on priv_db.t2 from test_yesprivs@localhost; +grant UPDATE on priv_db.t2 to test_yesprivs@localhost; +insert into t1 (f1) values (2); +select f1 from t1 order by f1; +f1 +2 +4 +select f2 from t2 order by f2; +f2 +1 +use priv_db; +drop trigger trg2; +create trigger trg3 before insert on t1 for each row +select f2 into @aaa from t2 where f2=new.f1; +use priv_db; +insert into t1 (f1) values (1); +ERROR 42000: SELECT command denied to user 'test_yesprivs'@'localhost' for table 't2' +revoke UPDATE on priv_db.t2 from test_yesprivs@localhost; +grant SELECT on priv_db.t2 to test_yesprivs@localhost; +insert into t1 (f1) values (1); +select f1 from t1 order by f1; +f1 +1 +2 +4 +select f2 from t2 order by f2; +f2 +1 +select @aaa; +@aaa +1 +use priv_db; +drop trigger trg3; +create trigger trg4 before insert on t1 for each row +delete from t2; +use priv_db; +insert into t1 (f1) values (1); +ERROR 42000: DELETE command denied to user 'test_yesprivs'@'localhost' for table 't2' +revoke SELECT on priv_db.t2 from test_yesprivs@localhost; +grant DELETE on priv_db.t2 to test_yesprivs@localhost; +insert into t1 (f1) values (1); +select f1 from t1 order by f1; +f1 +1 +1 +2 +4 +select f2 from t2 order by f2; +f2 +drop database if exists priv_db; +drop user test_yesprivs@localhost; +drop user test_noprivs@localhost; +drop user test_noprivs; +DROP TABLE test.tb3; diff --git a/mysql-test/suite/funcs_1/r/ndb_trig_0407.result b/mysql-test/suite/funcs_1/r/ndb_trig_0407.result index 9c278ee09b2..a4871065c04 100644 --- a/mysql-test/suite/funcs_1/r/ndb_trig_0407.result +++ b/mysql-test/suite/funcs_1/r/ndb_trig_0407.result @@ -1,17 +1,11 @@ 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'; diff --git a/mysql-test/suite/funcs_1/r/ndb_trig_0407.result.moved b/mysql-test/suite/funcs_1/r/ndb_trig_0407.result.moved new file mode 100644 index 00000000000..9c278ee09b2 --- /dev/null +++ b/mysql-test/suite/funcs_1/r/ndb_trig_0407.result.moved @@ -0,0 +1,482 @@ +USE test; +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, +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 = ndb; +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: +-------------- +create User test_general@localhost; +set password for test_general@localhost = password('PWD'); +revoke ALL PRIVILEGES, GRANT OPTION FROM test_general@localhost; +create User test_super@localhost; +set password for test_super@localhost = password('PWD'); +grant ALL on *.* to test_super@localhost with grant OPTION; +connect(localhost,test_general,PWD,test,MASTER_MYPORT,MASTER_MYSOCK); +connect(localhost,test_super,PWD,test,MASTER_MYPORT,MASTER_MYSOCK); + +Testcase 3.5.4: +--------------- +use test; + +Testcase 3.5.4.1: +----------------- +create database db_drop; +Use db_drop; +create table t1 (f1 char(30)) engine=ndb; +grant INSERT, SELECT on db_drop.t1 to test_general; +Use db_drop; +Create trigger trg1 BEFORE INSERT on t1 +for each row set new.f1='Trigger 3.5.4.1'; +Use db_drop; +Insert into t1 values ('Insert error 3.5.4.1'); +Select * from t1 order by f1; +f1 +Trigger 3.5.4.1 +drop trigger trg1; +select trigger_schema, trigger_name, event_object_table +from information_schema.triggers order by trigger_name; +trigger_schema trigger_name event_object_table +Insert into t1 values ('Insert no trigger 3.5.4.1'); +Select * from t1 order by f1; +f1 +Insert no trigger 3.5.4.1 +Trigger 3.5.4.1 +drop trigger trg1; +drop database if exists db_drop; +revoke ALL PRIVILEGES, GRANT OPTION FROM 'test_general'@'localhost'; + +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; +Drop trigger tr_does_not_exit; +ERROR HY000: Trigger does not exist +drop table if exists t1_432 ; +drop database if exists db_drop2; + +Testcase 3.5.4.3: +----------------- +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 TRIGGER trg3 BEFORE INSERT on t1_433 for each row +set new.f1 = 'Trigger 3.5.4.3'; +Drop trigger t1.433.trg3; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.trg3' at line 1 +Drop trigger db_drop3.t1.433.trg3; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.433.trg3' at line 1 +Drop trigger mysql.trg3; +ERROR HY000: Trigger does not exist +Drop trigger tbx.trg3; +ERROR HY000: Trigger does not exist +Drop trigger db_drop3.trg3; +drop table if exists t1_433; +drop table if exists t1_433a; +drop database if exists db_drop3; + +Testcase 3.5.4.4: +----------------- +create database db_drop4; +Use db_drop4; +create table t1 (f1 char(30)) engine=ndb; +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'; +Use db_drop4; +Insert into t1 values ('Insert 3.5.4.4'); +Select * from t1; +f1 +Trigger 3.5.4.4 +Drop database db_drop4; +Show databases; +Database +information_schema +mysql +test +select trigger_schema, trigger_name, event_object_table +from information_schema.triggers +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; +grant INSERT, SELECT on db_drop4.t1 to test_general; +Insert into t1 values ('2nd Insert 3.5.4.4'); +Select * from t1; +f1 +2nd Insert 3.5.4.4 +drop trigger trg4; +ERROR HY000: Trigger does not exist +drop database if exists db_drop4; +revoke ALL PRIVILEGES, GRANT OPTION FROM 'test_general'@'localhost'; + +Testcase 3.5.4.5: +----------------- +create database db_drop5; +Use db_drop5; +create table t1 (f1 char(50)) engine=ndb; +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'; +Use db_drop5; +Insert into t1 values ('Insert 3.5.4.5'); +Select * from t1; +f1 +Trigger 3.5.4.5 +Drop table t1; +Show tables; +Tables_in_db_drop5 +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; +grant INSERT, SELECT on t1 to test_general; +Insert into t1 values ('2nd Insert 3.5.4.5'); +Select * from t1; +f1 +2nd Insert 3.5.4.5 +drop trigger trg5; +ERROR HY000: Trigger does not exist +drop database if exists db_drop5; +revoke ALL PRIVILEGES, GRANT OPTION FROM 'test_general'@'localhost'; + +Testcase 3.5.5: +--------------- +use test; + +Testcase 3.5.5.1: +----------------- +Create trigger trg1 before INSERT on t100 for each row set new.f2=1000; +ERROR 42S02: Table 'test.t100' doesn't exist + +Testcase 3.5.5.2: +----------------- +Create temporary table t1_temp (f1 bigint signed, f2 bigint unsigned); +Create trigger trg2 before INSERT +on t1_temp for each row set new.f2=9999; +ERROR HY000: Trigger's 't1_temp' is view or temporary table +drop table t1_temp; + +Testcase 3.5.5.3: +----------------- +Create view vw3 as select f118 from tb3; +Create trigger trg3 before INSERT +on vw3 for each row set new.f118='s'; +ERROR HY000: 'test.vw3' is not BASE TABLE +drop view vw3; + +Testcase 3.5.5.4: +----------------- +create database dbtest_one; +create database dbtest_two; +use dbtest_two; +create table t2 (f1 char(15)) engine=ndb; +use dbtest_one; +create trigger trg4 before INSERT +on dbtest_two.t2 for each row set new.f1='trig 3.5.5.4'; +ERROR HY000: Trigger in wrong schema +grant INSERT, SELECT on dbtest_two.t2 to test_general; +grant SELECT on dbtest_one.* to test_general; +use dbtest_two; +Insert into t2 values ('1st Insert 3.5.5.4'); +Warnings: +Warning 1265 Data truncated for column 'f1' at row 1 +Select * from t2; +f1 +1st Insert 3.5. +use dbtest_one; +Insert into dbtest_two.t2 values ('2nd Insert 3.5.5.4'); +Warnings: +Warning 1265 Data truncated for column 'f1' at row 1 +Select * from dbtest_two.t2 order by f1; +f1 +1st Insert 3.5. +2nd Insert 3.5. +revoke ALL PRIVILEGES, GRANT OPTION FROM 'test_general'@'localhost'; +DROP DATABASE if exists dbtest_one; +drop database if EXISTS dbtest_two; + +Testcase 3.5.6: +--------------- +use test; + +Testcase 3.5.6.1 (see Testcase 3.5.1.1) +--------------------------------------- + +Testcase 3.5.6.2 (see Testcase 3.5.1.1) +--------------------------------------- + +Testcase 3.5.6.3: +----------------- +Create trigger trg3_1 DURING UPDATE on tb3 for each row set new.f132=25; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DURING UPDATE on tb3 for each row set new.f132=25' at line 1 +Create trigger trg3_2 TIME INSERT on tb3 for each row set new.f132=15; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'TIME INSERT on tb3 for each row set new.f132=15' at line 1 +drop trigger tb3.trg3_1; +drop trigger tb3.trg3_2; + +Testcase 3.5.6.4 (see Testcase 3.5.1.1) +--------------------------------------- + +Testcase 3.5.6.5 (see Testcase 3.5.1.1) +--------------------------------------- + +Testcase 3.5.7.1 (see Testcase 3.5.1.1) +--------------------------------------- + +Testcase 3.5.7.2 (see Testcase 3.5.1.1) +--------------------------------------- + +Testcase 3.5.7.3 (see Testcase 3.5.1.1) +--------------------------------------- + +Testcase 3.5.7.4: +----------------- +Create trigger trg4_1 BEFORE SELECT on tb3 for each row set new.f132=5; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT on tb3 for each row set new.f132=5' at line 1 +Create trigger trg4_2 AFTER VALUE on tb3 for each row set new.f132=1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VALUE on tb3 for each row set new.f132=1' at line 1 +drop trigger tb3.trg4_1; +drop trigger tb3.trg4_2; + +Testcase 3.5.7.5 / 3.5.7.6: +--------------------------- +Create trigger trg5_1 BEFORE INSERT +on tb3 for each row set new.f122='Trigger1 3.5.7.5/6'; +Create trigger trg5_2 BEFORE INSERT +on tb3 for each row set new.f122='Trigger2 3.5.7.5'; +ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table' +Insert into tb3 (f121,f122) values ('Test 3.5.7.5/6','Insert 3.5.7.5'); +Select f121,f122 from tb3 where f121='Test 3.5.7.5/6'; +f121 f122 +Test 3.5.7.5/6 Trigger1 3.5.7.5/6 +update tb3 set f122='Update 3.5.7.6' where f121= 'Test 3.5.7.5/6'; +Select f121,f122 from tb3 where f121='Test 3.5.7.5/6'; +f121 f122 +Test 3.5.7.5/6 Update 3.5.7.6 +drop trigger trg5_1; +drop trigger trg5_2; +delete from tb3 where f121='Test 3.5.7.5/6'; + +Testcase 3.5.7.7 / 3.5.7.8: +--------------------------- +set @test_var='Before trig 3.5.7.7'; +Create trigger trg6_1 AFTER INSERT +on tb3 for each row set @test_var='Trigger1 3.5.7.7/8'; +Create trigger trg6_2 AFTER INSERT +on tb3 for each row set @test_var='Trigger2 3.5.7.7'; +ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table' +select @test_var; +@test_var +Before trig 3.5.7.7 +Insert into tb3 (f121,f122) values ('Test 3.5.7.7/8','Insert 3.5.7.7'); +Select f121,f122 from tb3 where f121='Test 3.5.7.7/8'; +f121 f122 +Test 3.5.7.7/8 Insert 3.5.7.7 +select @test_var; +@test_var +Trigger1 3.5.7.7/8 +update tb3 set f122='Update 3.5.7.8' where f121= 'Test 3.5.7.7/8'; +Select f121,f122 from tb3 where f121='Test 3.5.7.7/8'; +f121 f122 +Test 3.5.7.7/8 Update 3.5.7.8 +select @test_var; +@test_var +Trigger1 3.5.7.7/8 +drop trigger trg6_1; +drop trigger trg6_2; +delete from tb3 where f121='Test 3.5.7.7/8'; + +Testcase 3.5.7.9/10: +-------------------- +Create trigger trg7_1 BEFORE UPDATE +on tb3 for each row set new.f122='Trigger1 3.5.7.9/10'; +Create trigger trg7_2 BEFORE UPDATE +on tb3 for each row set new.f122='Trigger2 3.5.7.9'; +ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table' +Insert into tb3 (f121,f122) values ('Test 3.5.7.9/10','Insert 3.5.7.9'); +Select f121,f122 from tb3 where f121='Test 3.5.7.9/10'; +f121 f122 +Test 3.5.7.9/10 Insert 3.5.7.9 +update tb3 set f122='update 3.5.7.10' where f121='Test 3.5.7.9/10'; +Select f121,f122 from tb3 where f121='Test 3.5.7.9/10'; +f121 f122 +Test 3.5.7.9/10 Trigger1 3.5.7.9/10 +drop trigger trg7_1; +drop trigger trg7_2; +delete from tb3 where f121='Test 3.5.7.9/10'; + +Testcase 3.5.7.11/12: +--------------------- +set @test_var='Before trig 3.5.7.11'; +Create trigger trg8_1 AFTER UPDATE +on tb3 for each row set @test_var='Trigger 3.5.7.11/12'; +Create trigger trg8_2 AFTER UPDATE +on tb3 for each row set @test_var='Trigger2 3.5.7.11'; +ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table' +select @test_var; +@test_var +Before trig 3.5.7.11 +Insert into tb3 (f121,f122) values ('Test 3.5.7.11/12','Insert 3.5.7.11/12'); +select @test_var; +@test_var +Before trig 3.5.7.11 +Select f121,f122 from tb3 where f121='Test 3.5.7.11/12'; +f121 f122 +Test 3.5.7.11/12 Insert 3.5.7.11/12 +update tb3 set f122='update 3.5.7.12' where f121='Test 3.5.7.11/12'; +Select f121,f122 from tb3 where f121='Test 3.5.7.11/12'; +f121 f122 +Test 3.5.7.11/12 update 3.5.7.12 +select @test_var; +@test_var +Trigger 3.5.7.11/12 +delete from tb3 where f121='Test 3.5.7.11/12'; +drop trigger trg8_1; +drop trigger trg8_2; +delete from tb3 where f121='Test 3.5.7.11/12'; + +Testcase 3.5.7.13/14: +--------------------- +set @test_var=1; +Create trigger trg9_1 BEFORE DELETE +on tb3 for each row set @test_var=@test_var+1; +Create trigger trg9_2 BEFORE DELETE +on tb3 for each row set @test_var=@test_var+10; +ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table' +select @test_var; +@test_var +1 +Insert into tb3 (f121,f122) values ('Test 3.5.7.13/14','Insert 3.5.7.13'); +Select f121,f122 from tb3 where f121='Test 3.5.7.13/14'; +f121 f122 +Test 3.5.7.13/14 Insert 3.5.7.13 +select @test_var; +@test_var +1 +delete from tb3 where f121='Test 3.5.7.13/14'; +Select f121,f122 from tb3 where f121='Test 3.5.7.13/14'; +f121 f122 +select @test_var; +@test_var +2 +delete from tb3 where f121='Test 3.5.7.13/14'; +select @test_var; +@test_var +2 +drop trigger trg9_1; +drop trigger trg9_2; +delete from tb3 where f121='Test 3.5.7.13/14'; + +Testcase 3.5.7.15/16: +--------------------- +set @test_var=1; +Create trigger trg_3_406010_1 AFTER DELETE +on tb3 for each row set @test_var=@test_var+5; +Create trigger trg_3_406010_2 AFTER DELETE +on tb3 for each row set @test_var=@test_var+50; +ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table' +Create trigger trg_3_406010_1 AFTER INSERT +on tb3 for each row set @test_var=@test_var+1; +ERROR HY000: Trigger already exists +select @test_var; +@test_var +1 +Insert into tb3 (f121,f122) values ('Test 3.5.7.15/16','Insert 3.5.7.15/16'); +Select f121,f122 from tb3 where f121='Test 3.5.7.15/16'; +f121 f122 +Test 3.5.7.15/16 Insert 3.5.7.15/16 +select @test_var; +@test_var +1 +delete from tb3 where f121='Test 3.5.7.15/16'; +Select f121,f122 from tb3 where f121='Test 3.5.7.15/16'; +f121 f122 +select @test_var; +@test_var +6 +delete from tb3 where f121='Test 3.5.7.15/16'; +select @test_var; +@test_var +6 +drop trigger trg_3_406010_1; +drop trigger trg_3_406010_2; +delete from tb3 where f121='Test 3.5.7.15/16'; + +Testcase 3.5.7.17 (see Testcase 3.5.1.1) +---------------------------------------- +drop user test_general@localhost; +drop user test_general; +drop user test_super@localhost; +DROP TABLE test.tb3; diff --git a/mysql-test/suite/funcs_1/r/ndb_trig_08.result b/mysql-test/suite/funcs_1/r/ndb_trig_08.result index 52a0407a940..6ced07cef73 100644 --- a/mysql-test/suite/funcs_1/r/ndb_trig_08.result +++ b/mysql-test/suite/funcs_1/r/ndb_trig_08.result @@ -1,17 +1,11 @@ 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); diff --git a/mysql-test/suite/funcs_1/r/ndb_trig_08.result.moved b/mysql-test/suite/funcs_1/r/ndb_trig_08.result.moved new file mode 100644 index 00000000000..52a0407a940 --- /dev/null +++ b/mysql-test/suite/funcs_1/r/ndb_trig_08.result.moved @@ -0,0 +1,538 @@ +USE test; +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, +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 = ndb; +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: +-------------- +create User test_general@localhost; +set password for test_general@localhost = password('PWD'); +revoke ALL PRIVILEGES, GRANT OPTION FROM test_general@localhost; +create User test_super@localhost; +set password for test_super@localhost = password('PWD'); +grant ALL on *.* to test_super@localhost with grant OPTION; +connect(localhost,test_general,PWD,test,MASTER_MYPORT,MASTER_MYSOCK); +connect(localhost,test_super,PWD,test,MASTER_MYPORT,MASTER_MYSOCK); + +Testcase 3.5.8.1: (implied in previous tests) +--------------------------------------------- + +Testcase 3.5.8.2: (implied in previous tests) +--------------------------------------------- + +Testcase 3.5.8.3/4: +------------------- +create database db_test; +grant SELECT, INSERT, UPDATE, DELETE on db_test.* to test_general; +grant LOCK TABLES on db_test.* to test_general; +Use db_test; +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; +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; +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; +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); +Insert into t1_u values ('d',222,99999,999.99); +Insert into t1_u values ('e',222,99999,999.99); +Insert into t1_u values ('f',333,99999,999.99); +Insert into t1_d values ('a',111,99999,999.99); +Insert into t1_d values ('b',222,99999,999.99); +Insert into t1_d values ('c',333,99999,999.99); +Insert into t1_d values ('d',444,99999,999.99); +Insert into t1_d values ('e',222,99999,999.99); +Insert into t1_d values ('f',222,99999,999.99); + +3.5.8.4 - multiple SQL +---------------------- +use test; +Create trigger trg1 AFTER INSERT on tb3 for each row +BEGIN +insert into db_test.t1_i +values (new.f120, new.f136, new.f144, new.f163); +update db_test.t1_u +set u144=new.f144, u163=new.f163 +where u136=new.f136; +delete from db_test.t1_d where d136= new.f136; +select sum(db_test.t1_u.u163) into @test_var from db_test.t1_u +where u136= new.f136; +END// +Use test; +set @test_var=0; +Insert into tb3 (f120, f122, f136, f144, f163) +values ('1', 'Test 3.5.8.4', 222, 23456, 1.05); +Select f120, f122, f136, f144, f163 from tb3 where f122= 'Test 3.5.8.4'; +f120 f122 f136 f144 f163 +1 Test 3.5.8.4 00222 0000023456 1.050000000000000000000000000000 +select * from db_test.t1_i; +i120 i136 i144 i163 +1 00222 0000023456 1.050000000000000000000000000000 +select * from db_test.t1_u; +u120 u136 u144 u163 +a 00111 0000099999 999.990000000000000000000000000000 +b 00222 0000023456 1.050000000000000000000000000000 +c 00333 0000099999 999.990000000000000000000000000000 +d 00222 0000023456 1.050000000000000000000000000000 +e 00222 0000023456 1.050000000000000000000000000000 +f 00333 0000099999 999.990000000000000000000000000000 +select * from db_test.t1_d; +d120 d136 d144 d163 +a 00111 0000099999 999.990000000000000000000000000000 +c 00333 0000099999 999.990000000000000000000000000000 +d 00444 0000099999 999.990000000000000000000000000000 +select @test_var; +@test_var +3.150000000000000000000000000000 + +3.5.8.4 - single SQL - insert +----------------------------- +Create trigger trg2 BEFORE UPDATE on tb3 for each row +BEGIN +insert into db_test.t1_i +values (new.f120, new.f136, new.f144, new.f163); +END// +Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%'; +f120 f122 f136 f144 f163 +1 Test 3.5.8.4 00222 0000023456 1.050000000000000000000000000000 +select * from db_test.t1_i order by i120; +i120 i136 i144 i163 +1 00222 0000023456 1.050000000000000000000000000000 +update tb3 set f120='I', f122='Test 3.5.8.4-Single Insert' + where f122='Test 3.5.8.4'; +Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%'; +f120 f122 f136 f144 f163 +I Test 3.5.8.4-Single Insert 00222 0000023456 1.050000000000000000000000000000 +select * from db_test.t1_i order by i120; +i120 i136 i144 i163 +1 00222 0000023456 1.050000000000000000000000000000 +I 00222 0000023456 1.050000000000000000000000000000 + +3.5.8.4 - single SQL - update +----------------------------- +drop trigger trg2; +Create trigger trg3 BEFORE UPDATE on tb3 for each row +update db_test.t1_u +set u120=new.f120 +where u136=new.f136; +update tb3 set f120='U', f122='Test 3.5.8.4-Single Update' + where f122='Test 3.5.8.4-Single Insert'; +Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%'; +f120 f122 f136 f144 f163 +U Test 3.5.8.4-Single Update 00222 0000023456 1.050000000000000000000000000000 +select * from db_test.t1_u order by u120; +u120 u136 u144 u163 +a 00111 0000099999 999.990000000000000000000000000000 +c 00333 0000099999 999.990000000000000000000000000000 +f 00333 0000099999 999.990000000000000000000000000000 +U 00222 0000023456 1.050000000000000000000000000000 +U 00222 0000023456 1.050000000000000000000000000000 +U 00222 0000023456 1.050000000000000000000000000000 + +3.5.8.3/4 - single SQL - delete +------------------------------- +drop trigger trg3; +Create trigger trg4 AFTER UPDATE on tb3 for each row +delete from db_test.t1_d where d136= new.f136; +update tb3 set f120='D', f136=444, +f122='Test 3.5.8.4-Single Delete' + where f122='Test 3.5.8.4-Single Update'; +Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%'; +f120 f122 f136 f144 f163 +D Test 3.5.8.4-Single Delete 00444 0000023456 1.050000000000000000000000000000 +select * from db_test.t1_d order by d120; +d120 d136 d144 d163 +a 00111 0000099999 999.990000000000000000000000000000 +c 00333 0000099999 999.990000000000000000000000000000 + +3.5.8.3/4 - single SQL - select +------------------------------- +drop trigger trg4; +Create trigger trg5 AFTER UPDATE on tb3 for each row +select sum(db_test.t1_u.u163) into @test_var from db_test.t1_u +where u136= new.f136; +set @test_var=0; +update tb3 set f120='S', f136=111, +f122='Test 3.5.8.4-Single Select' + where f122='Test 3.5.8.4-Single Delete'; +Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%'; +f120 f122 f136 f144 f163 +S Test 3.5.8.4-Single Select 00111 0000023456 1.050000000000000000000000000000 +select @test_var; +@test_var +999.990000000000000000000000000000 +drop trigger trg1; +drop trigger trg5; +drop database if exists db_test; +delete from tb3 where f122 like 'Test 3.5.8.4%'; +revoke ALL PRIVILEGES, GRANT OPTION FROM 'test_general'@'localhost'; + +Testcase 3.5.8.5 (IF): +---------------------- +create trigger trg2 before insert on tb3 for each row +BEGIN +IF new.f120='1' then +set @test_var='one', new.f120='2'; +ELSEIF new.f120='2' then +set @test_var='two', new.f120='3'; +ELSEIF new.f120='3' then +set @test_var='three', new.f120='4'; +END IF; +IF (new.f120='4') and (new.f136=10) then +set @test_var2='2nd if', new.f120='d'; +ELSE +set @test_var2='2nd else', new.f120='D'; +END IF; +END// +set @test_var='Empty', @test_var2=0; +Insert into tb3 (f120, f122, f136) values ('1', 'Test 3.5.8.5-if', 101); +select f120, f122, f136, @test_var, @test_var2 +from tb3 where f122 = 'Test 3.5.8.5-if' order by f136; +f120 f122 f136 @test_var @test_var2 +D Test 3.5.8.5-if 00101 one 2nd else +Insert into tb3 (f120, f122, f136) values ('2', 'Test 3.5.8.5-if', 102); +select f120, f122, f136, @test_var, @test_var2 +from tb3 where f122 = 'Test 3.5.8.5-if' order by f136; +f120 f122 f136 @test_var @test_var2 +D Test 3.5.8.5-if 00101 two 2nd else +D Test 3.5.8.5-if 00102 two 2nd else +Insert into tb3 (f120, f122, f136) values ('3', 'Test 3.5.8.5-if', 10); +select f120, f122, f136, @test_var, @test_var2 +from tb3 where f122 = 'Test 3.5.8.5-if' order by f136; +f120 f122 f136 @test_var @test_var2 +d Test 3.5.8.5-if 00010 three 2nd if +D Test 3.5.8.5-if 00101 three 2nd if +D Test 3.5.8.5-if 00102 three 2nd if +Insert into tb3 (f120, f122, f136) values ('3', 'Test 3.5.8.5-if', 103); +select f120, f122, f136, @test_var, @test_var2 +from tb3 where f122 = 'Test 3.5.8.5-if' order by f136; +f120 f122 f136 @test_var @test_var2 +d Test 3.5.8.5-if 00010 three 2nd else +D Test 3.5.8.5-if 00101 three 2nd else +D Test 3.5.8.5-if 00102 three 2nd else +D Test 3.5.8.5-if 00103 three 2nd else +create trigger trg3 before update on tb3 for each row +BEGIN +ELSEIF new.f120='2' then +END IF; +END// +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ELSEIF new.f120='2' then +END IF; +END' at line 3 +drop trigger trg3// +create trigger trg4 before update on tb3 for each row +BEGIN +IF (new.f120='4') and (new.f136=10) then +set @test_var2='2nd if', new.f120='d'; +ELSE +set @test_var2='2nd else', new.f120='D'; +END// +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 7 +drop trigger trg4; +drop trigger trg2; +delete from tb3 where f121='Test 3.5.8.5-if'; + +Testcase 3.5.8.5-case: +---------------------- +create trigger trg3 before insert on tb3 for each row +BEGIN +SET new.f120=char(ascii(new.f120)-32); +CASE +when new.f136<100 then set new.f136=new.f136+120; +when new.f136<10 then set new.f144=777; +when new.f136>100 then set new.f120=new.f136-1; +END case; +CASE +when new.f136=200 then set @test_var=CONCAT(new.f120, '='); +ELSE set @test_var=concat(new.f120, '*'); +END case; +CASE new.f144 +when 1 then set @test_var=concat(@test_var, 'one'); +when 2 then set @test_var=concat(@test_var, 'two'); +when 3 then set @test_var=concat(@test_var, 'three'); +when 4 then set @test_var=concat(@test_var, 'four'); +when 5 then set @test_var=concat(@test_var, 'five'); +when 6 then set @test_var=concat(@test_var, 'six'); +when 7 then set @test_var=concat(@test_var, 'seven'); +when 8 then set @test_var=concat(@test_var, 'eight'); +when 9 then set @test_var=concat(@test_var, 'nine'); +when 10 then set @test_var=concat(@test_var, 'ten'); +when 11 then set @test_var=concat(@test_var, 'eleven'); +when 12 then set @test_var=concat(@test_var, 'twelve'); +when 13 then set @test_var=concat(@test_var, 'thirteen'); +when 14 then set @test_var=concat(@test_var, 'fourteen'); +when 15 then set @test_var=concat(@test_var, 'fifteen'); +ELSE set @test_var=CONCAT(new.f120, '*', new.f144); +END case; +END// +set @test_var='Empty'; +Insert into tb3 (f120, f122, f136, f144) +values ('a', 'Test 3.5.8.5-case', 5, 7); +select f120, f122, f136, f144, @test_var +from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136; +f120 f122 f136 f144 @test_var +A Test 3.5.8.5-case 00125 0000000007 A*seven +Insert into tb3 (f120, f122, f136, f144) +values ('b', 'Test 3.5.8.5-case', 71,16); +select f120, f122, f136, f144, @test_var +from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136; +f120 f122 f136 f144 @test_var +A Test 3.5.8.5-case 00125 0000000007 B*0000000016 +B Test 3.5.8.5-case 00191 0000000016 B*0000000016 +Insert into tb3 (f120, f122, f136, f144) +values ('c', 'Test 3.5.8.5-case', 80,1); +select f120, f122, f136, f144, @test_var +from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136; +f120 f122 f136 f144 @test_var +A Test 3.5.8.5-case 00125 0000000007 C=one +B Test 3.5.8.5-case 00191 0000000016 C=one +C Test 3.5.8.5-case 00200 0000000001 C=one +Insert into tb3 (f120, f122, f136) +values ('d', 'Test 3.5.8.5-case', 152); +Warnings: +Warning 1265 Data truncated for column 'f120' at row 1 +select f120, f122, f136, f144, @test_var +from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136; +f120 f122 f136 f144 @test_var +1 Test 3.5.8.5-case 00152 0000099999 1*0000099999 +A Test 3.5.8.5-case 00125 0000000007 1*0000099999 +B Test 3.5.8.5-case 00191 0000000016 1*0000099999 +C Test 3.5.8.5-case 00200 0000000001 1*0000099999 +Insert into tb3 (f120, f122, f136, f144) +values ('e', 'Test 3.5.8.5-case', 200, 8); +Warnings: +Warning 1265 Data truncated for column 'f120' at row 1 +select f120, f122, f136, f144, @test_var +from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136; +f120 f122 f136 f144 @test_var +1 Test 3.5.8.5-case 00152 0000099999 1=eight +1 Test 3.5.8.5-case 00200 0000000008 1=eight +A Test 3.5.8.5-case 00125 0000000007 1=eight +B Test 3.5.8.5-case 00191 0000000016 1=eight +C Test 3.5.8.5-case 00200 0000000001 1=eight +Insert into tb3 (f120, f122, f136, f144) +values ('f', 'Test 3.5.8.5-case', 100, 8); +select f120, f122, f136, f144, @test_var +from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136; +f120 f122 f136 f144 @test_var +1 Test 3.5.8.5-case 00152 0000099999 1=eight +1 Test 3.5.8.5-case 00200 0000000008 1=eight +A Test 3.5.8.5-case 00125 0000000007 1=eight +B Test 3.5.8.5-case 00191 0000000016 1=eight +C Test 3.5.8.5-case 00200 0000000001 1=eight +create trigger trg3a before update on tb3 for each row +BEGIN +CASE +when new.f136<100 then set new.f120='p'; +END// +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 5 +drop trigger trg3a; +drop trigger trg3; +delete from tb3 where f121='Test 3.5.8.5-case'; + +Testcase 3.5.8.5-loop/leave: +---------------------------- +Create trigger trg4 after insert on tb3 for each row +BEGIN +set @counter=0, @flag='Initial'; +Label1: loop +if new.f136<new.f144 then +set @counter='Nothing to loop'; +leave Label1; +else +set @counter=@counter+1; +if new.f136=new.f144+@counter then +set @counter=concat(@counter, ' loops'); +leave Label1; +end if; +end if; +iterate label1; +set @flag='Final'; +END loop Label1; +END// +Insert into tb3 (f122, f136, f144) +values ('Test 3.5.8.5-loop', 2, 8); +select @counter, @flag; +@counter @flag +Nothing to loop Initial +Insert into tb3 (f122, f136, f144) +values ('Test 3.5.8.5-loop', 11, 8); +select @counter, @flag; +@counter @flag +3 loops Initial +Create trigger trg4_2 after update on tb3 for each row +BEGIN +Label1: loop +set @counter=@counter+1; +END; +END// +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '; +END' at line 5 +drop trigger trg4_2; +drop trigger trg4; +delete from tb3 where f122='Test 3.5.8.5-loop'; + +Testcase 3.5.8.5-repeat: +------------------------ +Create trigger trg6 after insert on tb3 for each row +BEGIN +rp_label: REPEAT +SET @counter1 = @counter1 + 1; +IF (@counter1 MOD 2 = 0) THEN ITERATE rp_label; +END IF; +SET @counter2 = @counter2 + 1; +UNTIL @counter1> new.f136 END REPEAT rp_label; +END// +set @counter1= 0, @counter2= 0; +Insert into tb3 (f122, f136) +values ('Test 3.5.8.5-repeat', 13); +select @counter1, @counter2; +@counter1 @counter2 +15 8 +Create trigger trg6_2 after update on tb3 for each row +BEGIN +REPEAT +SET @counter2 = @counter2 + 1; +END// +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'END' at line 5 +drop trigger trg6; +delete from tb3 where f122='Test 3.5.8.5-repeat'; + +Testcase 3.5.8.5-while: +----------------------- +Create trigger trg7 after insert on tb3 for each row +wl_label: WHILE @counter1 < new.f136 DO +SET @counter1 = @counter1 + 1; +IF (@counter1 MOD 2 = 0) THEN ITERATE wl_label; +END IF; +SET @counter2 = @counter2 + 1; +END WHILE wl_label// +set @counter1= 0, @counter2= 0; +Insert into tb3 (f122, f136) +values ('Test 3.5.8.5-while', 7); +select @counter1, @counter2; +@counter1 @counter2 +7 4 +Create trigger trg7_2 after update on tb3 for each row +BEGIN +WHILE @counter1 < new.f136 +SET @counter1 = @counter1 + 1; +END// +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SET @counter1 = @counter1 + 1; +END' at line 4 +delete from tb3 where f122='Test 3.5.8.5-while'; +drop trigger trg7; + +Testcase 3.5.8.6: (requirement void) +------------------------------------ +CREATE PROCEDURE sp_01 () BEGIN set @v1=1; END// +CREATE TRIGGER trg8_1 BEFORE UPDATE ON tb3 FOR EACH ROW +BEGIN +CALL sp_01 (); +END// +Insert into tb3 (f120, f122, f136) values ('6', 'Test 3.5.8.6-insert', 101); +update tb3 set f120='S', f136=111, +f122='Test 3.5.8.6-tr8_1' + where f122='Test 3.5.8.6-insert'; +select f120, f122 +from tb3 where f122 like 'Test 3.5.8.6%' order by f120; +f120 f122 +S Test 3.5.8.6-tr8_1 +DROP TRIGGER trg8_1; +DROP PROCEDURE sp_01; + +Testcase 3.5.8.7 +---------------- +Create trigger trg9_1 before update on tb3 for each row +BEGIN +Start transaction; +Set new.f120='U'; +Commit; +END// +ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger. +Create trigger trg9_2 before delete on tb3 for each row +BEGIN +Start transaction; +Set @var2=old.f120; +Rollback; +END// +ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger. +drop user test_general@localhost; +drop user test_general; +drop user test_super@localhost; +DROP TABLE test.tb3; diff --git a/mysql-test/suite/funcs_1/r/ndb_trig_09.result b/mysql-test/suite/funcs_1/r/ndb_trig_09.result index d9bc16c20d3..0af360c5bfb 100644 --- a/mysql-test/suite/funcs_1/r/ndb_trig_09.result +++ b/mysql-test/suite/funcs_1/r/ndb_trig_09.result @@ -1,17 +1,11 @@ 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 diff --git a/mysql-test/suite/funcs_1/r/ndb_trig_09.result.moved b/mysql-test/suite/funcs_1/r/ndb_trig_09.result.moved new file mode 100644 index 00000000000..d9bc16c20d3 --- /dev/null +++ b/mysql-test/suite/funcs_1/r/ndb_trig_09.result.moved @@ -0,0 +1,275 @@ +USE test; +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, +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 = ndb; +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.9.1/2: +------------------- +Create trigger trg1 BEFORE UPDATE on tb3 for each row +set new.f142 = 94087, @counter=@counter+1; +TotalRows +10 +Affected +8 +NotAffected +2 +NewValuew +0 +set @counter=0; +Update tb3 Set f142='1' where f130<100; +select count(*) as ExpectedChanged, @counter as TrigCounter +from tb3 where f142=94087; +ExpectedChanged TrigCounter +8 8 +select count(*) as ExpectedNotChange from tb3 +where f130<100 and f142<>94087; +ExpectedNotChange +0 +select count(*) as NonExpectedChanged from tb3 +where f130>=130 and f142=94087; +NonExpectedChanged +0 +drop trigger trg1; + +Testcase 3.5.9.3: +----------------- +Create trigger trg2_a before update on tb3 for each row +set @tr_var_b4_118=old.f118, @tr_var_b4_121=old.f121, +@tr_var_b4_122=old.f122, @tr_var_b4_136=old.f136, +@tr_var_b4_163=old.f163; +Create trigger trg2_b after update on tb3 for each row +set @tr_var_af_118=old.f118, @tr_var_af_121=old.f121, +@tr_var_af_122=old.f122, @tr_var_af_136=old.f136, +@tr_var_af_163=old.f163; +Create trigger trg2_c before delete on tb3 for each row +set @tr_var_b4_118=old.f118, @tr_var_b4_121=old.f121, +@tr_var_b4_122=old.f122, @tr_var_b4_136=old.f136, +@tr_var_b4_163=old.f163; +Create trigger trg2_d after delete on tb3 for each row +set @tr_var_af_118=old.f118, @tr_var_af_121=old.f121, +@tr_var_af_122=old.f122, @tr_var_af_136=old.f136, +@tr_var_af_163=old.f163; +@tr_var_b4_118 @tr_var_b4_121 @tr_var_b4_122 @tr_var_b4_136 @tr_var_b4_163 +0 0 0 0 0 +@tr_var_af_118 @tr_var_af_121 @tr_var_af_122 @tr_var_af_136 @tr_var_af_163 +0 0 0 0 0 +Insert into tb3 (f122, f136, f163) +values ('Test 3.5.9.3', 7, 123.17); +Update tb3 Set f136=8 where f122='Test 3.5.9.3'; +select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136; +f118 f121 f122 f136 f163 +a NULL Test 3.5.9.3 00008 123.170000000000000000000000000000 +select @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, +@tr_var_b4_136, @tr_var_b4_163; +@tr_var_b4_118 @tr_var_b4_121 @tr_var_b4_122 @tr_var_b4_136 @tr_var_b4_163 +a NULL Test 3.5.9.3 7 123.170000000000000000000000000000 +select @tr_var_af_118, @tr_var_af_121, @tr_var_af_122, +@tr_var_af_136, @tr_var_af_163; +@tr_var_af_118 @tr_var_af_121 @tr_var_af_122 @tr_var_af_136 @tr_var_af_163 +a NULL Test 3.5.9.3 7 123.170000000000000000000000000000 +@tr_var_b4_118 @tr_var_b4_121 @tr_var_b4_122 @tr_var_b4_136 @tr_var_b4_163 +0 0 0 0 0 +@tr_var_af_118 @tr_var_af_121 @tr_var_af_122 @tr_var_af_136 @tr_var_af_163 +0 0 0 0 0 +delete from tb3 where f122='Test 3.5.9.3'; +select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136; +f118 f121 f122 f136 f163 +select @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, +@tr_var_b4_136, @tr_var_b4_163; +@tr_var_b4_118 @tr_var_b4_121 @tr_var_b4_122 @tr_var_b4_136 @tr_var_b4_163 +a NULL Test 3.5.9.3 8 123.170000000000000000000000000000 +select @tr_var_af_118, @tr_var_af_121, @tr_var_af_122, +@tr_var_af_136, @tr_var_af_163; +@tr_var_af_118 @tr_var_af_121 @tr_var_af_122 @tr_var_af_136 @tr_var_af_163 +a NULL Test 3.5.9.3 8 123.170000000000000000000000000000 +drop trigger trg2_a; +drop trigger trg2_b; +drop trigger trg2_c; +drop trigger trg2_d; + +Testcase 3.5.9.4: +----------------- +Create trigger trg3_a before insert on tb3 for each row +set @tr_var_b4_118=new.f118, @tr_var_b4_121=new.f121, +@tr_var_b4_122=new.f122, @tr_var_b4_136=new.f136, +@tr_var_b4_151=new.f151, @tr_var_b4_163=new.f163; +Create trigger trg3_b after insert on tb3 for each row +set @tr_var_af_118=new.f118, @tr_var_af_121=new.f121, +@tr_var_af_122=new.f122, @tr_var_af_136=new.f136, +@tr_var_af_151=new.f151, @tr_var_af_163=new.f163; +Create trigger trg3_c before update on tb3 for each row +set @tr_var_b4_118=new.f118, @tr_var_b4_121=new.f121, +@tr_var_b4_122=new.f122, @tr_var_b4_136=new.f136, +@tr_var_b4_151=new.f151, @tr_var_b4_163=new.f163; +Create trigger trg3_d after update on tb3 for each row +set @tr_var_af_118=new.f118, @tr_var_af_121=new.f121, +@tr_var_af_122=new.f122, @tr_var_af_136=new.f136, +@tr_var_af_151=new.f151, @tr_var_af_163=new.f163; +@tr_var_b4_118 @tr_var_b4_121 @tr_var_b4_122 @tr_var_b4_136 @tr_var_b4_151 @tr_var_b4_163 +0 0 0 0 0 0 +@tr_var_af_118 @tr_var_af_121 @tr_var_af_122 @tr_var_af_136 @tr_var_af_151 @tr_var_af_163 +0 0 0 0 0 0 +Insert into tb3 (f122, f136, f151, f163) +values ('Test 3.5.9.4', 7, DEFAULT, 995.24); +select f118, f121, f122, f136, f151, f163 from tb3 +where f122 like 'Test 3.5.9.4%' order by f163; +f118 f121 f122 f136 f151 f163 +a NULL Test 3.5.9.4 00007 999 995.240000000000000000000000000000 +select @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, +@tr_var_b4_136, @tr_var_b4_151, @tr_var_b4_163; +@tr_var_b4_118 @tr_var_b4_121 @tr_var_b4_122 @tr_var_b4_136 @tr_var_b4_151 @tr_var_b4_163 +a NULL Test 3.5.9.4 7 999 995.240000000000000000000000000000 +select @tr_var_af_118, @tr_var_af_121, @tr_var_af_122, +@tr_var_af_136, @tr_var_af_151, @tr_var_af_163; +@tr_var_af_118 @tr_var_af_121 @tr_var_af_122 @tr_var_af_136 @tr_var_af_151 @tr_var_af_163 +a NULL Test 3.5.9.4 7 999 995.240000000000000000000000000000 +@tr_var_b4_118 @tr_var_b4_121 @tr_var_b4_122 @tr_var_b4_136 @tr_var_b4_151 @tr_var_b4_163 +0 0 0 0 0 0 +@tr_var_af_118 @tr_var_af_121 @tr_var_af_122 @tr_var_af_136 @tr_var_af_151 @tr_var_af_163 +0 0 0 0 0 0 +Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL +where f122='Test 3.5.9.4'; +ERROR 23000: Column 'f136' cannot be null +Update tb3 Set f122='Test 3.5.9.4-trig', f136=0, f151=DEFAULT, f163=NULL +where f122='Test 3.5.9.4'; +select f118, f121, f122, f136, f151, f163 from tb3 +where f122 like 'Test 3.5.9.4-trig' order by f163; +f118 f121 f122 f136 f151 f163 +a NULL Test 3.5.9.4-trig 00000 999 NULL +select @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, +@tr_var_b4_136, @tr_var_b4_151, @tr_var_b4_163; +@tr_var_b4_118 @tr_var_b4_121 @tr_var_b4_122 @tr_var_b4_136 @tr_var_b4_151 @tr_var_b4_163 +a NULL Test 3.5.9.4-trig 0 999 NULL +select @tr_var_af_118, @tr_var_af_121, @tr_var_af_122, +@tr_var_af_136, @tr_var_af_151, @tr_var_af_163; +@tr_var_af_118 @tr_var_af_121 @tr_var_af_122 @tr_var_af_136 @tr_var_af_151 @tr_var_af_163 +a NULL Test 3.5.9.4-trig 0 999 NULL +drop trigger trg3_a; +drop trigger trg3_b; +drop trigger trg3_c; +drop trigger trg3_d; +delete from tb3 where f122='Test 3.5.9.4-trig'; + +Testcase 3.5.9.5: (implied in previous tests) +--------------------------------------------- + +Testcase 3.5.9.6: +----------------- +create trigger trg4a before insert on tb3 for each row +set @temp1= old.f120; +ERROR HY000: There is no OLD row in on INSERT trigger +create trigger trg4b after insert on tb3 for each row +set old.f120= 'test'; +ERROR HY000: Updating of OLD row is not allowed in trigger +drop trigger trg4a; +drop trigger trg4b; + +Testcase 3.5.9.7: (implied in previous tests) +--------------------------------------------- + +Testcase 3.5.9.8: (implied in previous tests) +--------------------------------------------- + +Testcase 3.5.9.9: +----------------- +create trigger trg5a before DELETE on tb3 for each row +set @temp1=new.f122; +ERROR HY000: There is no NEW row in on DELETE trigger +create trigger trg5b after DELETE on tb3 for each row +set new.f122='test'; +ERROR HY000: There is no NEW row in on DELETE trigger +drop trigger trg5a; +drop trigger trg5b; + +Testcase 3.5.9.10: (implied in previous tests) +---------------------------------------------- + +Testcase 3.5.9.11: covered by 3.5.9.9 +------------------------------------- + +Testcase 3.5.9.12: covered by 3.5.9.6 +------------------------------------- + +Testcase 3.5.9.13: +------------------ +create trigger trg6a before UPDATE on tb3 for each row +set old.f118='C', new.f118='U'; +ERROR HY000: Updating of OLD row is not allowed in trigger +create trigger trg6b after INSERT on tb3 for each row +set old.f136=163, new.f118='U'; +ERROR HY000: Updating of OLD row is not allowed in trigger +create trigger trg6c after UPDATE on tb3 for each row +set old.f136=NULL; +ERROR HY000: Updating of OLD row is not allowed in trigger +drop trigger trg6a; +drop trigger trg6b; +drop trigger trg6c; + +Testcase 3.5.9.14: (implied in previous tests) +---------------------------------------------- +DROP TABLE test.tb3; diff --git a/mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result b/mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result index 611e3460af4..60b70d1c981 100644 --- a/mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result +++ b/mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result @@ -1,17 +1,11 @@ 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.10.1/2/3: @@ -94,8 +87,8 @@ NULL Test 3.5.10.1/2/3 1 111.110000000000000000000000000000 NULL Test 3.5.10.1/2/3 2 111.110000000000000000000000000000 select f121, f122, f151, f163 from vw11; f121 f122 f151 f163 -NULL Test 3.5.10.1/2/3 2 111.110000000000000000000000000000 NULL Test 3.5.10.1/2/3 1 111.110000000000000000000000000000 +NULL Test 3.5.10.1/2/3 2 111.110000000000000000000000000000 select f121, f122, f151, f163 from tb3 where f122 like 'Not in View'; f121 f122 f151 f163 @@ -108,8 +101,8 @@ Y Test 3.5.10.1/2/3-Update 1 1.000000000000000000000000000000 Y Test 3.5.10.1/2/3-Update 2 1.000000000000000000000000000000 select f121, f122, f151, f163 from vw11; f121 f122 f151 f163 -Y Test 3.5.10.1/2/3-Update 2 1.000000000000000000000000000000 Y Test 3.5.10.1/2/3-Update 1 1.000000000000000000000000000000 +Y Test 3.5.10.1/2/3-Update 2 1.000000000000000000000000000000 set @test_var=0; Select @test_var as 'before delete'; before delete @@ -136,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=ndb; +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; @@ -170,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=ndb; +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() @@ -219,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=ndb; -create table t2_1 (f1 integer) engine=ndb; -create table t2_2 (f1 integer) engine=ndb; -create table t2_3 (f1 integer) engine=ndb; -create table t2_4 (f1 integer) engine=ndb; -create table t3 (f1 integer) engine=ndb; +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 @@ -262,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 = ndb; -create table t2 (f2 integer) engine = ndb; -create table t3 (f3 integer) engine = ndb; -create table t4 (f4 integer) engine = ndb; +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); @@ -301,7 +294,7 @@ set @sql_mode='traditional'; create table t1_sp ( count integer, var136 tinyint, -var151 decimal) engine=ndb; +var151 decimal) engine = <engine_to_be_used>; create procedure trig_sp() begin declare done int default 0; @@ -355,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; @@ -363,15 +356,15 @@ 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 = ndb; -create table t2 (f2 integer) engine = ndb; -create table t3 (f3 integer) engine = ndb; -create table t4 (f4 tinyint) engine = ndb; +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` ( - `f1` int(11) DEFAULT NULL -) ENGINE=ndbcluster DEFAULT CHARSET=latin1 + `f1` int(11) default NULL +) ENGINE=<engine_to_be_used> DEFAULT CHARSET=latin1 insert into t1 values (1); create trigger tr1 after insert on t1 for each row insert into t2 (f2) values (new.f1+1); @@ -382,18 +375,15 @@ for each row insert into t4 (f4) values (new.f3+1000); set autocommit=0; start transaction; insert into t1 values (1); -ERROR 22003: Out of range value for column 'f4' at row 1 +ERROR 22003: Out of range value adjusted for column 'f4' at row 1 commit; select * from t1 order by f1; f1 1 -1 select * from t2 order by f2; f2 -2 select * from t3 order by f3; f3 -3 drop trigger tr1; drop trigger tr2; drop trigger tr3; diff --git a/mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result.moved b/mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result.moved new file mode 100644 index 00000000000..611e3460af4 --- /dev/null +++ b/mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result.moved @@ -0,0 +1,404 @@ +USE test; +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, +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 = ndb; +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.10.1/2/3: +---------------------- +Create view vw11 as select * from tb3 +where f122 like 'Test 3.5.10.1/2/3%'; +Create trigger trg1a before insert on tb3 +for each row set new.f163=111.11; +Create trigger trg1b after insert on tb3 +for each row set @test_var='After Insert'; +Create trigger trg1c before update on tb3 +for each row set new.f121='Y', new.f122='Test 3.5.10.1/2/3-Update'; +Create trigger trg1d after update on tb3 +for each row set @test_var='After Update'; +Create trigger trg1e before delete on tb3 +for each row set @test_var=5; +Create trigger trg1f after delete on tb3 +for each row set @test_var= 2* @test_var+7; +Insert into vw11 (f122, f151) values ('Test 3.5.10.1/2/3', 1); +Insert into vw11 (f122, f151) values ('Test 3.5.10.1/2/3', 2); +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; +f121 f122 f151 f163 +NULL Test 3.5.10.1/2/3 1 111.110000000000000000000000000000 +NULL Test 3.5.10.1/2/3 2 111.110000000000000000000000000000 +select f121, f122, f151, f163 from vw11; +f121 f122 f151 f163 +NULL Test 3.5.10.1/2/3 2 111.110000000000000000000000000000 +NULL Test 3.5.10.1/2/3 1 111.110000000000000000000000000000 +select f121, f122, f151, f163 +from tb3 where f122 like 'Not in View'; +f121 f122 f151 f163 +NULL Not in View 3 111.110000000000000000000000000000 +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; +f121 f122 f151 f163 +Y Test 3.5.10.1/2/3-Update 1 1.000000000000000000000000000000 +Y Test 3.5.10.1/2/3-Update 2 1.000000000000000000000000000000 +select f121, f122, f151, f163 from vw11; +f121 f122 f151 f163 +Y Test 3.5.10.1/2/3-Update 2 1.000000000000000000000000000000 +Y Test 3.5.10.1/2/3-Update 1 1.000000000000000000000000000000 +set @test_var=0; +Select @test_var as 'before delete'; +before delete +0 +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; +f121 f122 f151 f163 +Y Test 3.5.10.1/2/3-Update 2 1.000000000000000000000000000000 +select f121, f122, f151, f163 from vw11; +f121 f122 f151 f163 +Y Test 3.5.10.1/2/3-Update 2 1.000000000000000000000000000000 +Select @test_var as 'after delete'; +after delete +17 +drop view vw11; +drop trigger trg1a; +drop trigger trg1b; +drop trigger trg1c; +drop trigger trg1d; +drop trigger trg1e; +drop trigger trg1f; +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=ndb; +Create trigger trg4 before insert on tb_load +for each row set new.f3=-(new.f1 div 5), @counter= @counter+1; +set @counter= 0; +select @counter as 'Rows Loaded Before'; +Rows Loaded Before +0 +load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table tb_load; +select @counter as 'Rows Loaded After'; +Rows Loaded After +10 +Select * from tb_load order by f1 limit 10; +f1 f2 f3 +-5000 a` 1000 +-4999 aaa 999 +-4998 abaa 999 +-4997 acaaa 999 +-4996 adaaaa 999 +-4995 aeaaaaa 999 +-4994 afaaaaaa 998 +-4993 agaaaaaaa 998 +-4992 a^aaaaaaaa 998 +-4991 a_aaaaaaaaa 998 +drop trigger trg4; +drop table tb_load; + +Testcase 3.5.10.5: (implemented in trig_frkey.test) +--------------------------------------------------- + +Testcase 3.5.10.6: (implemented in trig_frkey.test) +--------------------------------------------------- + +Testcase 3.5.10.extra: +---------------------- +create table t1_sp (var136 tinyint, var151 decimal) engine=ndb; +create trigger trg before insert on t1_sp +for each row set @counter=@counter+1; +create procedure trig_sp() +begin +declare done int default 0; +declare var151 decimal; +declare var136 tinyint; +declare cur1 cursor for select f136, f151 from tb3; +declare continue handler for sqlstate '01000' set done = 1; +open cur1; +fetch cur1 into var136, var151; +wl_loop: WHILE NOT done DO +insert into t1_sp values (var136, var151); +fetch cur1 into var136, var151; +END WHILE wl_loop; +close cur1; +end// +set @counter=0; +select @counter; +@counter +0 +call trig_sp(); +ERROR 02000: No data - zero rows fetched, selected, or processed +select @counter; +@counter +11 +select count(*) from tb3; +count(*) +11 +select count(*) from t1_sp; +count(*) +11 +drop procedure trig_sp; +drop trigger trg; +drop table t1_sp; + +Testcase 3.5.11.1 (implemented in trig_perf.test) +------------------------------------------------- + +Testcase y.y.y.2: Check for triggers starting triggers +------------------------------------------------------ +use test; +drop table if exists t1; +drop table if exists t2_1; +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=ndb; +create table t2_1 (f1 integer) engine=ndb; +create table t2_2 (f1 integer) engine=ndb; +create table t2_3 (f1 integer) engine=ndb; +create table t2_4 (f1 integer) engine=ndb; +create table t3 (f1 integer) engine=ndb; +insert into t1 values (1); +create trigger tr1 after insert on t1 for each row +BEGIN +insert into t2_1 (f1) values (new.f1+1); +insert into t2_2 (f1) values (new.f1+1); +insert into t2_3 (f1) values (new.f1+1); +insert into t2_4 (f1) values (new.f1+1); +END// +create trigger tr2_1 after insert on t2_1 for each row +insert into t3 (f1) values (new.f1+10); +create trigger tr2_2 after insert on t2_2 for each row +insert into t3 (f1) values (new.f1+100); +create trigger tr2_3 after insert on t2_3 for each row +insert into t3 (f1) values (new.f1+1000); +create trigger tr2_4 after insert on t2_4 for each row +insert into t3 (f1) values (new.f1+10000); +insert into t1 values (1); +select * from t3 order by f1; +f1 +12 +102 +1002 +10002 +drop trigger tr1; +drop trigger tr2_1; +drop trigger tr2_2; +drop trigger tr2_3; +drop trigger tr2_4; +drop table t1, t2_1, t2_2, t2_3, t2_4, t3; + +Testcase y.y.y.3: Circular trigger reference +-------------------------------------------- +use test; +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 = ndb; +create table t2 (f2 integer) engine = ndb; +create table t3 (f3 integer) engine = ndb; +create table t4 (f4 integer) engine = ndb; +insert into t1 values (0); +create trigger tr1 after insert on t1 +for each row insert into t2 (f2) values (new.f1+1); +create trigger tr2 after insert on t2 +for each row insert into t3 (f3) values (new.f2+1); +create trigger tr3 after insert on t3 +for each row insert into t4 (f4) values (new.f3+1); +create trigger tr4 after insert on t4 +for each row insert into t1 (f1) values (new.f4+1); +insert into t1 values (1); +ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger. +select * from t1 order by f1; +f1 +0 +select * from t2 order by f2; +f2 +select * from t3 order by f3; +f3 +select * from t4 order by f4; +f4 +drop trigger tr1; +drop trigger tr2; +drop trigger tr3; +drop trigger tr4; +drop table t1; +drop table t2; +drop table t3; +drop table t4; + +Testcase y.y.y.4: Recursive trigger/SP references +------------------------------------------------- +set @sql_mode='traditional'; +create table t1_sp ( +count integer, +var136 tinyint, +var151 decimal) engine=ndb; +create procedure trig_sp() +begin +declare done int default 0; +declare var151 decimal; +declare var136 tinyint; +declare cur1 cursor for select f136, f151 from tb3; +declare continue handler for sqlstate '01000' set done = 1; +set @counter= @counter+1; +open cur1; +fetch cur1 into var136, var151; +wl_loop: WHILE NOT done DO +insert into t1_sp values (@counter, var136, var151); +fetch cur1 into var136, var151; +END WHILE wl_loop; +close cur1; +end// +create trigger trg before insert on t1_sp +for each row call trig_sp(); +set @counter=0; +select @counter; +@counter +0 +call trig_sp(); +ERROR HY000: Recursive limit 0 (as set by the max_sp_recursion_depth variable) was exceeded for routine trig_sp +select @counter; +@counter +1 +select count(*) from tb3; +count(*) +11 +select count(*) from t1_sp; +count(*) +0 +set @@max_sp_recursion_depth= 10; +set @counter=0; +select @counter; +@counter +0 +call trig_sp(); +ERROR HY000: Can't update table 't1_sp' in stored function/trigger because it is already used by statement which invoked this stored function/trigger. +select @counter; +@counter +2 +select count(*) from tb3; +count(*) +11 +select count(*) from t1_sp; +count(*) +0 +drop procedure trig_sp; +drop trigger trg; +drop table t1_sp; + +Testcase y.y.y.5: Roleback of nested trigger references +------------------------------------------------------- +set @@sql_mode='traditional'; +use test; +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 = ndb; +create table t2 (f2 integer) engine = ndb; +create table t3 (f3 integer) engine = ndb; +create table t4 (f4 tinyint) engine = ndb; +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `f1` int(11) DEFAULT NULL +) ENGINE=ndbcluster DEFAULT CHARSET=latin1 +insert into t1 values (1); +create trigger tr1 after insert on t1 +for each row insert into t2 (f2) values (new.f1+1); +create trigger tr2 after insert on t2 +for each row insert into t3 (f3) values (new.f2+1); +create trigger tr3 after insert on t3 +for each row insert into t4 (f4) values (new.f3+1000); +set autocommit=0; +start transaction; +insert into t1 values (1); +ERROR 22003: Out of range value for column 'f4' at row 1 +commit; +select * from t1 order by f1; +f1 +1 +1 +select * from t2 order by f2; +f2 +2 +select * from t3 order by f3; +f3 +3 +drop trigger tr1; +drop trigger tr2; +drop trigger tr3; +drop table t1; +drop table t2; +drop table t3; +drop table t4; +DROP TABLE test.tb3; diff --git a/mysql-test/suite/funcs_1/t/disabled.def b/mysql-test/suite/funcs_1/t/disabled.def index b6526b67cc8..fbc48fa0a43 100644 --- a/mysql-test/suite/funcs_1/t/disabled.def +++ b/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 diff --git a/mysql-test/suite/funcs_1/t/innodb_trig_0102.test b/mysql-test/suite/funcs_1/t/innodb_trig_0102.test index c1da8f5448e..d5e65d3580f 100644 --- a/mysql-test/suite/funcs_1/t/innodb_trig_0102.test +++ b/mysql-test/suite/funcs_1/t/innodb_trig_0102.test @@ -1,4 +1,4 @@ -#### 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; - diff --git a/mysql-test/suite/funcs_1/t/innodb_trig_03.test b/mysql-test/suite/funcs_1/t/innodb_trig_03.test index 374bcf59a37..2a611c97fbf 100644 --- a/mysql-test/suite/funcs_1/t/innodb_trig_03.test +++ b/mysql-test/suite/funcs_1/t/innodb_trig_03.test @@ -1,4 +1,4 @@ -#### 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; - diff --git a/mysql-test/suite/funcs_1/t/innodb_trig_0407.test b/mysql-test/suite/funcs_1/t/innodb_trig_0407.test index 1a0689847b1..d8081770f4b 100644 --- a/mysql-test/suite/funcs_1/t/innodb_trig_0407.test +++ b/mysql-test/suite/funcs_1/t/innodb_trig_0407.test @@ -1,4 +1,4 @@ -#### 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; - diff --git a/mysql-test/suite/funcs_1/t/innodb_trig_08.test b/mysql-test/suite/funcs_1/t/innodb_trig_08.test index a4ac2db0955..ba48b977ba2 100644 --- a/mysql-test/suite/funcs_1/t/innodb_trig_08.test +++ b/mysql-test/suite/funcs_1/t/innodb_trig_08.test @@ -1,4 +1,4 @@ -#### 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; - diff --git a/mysql-test/suite/funcs_1/t/innodb_trig_09.test b/mysql-test/suite/funcs_1/t/innodb_trig_09.test index 40a0f145ef0..ad11465ff3c 100644 --- a/mysql-test/suite/funcs_1/t/innodb_trig_09.test +++ b/mysql-test/suite/funcs_1/t/innodb_trig_09.test @@ -1,4 +1,4 @@ -#### 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; - diff --git a/mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test b/mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test index f778b097a1b..b3252499191 100644 --- a/mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test +++ b/mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test @@ -1,4 +1,4 @@ -#### 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; - diff --git a/mysql-test/suite/funcs_1/t/memory_trig_0102.test b/mysql-test/suite/funcs_1/t/memory_trig_0102.test index c7b07cedfad..f13ca29e583 100644 --- a/mysql-test/suite/funcs_1/t/memory_trig_0102.test +++ b/mysql-test/suite/funcs_1/t/memory_trig_0102.test @@ -1,14 +1,8 @@ -#### 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; - diff --git a/mysql-test/suite/funcs_1/t/memory_trig_03.test b/mysql-test/suite/funcs_1/t/memory_trig_03.test index b7205ce15d2..617400679d0 100644 --- a/mysql-test/suite/funcs_1/t/memory_trig_03.test +++ b/mysql-test/suite/funcs_1/t/memory_trig_03.test @@ -1,14 +1,8 @@ -#### 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; - diff --git a/mysql-test/suite/funcs_1/t/memory_trig_0407.test b/mysql-test/suite/funcs_1/t/memory_trig_0407.test index 01b4bc39159..be87f191b2c 100644 --- a/mysql-test/suite/funcs_1/t/memory_trig_0407.test +++ b/mysql-test/suite/funcs_1/t/memory_trig_0407.test @@ -1,14 +1,8 @@ -#### 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; - diff --git a/mysql-test/suite/funcs_1/t/memory_trig_08.test b/mysql-test/suite/funcs_1/t/memory_trig_08.test index bc09d4f3943..05c09312575 100644 --- a/mysql-test/suite/funcs_1/t/memory_trig_08.test +++ b/mysql-test/suite/funcs_1/t/memory_trig_08.test @@ -1,14 +1,8 @@ -#### 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; - diff --git a/mysql-test/suite/funcs_1/t/memory_trig_09.test b/mysql-test/suite/funcs_1/t/memory_trig_09.test index 682e07f9fad..9ebced07bee 100644 --- a/mysql-test/suite/funcs_1/t/memory_trig_09.test +++ b/mysql-test/suite/funcs_1/t/memory_trig_09.test @@ -1,14 +1,8 @@ -#### 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; - diff --git a/mysql-test/suite/funcs_1/t/memory_trig_1011ext.test b/mysql-test/suite/funcs_1/t/memory_trig_1011ext.test index c6dfe54b64d..e604d172f75 100644 --- a/mysql-test/suite/funcs_1/t/memory_trig_1011ext.test +++ b/mysql-test/suite/funcs_1/t/memory_trig_1011ext.test @@ -1,14 +1,8 @@ -#### 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; - diff --git a/mysql-test/suite/funcs_1/t/myisam_trig_0102.test b/mysql-test/suite/funcs_1/t/myisam_trig_0102.test index fd326b2f061..473f25da26a 100644 --- a/mysql-test/suite/funcs_1/t/myisam_trig_0102.test +++ b/mysql-test/suite/funcs_1/t/myisam_trig_0102.test @@ -1,14 +1,8 @@ -#### 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; - diff --git a/mysql-test/suite/funcs_1/t/myisam_trig_03.test b/mysql-test/suite/funcs_1/t/myisam_trig_03.test index 77b2d16a2a6..66087725597 100644 --- a/mysql-test/suite/funcs_1/t/myisam_trig_03.test +++ b/mysql-test/suite/funcs_1/t/myisam_trig_03.test @@ -1,14 +1,8 @@ -#### 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; - diff --git a/mysql-test/suite/funcs_1/t/myisam_trig_0407.test b/mysql-test/suite/funcs_1/t/myisam_trig_0407.test index e1e9b6fd230..334bf764191 100644 --- a/mysql-test/suite/funcs_1/t/myisam_trig_0407.test +++ b/mysql-test/suite/funcs_1/t/myisam_trig_0407.test @@ -1,14 +1,8 @@ -#### 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; - diff --git a/mysql-test/suite/funcs_1/t/myisam_trig_08.test b/mysql-test/suite/funcs_1/t/myisam_trig_08.test index 225d994a732..af040e228e2 100644 --- a/mysql-test/suite/funcs_1/t/myisam_trig_08.test +++ b/mysql-test/suite/funcs_1/t/myisam_trig_08.test @@ -1,14 +1,8 @@ -#### 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; - diff --git a/mysql-test/suite/funcs_1/t/myisam_trig_09.test b/mysql-test/suite/funcs_1/t/myisam_trig_09.test index f5c53f48adb..9add2cda204 100644 --- a/mysql-test/suite/funcs_1/t/myisam_trig_09.test +++ b/mysql-test/suite/funcs_1/t/myisam_trig_09.test @@ -1,14 +1,8 @@ -#### 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; - diff --git a/mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test b/mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test index e7e36c39706..44ba5cefee2 100644 --- a/mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test +++ b/mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test @@ -1,14 +1,8 @@ -#### 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; - diff --git a/mysql-test/suite/funcs_1/t/ndb_trig_0102.test b/mysql-test/suite/funcs_1/t/ndb_trig_0102.test index c8bb5b04b24..dd239ff5edb 100644 --- a/mysql-test/suite/funcs_1/t/ndb_trig_0102.test +++ b/mysql-test/suite/funcs_1/t/ndb_trig_0102.test @@ -1,16 +1,10 @@ -#### suite/funcs_1/t/ndb_triggers.test +#### suite/funcs_1/t/ndb_trig_0102.test -# ndb tables should be used +# NDB tables should be used # -# 1. Check if ndb is available +# 1. Check if NDB is available --source include/have_ndb.inc # 2. Set $engine_type -let $engine_type= ndb; - -# Create some objects needed in many testcases -USE test; ---source suite/funcs_1/include/ndb_tb3.inc +let $engine_type= ndbcluster; --source suite/funcs_1/triggers/triggers_0102.inc -DROP TABLE test.tb3; - diff --git a/mysql-test/suite/funcs_1/t/ndb_trig_0102.test.moved b/mysql-test/suite/funcs_1/t/ndb_trig_0102.test.moved new file mode 100644 index 00000000000..c8bb5b04b24 --- /dev/null +++ b/mysql-test/suite/funcs_1/t/ndb_trig_0102.test.moved @@ -0,0 +1,16 @@ +#### suite/funcs_1/t/ndb_triggers.test + +# ndb tables should be used +# +# 1. Check if ndb is available +--source include/have_ndb.inc +# 2. Set $engine_type +let $engine_type= ndb; + +# Create some objects needed in many testcases +USE test; +--source suite/funcs_1/include/ndb_tb3.inc + +--source suite/funcs_1/triggers/triggers_0102.inc +DROP TABLE test.tb3; + diff --git a/mysql-test/suite/funcs_1/t/ndb_trig_03.test b/mysql-test/suite/funcs_1/t/ndb_trig_03.test index 4e9df0282c6..1f68bd05a80 100644 --- a/mysql-test/suite/funcs_1/t/ndb_trig_03.test +++ b/mysql-test/suite/funcs_1/t/ndb_trig_03.test @@ -1,16 +1,10 @@ -#### suite/funcs_1/t/ndb_triggers.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= ndb; - -# Create some objects needed in many testcases -USE test; ---source suite/funcs_1/include/ndb_tb3.inc +let $engine_type= ndbcluster; --source suite/funcs_1/triggers/triggers_03.inc -DROP TABLE test.tb3; - diff --git a/mysql-test/suite/funcs_1/t/ndb_trig_03.test.moved b/mysql-test/suite/funcs_1/t/ndb_trig_03.test.moved new file mode 100644 index 00000000000..4e9df0282c6 --- /dev/null +++ b/mysql-test/suite/funcs_1/t/ndb_trig_03.test.moved @@ -0,0 +1,16 @@ +#### suite/funcs_1/t/ndb_triggers.test + +# NDB tables should be used +# +# 1. Check if NDB is available +--source include/have_ndb.inc +# 2. Set $engine_type +let $engine_type= ndb; + +# Create some objects needed in many testcases +USE test; +--source suite/funcs_1/include/ndb_tb3.inc + +--source suite/funcs_1/triggers/triggers_03.inc +DROP TABLE test.tb3; + diff --git a/mysql-test/suite/funcs_1/t/ndb_trig_0407.test b/mysql-test/suite/funcs_1/t/ndb_trig_0407.test index 53c24790c7c..eccefd12dd9 100644 --- a/mysql-test/suite/funcs_1/t/ndb_trig_0407.test +++ b/mysql-test/suite/funcs_1/t/ndb_trig_0407.test @@ -1,16 +1,10 @@ -#### suite/funcs_1/t/ndb_triggers.test +#### suite/funcs_1/t/ndb_trig_0407.test -# ndb tables should be used +# NDB tables should be used # -# 1. Check if ndb is available +# 1. Check if NDB is available --source include/have_ndb.inc # 2. Set $engine_type -let $engine_type= ndb; - -# Create some objects needed in many testcases -USE test; ---source suite/funcs_1/include/ndb_tb3.inc +let $engine_type= ndbcluster; --source suite/funcs_1/triggers/triggers_0407.inc -DROP TABLE test.tb3; - diff --git a/mysql-test/suite/funcs_1/t/ndb_trig_0407.test.moved b/mysql-test/suite/funcs_1/t/ndb_trig_0407.test.moved new file mode 100644 index 00000000000..53c24790c7c --- /dev/null +++ b/mysql-test/suite/funcs_1/t/ndb_trig_0407.test.moved @@ -0,0 +1,16 @@ +#### suite/funcs_1/t/ndb_triggers.test + +# ndb tables should be used +# +# 1. Check if ndb is available +--source include/have_ndb.inc +# 2. Set $engine_type +let $engine_type= ndb; + +# Create some objects needed in many testcases +USE test; +--source suite/funcs_1/include/ndb_tb3.inc + +--source suite/funcs_1/triggers/triggers_0407.inc +DROP TABLE test.tb3; + diff --git a/mysql-test/suite/funcs_1/t/ndb_trig_08.test b/mysql-test/suite/funcs_1/t/ndb_trig_08.test index 197989137d7..e07c4fe7ec4 100644 --- a/mysql-test/suite/funcs_1/t/ndb_trig_08.test +++ b/mysql-test/suite/funcs_1/t/ndb_trig_08.test @@ -1,16 +1,10 @@ -#### suite/funcs_1/t/ndb_triggers.test +#### suite/funcs_1/t/ndb_trig_08.test -# ndb tables should be used +# NDB tables should be used # -# 1. Check if ndb is available +# 1. Check if NDB is available --source include/have_ndb.inc # 2. Set $engine_type -let $engine_type= ndb; - -# Create some objects needed in many testcases -USE test; ---source suite/funcs_1/include/ndb_tb3.inc +let $engine_type= ndbcluster; --source suite/funcs_1/triggers/triggers_08.inc -DROP TABLE test.tb3; - diff --git a/mysql-test/suite/funcs_1/t/ndb_trig_08.test.moved b/mysql-test/suite/funcs_1/t/ndb_trig_08.test.moved new file mode 100644 index 00000000000..197989137d7 --- /dev/null +++ b/mysql-test/suite/funcs_1/t/ndb_trig_08.test.moved @@ -0,0 +1,16 @@ +#### suite/funcs_1/t/ndb_triggers.test + +# ndb tables should be used +# +# 1. Check if ndb is available +--source include/have_ndb.inc +# 2. Set $engine_type +let $engine_type= ndb; + +# Create some objects needed in many testcases +USE test; +--source suite/funcs_1/include/ndb_tb3.inc + +--source suite/funcs_1/triggers/triggers_08.inc +DROP TABLE test.tb3; + diff --git a/mysql-test/suite/funcs_1/t/ndb_trig_09.test b/mysql-test/suite/funcs_1/t/ndb_trig_09.test index ff26a0cbf21..8def1d9eea1 100644 --- a/mysql-test/suite/funcs_1/t/ndb_trig_09.test +++ b/mysql-test/suite/funcs_1/t/ndb_trig_09.test @@ -1,16 +1,10 @@ -#### suite/funcs_1/t/ndb_triggers.test +#### suite/funcs_1/t/ndb_trig_09.test -# ndb tables should be used +# NDB tables should be used # -# 1. Check if ndb is available +# 1. Check if NDB is available --source include/have_ndb.inc # 2. Set $engine_type -let $engine_type= ndb; - -# Create some objects needed in many testcases -USE test; ---source suite/funcs_1/include/ndb_tb3.inc +let $engine_type= ndbcluster; --source suite/funcs_1/triggers/triggers_09.inc -DROP TABLE test.tb3; - diff --git a/mysql-test/suite/funcs_1/t/ndb_trig_09.test.moved b/mysql-test/suite/funcs_1/t/ndb_trig_09.test.moved new file mode 100644 index 00000000000..ff26a0cbf21 --- /dev/null +++ b/mysql-test/suite/funcs_1/t/ndb_trig_09.test.moved @@ -0,0 +1,16 @@ +#### suite/funcs_1/t/ndb_triggers.test + +# ndb tables should be used +# +# 1. Check if ndb is available +--source include/have_ndb.inc +# 2. Set $engine_type +let $engine_type= ndb; + +# Create some objects needed in many testcases +USE test; +--source suite/funcs_1/include/ndb_tb3.inc + +--source suite/funcs_1/triggers/triggers_09.inc +DROP TABLE test.tb3; + diff --git a/mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test b/mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test index 2adcf0747b7..729d5fee60b 100644 --- a/mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test +++ b/mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test @@ -1,16 +1,10 @@ -#### suite/funcs_1/t/ndb_triggers.test +#### suite/funcs_1/t/ndb_trig_1011ext.test -# ndb tables should be used +# NDB tables should be used # -# 1. Check if ndb is available +# 1. Check if NDB is available --source include/have_ndb.inc # 2. Set $engine_type -let $engine_type= ndb; - -# Create some objects needed in many testcases -USE test; ---source suite/funcs_1/include/ndb_tb3.inc +let $engine_type= ndbcluster; --source suite/funcs_1/triggers/triggers_1011ext.inc -DROP TABLE test.tb3; - diff --git a/mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test.moved b/mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test.moved new file mode 100644 index 00000000000..2adcf0747b7 --- /dev/null +++ b/mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test.moved @@ -0,0 +1,16 @@ +#### suite/funcs_1/t/ndb_triggers.test + +# ndb tables should be used +# +# 1. Check if ndb is available +--source include/have_ndb.inc +# 2. Set $engine_type +let $engine_type= ndb; + +# Create some objects needed in many testcases +USE test; +--source suite/funcs_1/include/ndb_tb3.inc + +--source suite/funcs_1/triggers/triggers_1011ext.inc +DROP TABLE test.tb3; + diff --git a/mysql-test/suite/funcs_1/triggers/triggers_0102.inc b/mysql-test/suite/funcs_1/triggers/triggers_0102.inc index aa322f6a7ef..3afbc3f7aa9 100644 --- a/mysql-test/suite/funcs_1/triggers/triggers_0102.inc +++ b/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'; # In 5.0 names to long (more than 64 chars) were trimed without an error @@ -269,6 +277,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 @@ -332,7 +341,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 @@ -374,14 +385,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'; @@ -433,7 +447,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'; @@ -453,3 +469,4 @@ let $message= Testcase 3.5.2.1/2/3:; --disable_warnings drop database trig_db1; drop database trig_db2; +DROP TABLE test.tb3; diff --git a/mysql-test/suite/funcs_1/triggers/triggers_03.inc b/mysql-test/suite/funcs_1/triggers/triggers_03.inc index cf1c445aaee..191152613ba 100644 --- a/mysql-test/suite/funcs_1/triggers/triggers_03.inc +++ b/mysql-test/suite/funcs_1/triggers/triggers_03.inc @@ -1,3 +1,4 @@ +#### suite/funcs_1/triggers/triggers_03.inc #====================================================================== # # Trigger Tests @@ -5,6 +6,9 @@ #====================================================================== # WL#4084: enable disabled parts. 2007-11-15, hhunger +USE test; +--source suite/funcs_1/include/tb3.inc + --disable_abort_on_error ########################################### @@ -21,6 +25,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; @@ -570,7 +575,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; @@ -657,3 +664,5 @@ let $message=Testcase: 3.5.3.x:; drop user test_noprivs; --enable_warnings +use test; +drop table tb3; diff --git a/mysql-test/suite/funcs_1/triggers/triggers_0407.inc b/mysql-test/suite/funcs_1/triggers/triggers_0407.inc index a05bdb45bac..8bacc3944de 100644 --- a/mysql-test/suite/funcs_1/triggers/triggers_0407.inc +++ b/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; diff --git a/mysql-test/suite/funcs_1/triggers/triggers_08.inc b/mysql-test/suite/funcs_1/triggers/triggers_08.inc index d7ef12c58a8..a722f8c9019 100644 --- a/mysql-test/suite/funcs_1/triggers/triggers_08.inc +++ b/mysql-test/suite/funcs_1/triggers/triggers_08.inc @@ -5,6 +5,9 @@ #====================================================================== # WL#4084: enable disabled parts, 2007-11-15 hhunger +USE test; +--source suite/funcs_1/include/tb3.inc + # General setup for Trigger tests let $message= Testcase: 3.5:; --source include/show_msg.inc @@ -57,16 +60,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, @@ -550,4 +556,4 @@ let $message= Testcase 3.5.8.7; drop user test_general; drop user test_super@localhost; - +DROP TABLE test.tb3; diff --git a/mysql-test/suite/funcs_1/triggers/triggers_09.inc b/mysql-test/suite/funcs_1/triggers/triggers_09.inc index 406f37e6ff5..6f3aca5be16 100644 --- a/mysql-test/suite/funcs_1/triggers/triggers_09.inc +++ b/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 ########### @@ -317,4 +324,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; diff --git a/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc b/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc index 3980a7fed42..1681c693cba 100644 --- a/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc +++ b/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc @@ -5,6 +5,14 @@ #====================================================================== # WL#4084: enable disabled parts, 2007-11-15, hhunger +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 ############################################## @@ -50,6 +58,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'; @@ -58,6 +67,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 @@ -66,6 +76,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'; @@ -89,7 +100,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; @@ -132,7 +144,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; @@ -204,12 +217,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 //; @@ -257,9 +276,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); @@ -299,10 +322,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() @@ -354,7 +378,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'; @@ -365,10 +389,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 @@ -378,19 +407,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; @@ -398,5 +426,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; diff --git a/mysql-test/t/func_misc.test b/mysql-test/t/func_misc.test index 25fe0ef521c..8e995c2da9c 100644 --- a/mysql-test/t/func_misc.test +++ b/mysql-test/t/func_misc.test @@ -187,7 +187,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.) @@ -251,7 +251,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"; @@ -266,7 +266,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; |