database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fix a bad BitKeeper dependency structure for the "funcs_1" suite:

Browse Source 
Step 2:
Restore the 5.1 contents in the 5.0-dependent files.
This commit is contained in:
joerg@debian.(none)
2007-07-27 15:41:27 +02:00
parent c80ced4111
commit 4d9cbaf313
51 changed files with 12413 additions and 6985 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mysql-test/suite/funcs_1/triggers/triggers_0102.inc
View File

@ -214,21 +214,29 @@ let $message= Testcase 3.5.1.7: - need to fix;
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
# In 5.1 an error is returned. So adding a call with the expected error
# and one with a shorter name to validate proper execution
--error 1059
CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ
BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
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;
update t1 set f2='update 3.5.1.7';
select * from t1;
select trigger_name from information_schema.triggers;
select trigger_name from information_schema.triggers order by trigger_name;
#Cleanup
--disable_warnings
--error 0, 1360
drop trigger trg5_1;
# The above trigger should be dropped since the name was trimmed.
# In 5.1 the long name should generate an error that is to long
--error 1059
drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ;
drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX;
drop table t1;
#Section 3.5.1.8
@ -385,10 +393,10 @@ let $message= Testcase 3.5.1.11:;
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;
select * from t1;
select * from t1 order by f2;
select * from trig_db2.t2;
select * from trig_db3.t1;
select * from t1;
select * from t1 order by f2;
use test;
#Cleanup
@ -434,7 +442,7 @@ let $message= Testcase 3.5.2.1/2/3:;
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;
from information_schema.triggers order by trigger_name;
set @test_var1= '', @test_var2= '', @test_var3= '';
insert into t1 (f1,f2) values ('insert to db1 t1 from db1',352);

144
mysql-test/suite/funcs_1/triggers/triggers_03.inc
View File

