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

Backport Post fix of result files after push of BUG#34227

Browse Source
This commit is contained in:
He Zhenxing
2009-10-02 17:12:10 +08:00
parent dfbac1dd1d
commit 280bf1cee6
14 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/events_bugs.result
View File

@ -375,7 +375,7 @@ SELECT event_name, definer FROM INFORMATION_SCHEMA.EVENTS;
event_name definer event_name definer
e1 mysqltest_u1@localhost e1 mysqltest_u1@localhost
ALTER DEFINER=root@localhost EVENT e1 ON SCHEDULE EVERY 1 HOUR; ALTER DEFINER=root@localhost EVENT e1 ON SCHEDULE EVERY 1 HOUR;
ERROR 42000: Access denied; you need the SUPER privilege for this operation ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
SELECT event_name, definer FROM INFORMATION_SCHEMA.EVENTS; SELECT event_name, definer FROM INFORMATION_SCHEMA.EVENTS;
event_name definer event_name definer
e1 mysqltest_u1@localhost e1 mysqltest_u1@localhost
@ -386,7 +386,7 @@ event_name definer
e1 mysqltest_u1@localhost e1 mysqltest_u1@localhost
DROP EVENT e1; DROP EVENT e1;
CREATE DEFINER=root@localhost EVENT e1 ON SCHEDULE EVERY 1 DAY DO SELECT 1; CREATE DEFINER=root@localhost EVENT e1 ON SCHEDULE EVERY 1 DAY DO SELECT 1;
ERROR 42000: Access denied; you need the SUPER privilege for this operation ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
DROP EVENT e1; DROP EVENT e1;
ERROR HY000: Unknown event 'e1' ERROR HY000: Unknown event 'e1'
DROP USER mysqltest_u1@localhost; DROP USER mysqltest_u1@localhost;

4
mysql-test/r/grant2.result
View File

@ -121,9 +121,9 @@ mysqltest_5@host5, mysqltest_6@host6, mysqltest_7@host7;
create database mysqltest_1; create database mysqltest_1;
grant select, insert, update on `mysqltest\_1`.* to mysqltest_1@localhost; grant select, insert, update on `mysqltest\_1`.* to mysqltest_1@localhost;
set sql_log_off = 1; set sql_log_off = 1;
ERROR 42000: Access denied; you need the SUPER privilege for this operation ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
set sql_log_bin = 0; set sql_log_bin = 0;
ERROR 42000: Access denied; you need the SUPER privilege for this operation ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
delete from mysql.user where user like 'mysqltest\_1'; delete from mysql.user where user like 'mysqltest\_1';
delete from mysql.db where user like 'mysqltest\_1'; delete from mysql.db where user like 'mysqltest\_1';
drop database mysqltest_1; drop database mysqltest_1;

2
mysql-test/r/information_schema_db.result
View File

@ -121,7 +121,7 @@ grant insert on v1 to testdb_2@localhost;
create view v5 as select f1 from t1; create view v5 as select f1 from t1;
grant show view on v5 to testdb_2@localhost; grant show view on v5 to testdb_2@localhost;
create definer=`no_such_user`@`no_such_host` view v6 as select f1 from t1; create definer=`no_such_user`@`no_such_host` view v6 as select f1 from t1;
ERROR 42000: Access denied; you need the SUPER privilege for this operation ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
use testdb_1; use testdb_1;
create view v6 as select f1 from t1; create view v6 as select f1 from t1;
grant show view on v6 to testdb_2@localhost; grant show view on v6 to testdb_2@localhost;

4
mysql-test/r/sp-security.result
View File

