database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Fix for

Browse Source 
Bug#35335 funcs_1: Some tests fail within load_file during
                      pushbuild runs
   Solution: 1. Move files with input data used in load_file, 
                load data etc. 
                from suite/funcs_1/<whatever>
                to std_data
             2. Use for testsuite funcs_1 the server option
                --secure-file-priv=<MYSQLTEST_VARDIR>
             3. Outfiles have to be stored under MYSQLTEST_VARDIR 
+ changes according to WL#4304 Cleanup in funcs_1 tests
  - backport of fixes/improvements made in 5.1 to 5.0
    The differences between scripts in 5.0 and 5.1 cause
    much additional and annoying work during any upmerge.
  - replace error numbers with names
  - improved comments
  - improved formatting
  - Unify storage engine names so that result files for
    storage engine variants do not differ (some tests)
  - remove a script no more used (tests are done in other scripts)
This commit is contained in:
mleich@five.local.lan
2008-03-31 19:48:02 +02:00
parent dc00a52464
commit 89ddc0aa52
116 changed files with 9138 additions and 10742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,14 +63,14 @@ let $message= Testcase 3.5.3.2:;
select current_user;
use priv_db;
--error 1227
--error ER_SPECIFIC_ACCESS_DENIED_ERROR
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 +83,27 @@ let $message= Testcase 3.5.3.2:;
select current_user;
use priv_db;
# Added following the fix to bug 5861
--error 1143
--error ER_COLUMNACCESS_DENIED_ERROR
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 ER_SPECIFIC_ACCESS_DENIED_ERROR
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,12 +113,12 @@ 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
connection default;
--error 0, 1360
--error 0, ER_TRG_DOES_NOT_EXIST
drop trigger trg1_2;
disconnect no_privs;
disconnect yes_privs;
@@ -131,8 +129,6 @@ let $message= Testcase 3.5.3.6:;
# Test case: Ensure that use of the construct "SET NEW. <column name> = <value>"
# fails at CREATE TRIGGER time, if the current user does not have the
# UPDATE privilege on the column specified
# Note: As a result of bug 8884 the triggers are actually created.
# Disabled because of bug 8884
# --- 3.5.3.7a - Privs set on a global level
let $message=Testcase 3.5.3.7a:;
@@ -156,18 +152,15 @@ 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
# --error 1227
# create trigger trg4a_1 before INSERT on t1 for each row
# set new.f1 = 'trig 3.5.3.7-1a';
create trigger trg4a_1 before INSERT on t1 for each row
set new.f1 = 'trig 3.5.3.7-1a';
connection default;
--error ER_COLUMNACCESS_DENIED_ERROR
insert into t1 (f1) values ('insert 3.5.3.7-1a');
select f1 from t1;
--error 0, 1360
select f1 from t1 order by f1;
drop trigger trg4a_1;
connection yes_privs_424a;
@@ -179,14 +172,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
@@ -220,18 +207,14 @@ let $message= Testcase 3.5.3.7b:;
show grants;
use priv_db;
let $message= Trigger create disabled - should fail - Bug 8884;
--source include/show_msg.inc
# --error 1227
# create trigger trg4b_1 before UPDATE on t1 for each row
# set new.f1 = 'trig 3.5.3.7-1b';
create trigger trg4b_1 before UPDATE on t1 for each row
set new.f1 = 'trig 3.5.3.7-1b';
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;
--error 0, 1360
select f1 from t1 order by f1;
drop trigger trg4b_1;
connection yes_privs_424b;
@@ -242,15 +225,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;
@@ -283,16 +261,12 @@ let $message= Testcase 3.5.3.7c;
show grants;
use priv_db;
let $message= Trigger create disabled - should fail - Bug 8884;
--source include/show_msg.inc
# --error 1227
# create trigger trg4c_1 before INSERT on t1 for each row
# set new.f1 = 'trig 3.5.3.7-1c';
create trigger trg4c_1 before INSERT on t1 for each row
set new.f1 = 'trig 3.5.3.7-1c';
connection default;
insert into t1 (f1) values ('insert 3.5.3.7-1c');
select f1 from t1;
--error 0, 1360
select f1 from t1 order by f1;
drop trigger trg4c_1;
connection yes_privs_424c;
@@ -303,13 +277,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
@@ -344,16 +313,12 @@ let $message= Testcase 3.5.3.7d:;
connection no_privs_424d;
show grants;
use priv_db;
let $message= Trigger create disabled - should fail - Bug 8884;
--source include/show_msg.inc
# --error 1227
# create trigger trg4d_1 before INSERT on t1 for each row
# set new.f1 = 'trig 3.5.3.7-1d';
create trigger trg4d_1 before INSERT on t1 for each row
set new.f1 = 'trig 3.5.3.7-1d';
connection default;
insert into t1 (f1) values ('insert 3.5.3.7-1d');
select f1 from t1;
--error 0, 1360
select f1 from t1 order by f1;
drop trigger trg4d_1;
connection yes_privs_424d;
@@ -364,13 +329,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
@@ -408,18 +368,14 @@ let $message= Testcase 3.5.3.8a:;
use priv_db;
show grants;
let $message= Trigger create disabled - should fail - Bug 8887;
--source include/show_msg.inc
# --error 1227
# create trigger trg5a_1 before INSERT on t1 for each row
# set @test_var = new.f1;
create trigger trg5a_1 before INSERT on t1 for each row
set @test_var = new.f1;
connection default;
set @test_var = 'before trig 3.5.3.8-1a';
select @test_var;
insert into t1 (f1) values ('insert 3.5.3.8-1a');
select @test_var;
--error 0, 1360
drop trigger trg5a_1;
connection yes_privs_425a;
@@ -433,11 +389,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;
@@ -473,11 +424,8 @@ let $message= Testcase: 3.5.3.8b;
show grants;
use priv_db;
let $message= Trigger create disabled - should fail - Bug 8887;
--source include/show_msg.inc
# --error 1227
# create trigger trg5b_1 before UPDATE on t1 for each row
# set @test_var= new.f1;
create trigger trg5b_1 before UPDATE on t1 for each row
set @test_var= new.f1;
connection default;
set @test_var= 'before trig 3.5.3.8-1b';
@@ -485,7 +433,6 @@ let $message= Trigger create disabled - should fail - Bug 8887;
select @test_var;
update t1 set f1= 'update 3.5.3.8-1b' where f1 = 'insert 3.5.3.8-1b';
select @test_var;
--error 0, 1360
drop trigger trg5b_1;
connection yes_privs_425b;
@@ -499,11 +446,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
@@ -538,17 +480,13 @@ let $message= Testcase 3.5.3.8c:;
show grants;
use priv_db;
let $message= Trigger create disabled - should fail - Bug 8887;
--source include/show_msg.inc
# --error 1227
# create trigger trg5c_1 before INSERT on t1 for each row
# set @test_var= new.f1;
create trigger trg5c_1 before INSERT on t1 for each row
set @test_var= new.f1;
connection default;
set @test_var= 'before trig 3.5.3.8-1c';
insert into t1 (f1) values ('insert 3.5.3.8-1c');
select @test_var;
--error 0, 1360
drop trigger trg5c_1;
connection yes_privs_425c;
@@ -560,11 +498,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
@@ -598,17 +531,13 @@ let $message=Testcase: 3.5.3.8d:;
connection no_privs_425d;
show grants;
use priv_db;
let $message= Trigger create disabled - should fail - Bug 8887;
--source include/show_msg.inc
# --error 1227
# create trigger trg5d_1 before INSERT on t1 for each row
# set @test_var= new.f1;
create trigger trg5d_1 before INSERT on t1 for each row
set @test_var= new.f1;
connection default;
set @test_var='before trig 3.5.3.8-1d';
insert into t1 (f1) values ('insert 3.5.3.8-1d');
select @test_var;
--error 0, 1360
drop trigger trg5d_1;
connection yes_privs_425d;
@@ -620,11 +549,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;
@@ -633,8 +557,7 @@ let $message= UPDATE priv added to bypass bug 15166;
drop trigger trg5d_2;
--enable_warnings
# --- 3.5.3.x - additional tests following the fix to bug 5861 / WL 2818
# to test for trigger definer privs in the case of trigger
# --- 3.5.3.x to test for trigger definer privs in the case of trigger
# actions (insert/update/delete/select) performed on other
# tables.
let $message=Testcase: 3.5.3.x:;
@@ -671,8 +594,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 +610,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 +626,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 +643,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;