@ -29,23 +29,23 @@ let $message= Testcase 3.5.3:;
set password for test_yesprivs@localhost = password('PWD');
#Section 3.5.3.1 / 3.5.3.2
# Test case: Ensure SUPER privilege is required to create a trigger
# Test case: Ensure TRIGGER privilege is required to create a trigger
#Section 3.5.3.3 / 3.5.3.4
# Test case: Ensure that root always has the SUPER privilege.
# Test case: Ensure that root always has the TRIGGER privilege.
# OMR - No need to test this since SUPER priv is an existing one and not related
# or added for triggers (TP 2005-06-06)
#Section 3.5.3.5 / 3.5.3.6
# Test case: Ensure that the SUPER privilege is required to drop a trigger.
# Test case: Ensure that the TRIGGER privilege is required to drop a trigger.
let $message= Testcase 3.5.3.2/6:;
--source include/show_msg.inc
revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
grant ALL on *.* to test_noprivs@localhost;
revoke SUPER on *.* from test_noprivs@localhost;
revoke TRIGGER on *.* from test_noprivs@localhost;
show grants for test_noprivs@localhost;
revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
grant SUPER on *.* to test_yesprivs@localhost;
grant TRIGGER on *.* to test_yesprivs@localhost;
# Adding the minimal priv to be able to set to the db
grant SELECT on priv_db.t1 to test_yesprivs@localhost;
show grants for test_yesprivs@localhost;
@ -63,14 +63,15 @@ let $message= Testcase 3.5.3.2:;
select current_user;
use priv_db;
--error 1227
# error 1227 is better, as it says, that not the privilege
--error 1142,1227
create trigger trg1_1 before INSERT on t1 for each row
set new.f1 = 'trig 3.5.3.2_1-no';
connection default;
use priv_db;
insert into t1 (f1) values ('insert 3.5.3.2-no');
select f1 from t1;
select f1 from t1 order by f1;
connection yes_privs;
select current_user;
@ -83,29 +84,27 @@ let $message= Testcase 3.5.3.2:;
select current_user;
use priv_db;
# Added following the fix to bug 5861
--error 1143
--error 1143
insert into t1 (f1) values ('insert 3.5.3.2-yes');
select f1 from t1;
grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
let $message= note: once 15166 is fixed a similar case for SELECT needs to be added;
--source include/show_msg.inc
select f1 from t1 order by f1;
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;
insert into t1 (f1) values ('insert 3.5.3.2-yes');
select f1 from t1;
let $message= Testcase 3.5.3.6:;
--source include/show_msg.inc
connection no_privs;
use priv_db;
--error 1227
--error 1142,1227
drop trigger trg1_2;
connection default;
use priv_db;
insert into t1 (f1) values ('insert 3.5.3.6-yes');
select f1 from t1;
select f1 from t1 order by f1;
connection yes_privs;
use priv_db;
@ -115,7 +114,7 @@ let $message= Testcase 3.5.3.6:;
connection default;
use priv_db;
insert into t1 (f1) values ('insert 3.5.3.6-no');
select f1 from t1;
select f1 from t1 order by f1;
# Cleanup
--disable_warnings
@ -144,7 +143,7 @@ let $message=Testcase 3.5.3.7a:;
show grants for test_noprivs@localhost;
revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
grant SUPER, UPDATE on *.* to test_yesprivs@localhost;
grant TRIGGER, UPDATE on *.* to test_yesprivs@localhost;
show grants for test_yesprivs@localhost;
--replace_result $MASTER_MYPORT MASTER_MYPORT $MASTER_MYSOCK MASTER_MYSOCK
@ -156,7 +155,7 @@ let $message=Testcase 3.5.3.7a:;
select current_user;
use priv_db;
show grants;
select f1 from t1;
select f1 from t1 order by f1;
let $message= Trigger create disabled - should fail - Bug 8884;
--source include/show_msg.inc
@ -166,7 +165,7 @@ let $message= Trigger create disabled - should fail - Bug 8884;
connection default;
insert into t1 (f1) values ('insert 3.5.3.7-1a');
select f1 from t1;
select f1 from t1 order by f1;
--error 0, 1360
drop trigger trg4a_1;
@ -179,14 +178,8 @@ let $message= Trigger create disabled - should fail - Bug 8884;
connection default;
# Added to bypass bug 15166
let $message= SELECT priv added to bypass bug 15166;
--source include/show_msg.inc
grant SELECT on *.* to test_yesprivs@localhost;
insert into t1 (f1) values ('insert 3.5.3.7-2b');
select f1 from t1;
select f1 from t1 order by f1;
# Cleanup
--disable_warnings
@ -200,13 +193,13 @@ let $message= Testcase 3.5.3.7b:;
--source include/show_msg.inc
revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
grant SUPER on *.* to test_noprivs;
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;
revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
grant SUPER on *.* to 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;
@ -228,9 +221,9 @@ let $message= Trigger create disabled - should fail - Bug 8884;
connection default;
insert into t1 (f1) values ('insert 3.5.3.7-1b');
select f1 from t1;
select f1 from t1 order by f1;
update t1 set f1 = 'update 3.5.3.7-1b' where f1 = 'insert 3.5.3.7-1b';
select f1 from t1;
select f1 from t1 order by f1;
--error 0, 1360
drop trigger trg4b_1;
@ -242,15 +235,10 @@ let $message= Trigger create disabled - should fail - Bug 8884;
connection default;
# Added to bypass bug 15166
let $message= SELECT priv added to bypass bug 15166;
--source include/show_msg.inc
grant SELECT on priv_db.* to test_yesprivs@localhost;
insert into t1 (f1) values ('insert 3.5.3.7-2b');
select f1 from t1;
select f1 from t1 order by f1;
update t1 set f1 = 'update 3.5.3.7-2b' where f1 = 'insert 3.5.3.7-2b';
select f1 from t1;
select f1 from t1 order by f1;
# Cleanup
--disable_warnings
drop trigger trg4b_2;
@ -263,13 +251,13 @@ let $message= Testcase 3.5.3.7c;
--source include/show_msg.inc
revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
grant SUPER on *.* to 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;
revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
grant SUPER on *.* to 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;
@ -291,7 +279,7 @@ let $message= Trigger create disabled - should fail - Bug 8884;
connection default;
insert into t1 (f1) values ('insert 3.5.3.7-1c');
select f1 from t1;
select f1 from t1 order by f1;
--error 0, 1360
drop trigger trg4c_1;
@ -303,13 +291,8 @@ let $message= Trigger create disabled - should fail - Bug 8884;
connection default;
# Added to bypass bug 15166
let $message= SELECT priv added to bypass bug 15166;
--source include/show_msg.inc
grant SELECT on priv_db.t1 to test_yesprivs@localhost;
insert into t1 (f1) values ('insert 3.5.3.7-2c');
select f1 from t1;
select f1 from t1 order by f1;
# Cleanup
--disable_warnings
@ -325,13 +308,13 @@ let $message= Testcase 3.5.3.7d:;
--source include/show_msg.inc
revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
grant SUPER on *.* to test_noprivs@localhost;
grant TRIGGER on *.* to test_noprivs@localhost;
# There is no ALL privs on the column level
grant SELECT (f1), INSERT (f1) on priv_db.t1 to test_noprivs@localhost;
show grants for test_noprivs;
revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
grant SUPER on *.* to 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;
@ -352,7 +335,7 @@ let $message= Trigger create disabled - should fail - Bug 8884;
connection default;
insert into t1 (f1) values ('insert 3.5.3.7-1d');
select f1 from t1;
select f1 from t1 order by f1;
--error 0, 1360
drop trigger trg4d_1;
@ -364,13 +347,8 @@ let $message= Trigger create disabled - should fail - Bug 8884;
connection default;
# Added to bypass bug 15166
let $message= SELECT priv added to bypass bug 15166;
--source include/show_msg.inc
grant SELECT (f1) on priv_db.t1 to test_yesprivs@localhost;
insert into t1 (f1) values ('insert 3.5.3.7-2d');
select f1 from t1;
select f1 from t1 order by f1;
# Cleanup
--disable_warnings
@ -394,7 +372,7 @@ let $message= Testcase 3.5.3.8a:;
show grants for test_noprivs@localhost;
revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
grant SUPER, SELECT on *.* to test_yesprivs@localhost;
grant TRIGGER, SELECT on *.* to test_yesprivs@localhost;
show grants for test_yesprivs@localhost;
--replace_result $MASTER_MYPORT MASTER_MYPORT $MASTER_MYSOCK MASTER_MYSOCK
@ -433,11 +411,6 @@ let $message= Trigger create disabled - should fail - Bug 8887;
set @test_var= 'before trig 3.5.3.8-2a';
select @test_var;
# Added to bypass bug 15166
let $message= UPDATE priv added to bypass bug 15166;
--source include/show_msg.inc
grant UPDATE on *.* to test_yesprivs@localhost;
insert into t1 (f1) values ('insert 3.5.3.8-2a');
select @test_var;
@ -453,13 +426,13 @@ let $message= Testcase: 3.5.3.8b;
--source include/show_msg.inc
revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
grant SUPER on *.* to 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;
revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
grant SUPER on *.* to 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;
@ -499,11 +472,6 @@ let $message= Trigger create disabled - should fail - Bug 8887;
insert into t1 (f1) values ('insert 3.5.3.8-2b');
select @test_var;
# Added to bypass bug 15166
let $message= UPDATE priv added to bypass bug 15166;
--source include/show_msg.inc
grant UPDATE on priv_db.* to test_yesprivs@localhost;
update t1 set f1= 'update 3.5.3.8-2b' where f1 = 'insert 3.5.3.8-2b';
select @test_var;
# Cleanup
@ -518,13 +486,13 @@ let $message= Testcase 3.5.3.8c:;
--source include/show_msg.inc
revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
grant SUPER on *.* to 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;
revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
grant SUPER on *.* to 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;
@ -560,11 +528,6 @@ let $message= Trigger create disabled - should fail - Bug 8887;
connection default;
set @test_var='before trig 3.5.3.8-2c';
# Added to bypass bug 15166
let $message= UPDATE priv added to bypass bug 15166;
--source include/show_msg.inc
grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
insert into t1 (f1) values ('insert 3.5.3.8-2c');
select @test_var;
# Cleanup
@ -579,13 +542,13 @@ let $message=Testcase: 3.5.3.8d:;
--source include/show_msg.inc
revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
grant SUPER on *.* to test_noprivs@localhost;
grant TRIGGER on *.* to test_noprivs@localhost;
# There is no ALL prov on the column level
grant UPDATE (f1), INSERT (f1) on priv_db.t1 to test_noprivs@localhost;
show grants for test_noprivs@localhost;
revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
grant SUPER on *.* to 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;
@ -620,11 +583,6 @@ let $message= Trigger create disabled - should fail - Bug 8887;
connection default;
set @test_var='before trig 3.5.3.8-2d';
# Added to bypass bug 15166
let $message= UPDATE priv added to bypass bug 15166;
--source include/show_msg.inc
grant UPDATE (f1) on priv_db.t1 to test_yesprivs@localhost;
insert into t1 (f1) values ('insert 3.5.3.8-2d');
select @test_var;
@ -650,7 +608,7 @@ let $message=Testcase: 3.5.3.x:;
eval create table t2 (f2 int) engine= $engine_type;
revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
grant SUPER on *.* to 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;
@ -671,8 +629,8 @@ let $message=Testcase: 3.5.3.x:;
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;
select f2 from t2;
select f1 from t1 order by f1;
select f2 from t2 order by f2;
connection yes_353x;
use priv_db;
@ -687,8 +645,8 @@ let $message=Testcase: 3.5.3.x:;
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;
select f2 from t2;
select f1 from t1 order by f1;
select f2 from t2 order by f2;
connection yes_353x;
use priv_db;
@ -703,8 +661,8 @@ let $message=Testcase: 3.5.3.x:;
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;
select f2 from t2;
select f1 from t1 order by f1;
select f2 from t2 order by f2;
select @aaa;
connection yes_353x;
@ -720,8 +678,8 @@ let $message=Testcase: 3.5.3.x:;
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;
select f2 from t2;
select f1 from t1 order by f1;
select f2 from t2 order by f2;