@ -349,9 +349,9 @@ CREATE FUNCTION wl2897_f1() RETURNS INT RETURN 1;
---> connection: mysqltest_1_con ---> connection: mysqltest_1_con
USE mysqltest; USE mysqltest;
CREATE DEFINER=root@localhost PROCEDURE wl2897_p2() SELECT 2; CREATE DEFINER=root@localhost PROCEDURE wl2897_p2() SELECT 2;
ERROR 42000: Access denied; you need the SUPER privilege for this operation ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
CREATE DEFINER=root@localhost FUNCTION wl2897_f2() RETURNS INT RETURN 2; CREATE DEFINER=root@localhost FUNCTION wl2897_f2() RETURNS INT RETURN 2;
ERROR 42000: Access denied; you need the SUPER privilege for this operation ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
---> connection: mysqltest_2_con ---> connection: mysqltest_2_con
use mysqltest; use mysqltest;

4
mysql-test/r/trigger_notembedded.result
View File

@ -117,7 +117,7 @@ CREATE DEFINER='mysqltest_inv'@'localhost'
TRIGGER trg1 BEFORE INSERT ON t1 TRIGGER trg1 BEFORE INSERT ON t1
FOR EACH ROW FOR EACH ROW
SET @new_sum = 0; SET @new_sum = 0;
ERROR 42000: Access denied; you need the SUPER privilege for this operation ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
---> connection: default ---> connection: default
use mysqltest_db1; use mysqltest_db1;
@ -473,7 +473,7 @@ SELECT trigger_name FROM INFORMATION_SCHEMA.TRIGGERS
WHERE trigger_schema = 'db1'; WHERE trigger_schema = 'db1';
trigger_name trigger_name
SHOW CREATE TRIGGER db1.trg; SHOW CREATE TRIGGER db1.trg;
ERROR 42000: Access denied; you need the TRIGGER privilege for this operation ERROR 42000: Access denied; you need (at least one of) the TRIGGER privilege(s) for this operation
DROP USER 'no_rights'@'localhost'; DROP USER 'no_rights'@'localhost';
DROP DATABASE db1; DROP DATABASE db1;
End of 5.1 tests. End of 5.1 tests.

12
mysql-test/r/view_grant.result
View File

@ -16,7 +16,7 @@ create table mysqltest.t2 (a int, b int);
grant select on mysqltest.t1 to mysqltest_1@localhost; grant select on mysqltest.t1 to mysqltest_1@localhost;
grant create view,select on test.* to mysqltest_1@localhost; grant create view,select on test.* to mysqltest_1@localhost;
create definer=root@localhost view v1 as select * from mysqltest.t1; create definer=root@localhost view v1 as select * from mysqltest.t1;
ERROR 42000: Access denied; you need the SUPER privilege for this operation ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
create view v1 as select * from mysqltest.t1; create view v1 as select * from mysqltest.t1;
alter view v1 as select * from mysqltest.t1; alter view v1 as select * from mysqltest.t1;
ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table 'v1' ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table 'v1'
@ -779,11 +779,11 @@ GRANT CREATE VIEW ON db26813.v2 TO u26813@localhost;
GRANT DROP, CREATE VIEW ON db26813.v3 TO u26813@localhost; GRANT DROP, CREATE VIEW ON db26813.v3 TO u26813@localhost;
GRANT SELECT ON db26813.t1 TO u26813@localhost; GRANT SELECT ON db26813.t1 TO u26813@localhost;
ALTER VIEW v1 AS SELECT f2 FROM t1; ALTER VIEW v1 AS SELECT f2 FROM t1;
ERROR 42000: Access denied; you need the SUPER privilege for this operation ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
ALTER VIEW v2 AS SELECT f2 FROM t1; ALTER VIEW v2 AS SELECT f2 FROM t1;
ERROR 42000: Access denied; you need the SUPER privilege for this operation ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
ALTER VIEW v3 AS SELECT f2 FROM t1; ALTER VIEW v3 AS SELECT f2 FROM t1;
ERROR 42000: Access denied; you need the SUPER privilege for this operation ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
SHOW CREATE VIEW v3; SHOW CREATE VIEW v3;
View Create View character_set_client collation_connection View Create View character_set_client collation_connection
v3 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select `t1`.`f1` AS `f1` from `t1` latin1 latin1_swedish_ci v3 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select `t1`.`f1` AS `f1` from `t1` latin1 latin1_swedish_ci
@ -807,9 +807,9 @@ GRANT DROP, CREATE VIEW ON mysqltest_29908.v1 TO u29908_2@localhost;
GRANT DROP, CREATE VIEW, SHOW VIEW ON mysqltest_29908.v2 TO u29908_2@localhost; GRANT DROP, CREATE VIEW, SHOW VIEW ON mysqltest_29908.v2 TO u29908_2@localhost;
GRANT SELECT ON mysqltest_29908.t1 TO u29908_2@localhost; GRANT SELECT ON mysqltest_29908.t1 TO u29908_2@localhost;
ALTER VIEW v1 AS SELECT f2 FROM t1; ALTER VIEW v1 AS SELECT f2 FROM t1;
ERROR 42000: Access denied; you need the SUPER privilege for this operation ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
ALTER VIEW v2 AS SELECT f2 FROM t1; ALTER VIEW v2 AS SELECT f2 FROM t1;
ERROR 42000: Access denied; you need the SUPER privilege for this operation ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
SHOW CREATE VIEW v2; SHOW CREATE VIEW v2;
View Create View character_set_client collation_connection View Create View character_set_client collation_connection
v2 CREATE ALGORITHM=UNDEFINED DEFINER=`u29908_1`@`localhost` SQL SECURITY INVOKER VIEW `v2` AS select `t1`.`f1` AS `f1` from `t1` latin1 latin1_swedish_ci v2 CREATE ALGORITHM=UNDEFINED DEFINER=`u29908_1`@`localhost` SQL SECURITY INVOKER VIEW `v2` AS select `t1`.`f1` AS `f1` from `t1` latin1 latin1_swedish_ci

6
mysql-test/suite/binlog/r/binlog_grant.result
View File

@ -13,16 +13,16 @@ set session sql_log_bin = 1;
set global sql_log_bin = 1; set global sql_log_bin = 1;
ERROR HY000: Variable 'sql_log_bin' is a SESSION variable and can't be used with SET GLOBAL ERROR HY000: Variable 'sql_log_bin' is a SESSION variable and can't be used with SET GLOBAL
set session sql_log_bin = 1; set session sql_log_bin = 1;
ERROR 42000: Access denied; you need the SUPER privilege for this operation ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
**** Variable BINLOG_FORMAT **** **** Variable BINLOG_FORMAT ****
[root] [root]
set global binlog_format = row; set global binlog_format = row;
set session binlog_format = row; set session binlog_format = row;
[plain] [plain]
set global binlog_format = row; set global binlog_format = row;
ERROR 42000: Access denied; you need the SUPER privilege for this operation ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
set session binlog_format = row; set session binlog_format = row;
ERROR 42000: Access denied; you need the SUPER privilege for this operation ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
**** Clean up **** **** Clean up ****
set global binlog_format = @saved_binlog_format; set global binlog_format = @saved_binlog_format;
drop user mysqltest_1@localhost; drop user mysqltest_1@localhost;

8
mysql-test/suite/federated/federated_server.result
View File