10
mysql-test/suite/funcs_1/triggers/triggers_0407.inc
View File

@ -51,14 +51,14 @@ let $message= Testcase 3.5.4.1:;
connection con1_general;
Use db_drop;
Insert into t1 values ('Insert error 3.5.4.1');
Select * from t1;
Select * from t1 order by f1;
connection con1_super;
drop trigger trg1;
select trigger_schema, trigger_name, event_object_table
from information_schema.triggers;
from information_schema.triggers order by trigger_name;
connection con1_general;
Insert into t1 values ('Insert no trigger 3.5.4.1');
Select * from t1;
Select * from t1 order by f1;
#Cleanup
--disable_warnings
@ -294,7 +294,7 @@ let $message= Testcase 3.5.5.4:;
Select * from t2;
use dbtest_one;
Insert into dbtest_two.t2 values ('2nd Insert 3.5.5.4');
Select * from dbtest_two.t2;
Select * from dbtest_two.t2 order by f1;
#Cleanup
connection con1_super;
@ -535,7 +535,7 @@ let $message= Testcase 3.5.7.13/14:;
Create trigger trg9_1 BEFORE DELETE
on tb3 for each row set @test_var=@test_var+1;
--error ER_NOT_SUPPORTED_YET
--error ER_NOT_SUPPORTED_YET
Create trigger trg9_2 BEFORE DELETE
on tb3 for each row set @test_var=@test_var+10;

39
mysql-test/suite/funcs_1/triggers/triggers_08.inc
View File

@ -111,9 +111,10 @@ let $message= 3.5.8.4 - multiple SQL;
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';
select * from db_test.t1_i;
select * from db_test.t1_u;
select * from db_test.t1_d;
# error in ndb
select * from db_test.t1_i order by i120;
select * from db_test.t1_u order by u120;
select * from db_test.t1_d order by d120;
select @test_var;
@ -121,16 +122,22 @@ let $message= 3.5.8.4 - single SQL - insert;
--source include/show_msg.inc
# Trigger definition - single SQL Insert
connection con2_super;
delimiter //;
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//
delimiter ;//
# Trigger exeution - single SQL Insert
connection con2_general;
Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
select * from db_test.t1_i order by i120;
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%';
select * from db_test.t1_i;
select * from db_test.t1_i order by i120;
let $message= 3.5.8.4 - single SQL - update;
@ -148,7 +155,7 @@ let $message= 3.5.8.4 - single SQL - update;
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%';
select * from db_test.t1_u;
select * from db_test.t1_u order by u120;
let $message= 3.5.8.3/4 - single SQL - delete;
@ -167,7 +174,7 @@ let $message= 3.5.8.3/4 - single SQL - delete;
where f122='Test 3.5.8.4-Single Update';
#unlock tables;
Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
select * from db_test.t1_d;
select * from db_test.t1_d order by d120;
let $message= 3.5.8.3/4 - single SQL - select;
@ -228,16 +235,16 @@ let $message= Testcase 3.5.8.5 (IF):;
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';
from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
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';
from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
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';
from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
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';
from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
delimiter //;
--error 1064
@ -313,28 +320,28 @@ let $message= Testcase 3.5.8.5-case:;
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';
from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
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';
from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
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';
from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
Insert into tb3 (f120, f122, f136)
values ('d', 'Test 3.5.8.5-case', 152);
select f120, f122, f136, f144, @test_var
from tb3 where f122 = 'Test 3.5.8.5-case';
from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
Insert into tb3 (f120, f122, f136, f144)
values ('e', 'Test 3.5.8.5-case', 200, 8);
select f120, f122, f136, f144, @test_var
from tb3 where f122 = 'Test 3.5.8.5-case';
from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
--error 0, 1339
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';
from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
delimiter //;
--error 1064