@ -197,13 +197,13 @@ select * from federated.t1;
id name id name
1 this is legitimate 1 this is legitimate
alter server s1 options (database 'db_bogus'); alter server s1 options (database 'db_bogus');
ERROR 42000: Access denied; you need the SUPER privilege for this operation ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
flush tables; flush tables;
select * from federated.t1; select * from federated.t1;
id name id name
1 this is legitimate 1 this is legitimate
alter server s1 options (database 'db_bogus'); alter server s1 options (database 'db_bogus');
ERROR 42000: Access denied; you need the SUPER privilege for this operation ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
flush tables; flush tables;
select * from federated.t1; select * from federated.t1;
id name id name
@ -214,7 +214,7 @@ select * from federated.t1;
id name id name
2 this is bogus 2 this is bogus
drop server if exists 's1'; drop server if exists 's1';
ERROR 42000: Access denied; you need the SUPER privilege for this operation ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
create server 's1' foreign data wrapper 'mysql' options create server 's1' foreign data wrapper 'mysql' options
(HOST '127.0.0.1', (HOST '127.0.0.1',
DATABASE 'db_legitimate', DATABASE 'db_legitimate',
@ -223,7 +223,7 @@ PASSWORD '',
PORT SLAVE_PORT, PORT SLAVE_PORT,
SOCKET '', SOCKET '',
OWNER 'root'); OWNER 'root');
ERROR 42000: Access denied; you need the SUPER privilege for this operation ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
drop server 's1'; drop server 's1';
create server 's1' foreign data wrapper 'mysql' options create server 's1' foreign data wrapper 'mysql' options
(HOST '127.0.0.1', (HOST '127.0.0.1',

4
mysql-test/suite/funcs_1/r/innodb_trig_03e.result
View File

@ -1251,7 +1251,7 @@ drop trigger trg1_0;
create definer=not_ex_user@localhost trigger trg1_0 create definer=not_ex_user@localhost trigger trg1_0
before INSERT on t1 for each row before INSERT on t1 for each row
set new.f1 = 'trig 1_0-yes'; set new.f1 = 'trig 1_0-yes';
ERROR 42000: Access denied; you need the SUPER privilege for this operation ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
create definer=current_user trigger trg1_1 create definer=current_user trigger trg1_1
before INSERT on t1 for each row before INSERT on t1 for each row
set new.f1 = 'trig 1_1-yes'; set new.f1 = 'trig 1_1-yes';
@ -1284,7 +1284,7 @@ GRANT SELECT, INSERT, UPDATE, TRIGGER ON `priv_db`.`t1` TO 'test_yesprivs'@'loca
create definer=not_ex_user@localhost trigger trg1_3 create definer=not_ex_user@localhost trigger trg1_3
after UPDATE on t1 for each row after UPDATE on t1 for each row
set @var1 = 'trig 1_3-yes'; set @var1 = 'trig 1_3-yes';
ERROR 42000: Access denied; you need the SUPER privilege for this operation ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
select current_user; select current_user;
current_user current_user
root@localhost root@localhost

4
mysql-test/suite/funcs_1/r/memory_trig_03e.result
View File

@ -1252,7 +1252,7 @@ drop trigger trg1_0;
create definer=not_ex_user@localhost trigger trg1_0 create definer=not_ex_user@localhost trigger trg1_0
before INSERT on t1 for each row before INSERT on t1 for each row
set new.f1 = 'trig 1_0-yes'; set new.f1 = 'trig 1_0-yes';
ERROR 42000: Access denied; you need the SUPER privilege for this operation ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
create definer=current_user trigger trg1_1 create definer=current_user trigger trg1_1
before INSERT on t1 for each row before INSERT on t1 for each row
set new.f1 = 'trig 1_1-yes'; set new.f1 = 'trig 1_1-yes';
@ -1285,7 +1285,7 @@ GRANT SELECT, INSERT, UPDATE, TRIGGER ON `priv_db`.`t1` TO 'test_yesprivs'@'loca
create definer=not_ex_user@localhost trigger trg1_3 create definer=not_ex_user@localhost trigger trg1_3
after UPDATE on t1 for each row after UPDATE on t1 for each row
set @var1 = 'trig 1_3-yes'; set @var1 = 'trig 1_3-yes';
ERROR 42000: Access denied; you need the SUPER privilege for this operation ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
select current_user; select current_user;
current_user current_user
root@localhost root@localhost

4
mysql-test/suite/funcs_1/r/myisam_trig_03e.result
View File

@ -1252,7 +1252,7 @@ drop trigger trg1_0;
create definer=not_ex_user@localhost trigger trg1_0 create definer=not_ex_user@localhost trigger trg1_0
before INSERT on t1 for each row before INSERT on t1 for each row
set new.f1 = 'trig 1_0-yes'; set new.f1 = 'trig 1_0-yes';
ERROR 42000: Access denied; you need the SUPER privilege for this operation ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
create definer=current_user trigger trg1_1 create definer=current_user trigger trg1_1
before INSERT on t1 for each row before INSERT on t1 for each row
set new.f1 = 'trig 1_1-yes'; set new.f1 = 'trig 1_1-yes';
@ -1285,7 +1285,7 @@ GRANT SELECT, INSERT, UPDATE, TRIGGER ON `priv_db`.`t1` TO 'test_yesprivs'@'loca
create definer=not_ex_user@localhost trigger trg1_3 create definer=not_ex_user@localhost trigger trg1_3
after UPDATE on t1 for each row after UPDATE on t1 for each row
set @var1 = 'trig 1_3-yes'; set @var1 = 'trig 1_3-yes';
ERROR 42000: Access denied; you need the SUPER privilege for this operation ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
select current_user; select current_user;
current_user current_user
root@localhost root@localhost

4
mysql-test/suite/funcs_1/r/ndb_trig_03e.result
View File

@ -1251,7 +1251,7 @@ drop trigger trg1_0;
create definer=not_ex_user@localhost trigger trg1_0 create definer=not_ex_user@localhost trigger trg1_0
before INSERT on t1 for each row before INSERT on t1 for each row
set new.f1 = 'trig 1_0-yes'; set new.f1 = 'trig 1_0-yes';
ERROR 42000: Access denied; you need the SUPER privilege for this operation ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
create definer=current_user trigger trg1_1 create definer=current_user trigger trg1_1
before INSERT on t1 for each row before INSERT on t1 for each row
set new.f1 = 'trig 1_1-yes'; set new.f1 = 'trig 1_1-yes';
@ -1284,7 +1284,7 @@ GRANT SELECT, INSERT, UPDATE, TRIGGER ON `priv_db`.`t1` TO 'test_yesprivs'@'loca
create definer=not_ex_user@localhost trigger trg1_3 create definer=not_ex_user@localhost trigger trg1_3
after UPDATE on t1 for each row after UPDATE on t1 for each row
set @var1 = 'trig 1_3-yes'; set @var1 = 'trig 1_3-yes';
ERROR 42000: Access denied; you need the SUPER privilege for this operation ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
select current_user; select current_user;
current_user current_user
root@localhost root@localhost

4
mysql-test/suite/rpl/r/rpl_temporary.result
View File

@ -27,12 +27,12 @@ Warning 1265 Data truncated for column 'b' at row 1
DROP TABLE t1; DROP TABLE t1;
SET @save_select_limit=@@session.sql_select_limit; SET @save_select_limit=@@session.sql_select_limit;
SET @@session.sql_select_limit=10, @@session.pseudo_thread_id=100; SET @@session.sql_select_limit=10, @@session.pseudo_thread_id=100;
ERROR 42000: Access denied; you need the SUPER privilege for this operation ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
SELECT @@session.sql_select_limit = @save_select_limit; SELECT @@session.sql_select_limit = @save_select_limit;
@@session.sql_select_limit = @save_select_limit @@session.sql_select_limit = @save_select_limit
1 1
SET @@session.sql_select_limit=10, @@session.sql_log_bin=0; SET @@session.sql_select_limit=10, @@session.sql_log_bin=0;
ERROR 42000: Access denied; you need the SUPER privilege for this operation ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
SELECT @@session.sql_select_limit = @save_select_limit; SELECT @@session.sql_select_limit = @save_select_limit;
@@session.sql_select_limit = @save_select_limit @@session.sql_select_limit = @save_select_limit
1 1

2
mysql-test/suite/sys_vars/r/read_only_func.result
View File

@ -20,7 +20,7 @@ id name
CREATE user sameea; CREATE user sameea;
** Connecting connn using username 'sameea' ** ** Connecting connn using username 'sameea' **
SET Global read_ONLY=ON; SET Global read_ONLY=ON;
ERROR 42000: Access denied; you need the SUPER privilege for this operation ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
CREATE TABLE t2 CREATE TABLE t2
( (
id INT NOT NULL auto_increment, id INT NOT NULL auto_increment,