8
mysql-test/suite/funcs_1/triggers/triggers_09.inc
View File

@ -85,7 +85,7 @@ let $message= Testcase 3.5.9.3:;
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';
select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
select @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122,
@tr_var_b4_136, @tr_var_b4_163;
select @tr_var_af_118, @tr_var_af_121, @tr_var_af_122,
@ -104,7 +104,7 @@ let $message= Testcase 3.5.9.3:;
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';
select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
select @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122,
@tr_var_b4_136, @tr_var_b4_163;
select @tr_var_af_118, @tr_var_af_121, @tr_var_af_122,
@ -159,7 +159,7 @@ let $message= Testcase 3.5.9.4:;
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%';
where f122 like 'Test 3.5.9.4%' order by f163;
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;
select @tr_var_af_118, @tr_var_af_121, @tr_var_af_122,
@ -180,7 +180,7 @@ let $message= Testcase 3.5.9.4:;
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';
where f122 like 'Test 3.5.9.4-trig' order by f163;
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;
select @tr_var_af_118, @tr_var_af_121, @tr_var_af_122,

24
mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
View File

@ -48,7 +48,7 @@ let $message= Testcase 3.5.10.1/2/3:;
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%';
from tb3 where f122 like 'Test 3.5.10.1/2/3%' order by f151;
select f121, f122, f151, f163 from vw11;
select f121, f122, f151, f163
from tb3 where f122 like 'Not in View';
@ -56,7 +56,7 @@ let $message= Testcase 3.5.10.1/2/3:;
#Section 3.5.10.2
Update vw11 set f163=1;
select f121, f122, f151, f163 from tb3
where f122 like 'Test 3.5.10.1/2/3%';
where f122 like 'Test 3.5.10.1/2/3%' order by f151;
select f121, f122, f151, f163 from vw11;
#Section 3.5.10.3
@ -64,7 +64,7 @@ let $message= Testcase 3.5.10.1/2/3:;
Select @test_var as 'before delete';
delete from vw11 where f151=1;
select f121, f122, f151, f163 from tb3
where f122 like 'Test 3.5.10.1/2/3%';
where f122 like 'Test 3.5.10.1/2/3%' order by f151;
select f121, f122, f151, f163 from vw11;
Select @test_var as 'after delete';
@ -98,7 +98,7 @@ let $message= Testcase 3.5.10.4:;
eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table tb_load;
select @counter as 'Rows Loaded After';
Select * from tb_load limit 10;
Select * from tb_load order by f1 limit 10;
#Cleanup
--disable_warnings
@ -233,7 +233,7 @@ let $message= Testcase y.y.y.2: Check for triggers starting triggers;
#lock tables t1 write, t2_1 write, t2_2 write, t2_3 write, t2_4 write, t3 write;
insert into t1 values (1);
#unlock tables;
select * from t3;
select * from t3 order by f1;
#Cleanup
--disable_warnings
@ -274,10 +274,10 @@ let $message= Testcase y.y.y.3: Circular trigger reference;
# OBN See bug 11896
--error 1442
insert into t1 values (1);
select * from t1;
select * from t2;
select * from t3;
select * from t4;
select * from t1 order by f1;
select * from t2 order by f2;
select * from t3 order by f3;
select * from t4 order by f4;
#Cleanup
--disable_warnings
@ -384,9 +384,9 @@ let $message= Testcase y.y.y.5: Roleback of nested trigger references;
--error 1264
insert into t1 values (1);
commit;
select * from t1;
select * from t2;
select * from t3;
select * from t1 order by f1;
select * from t2 order by f2;
select * from t3 order by f3;
#unlock tables;
#Cleanup
--disable_warnings