MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:He Zhenxing Date:May 21 2009 6:25am
Subject:bzr commit into mysql-6.0-rpl branch (zhenxing.he:2857) Bug#34227
View as plain text  
#At file:///media/sdb2/hezx/work/mysql/bzrwork/b34227/6.0-rpl/ based on revid:zhenxing.he@stripped

 2857 He Zhenxing	2009-05-21
      Post fix of result files after push of BUG#34227

    M  mysql-test/r/debug_sync.result
    M  mysql-test/r/events_bugs.result
    M  mysql-test/r/grant2.result
    M  mysql-test/r/information_schema_db.result
    M  mysql-test/r/sp-security.result
    M  mysql-test/r/trigger_notembedded.result
    M  mysql-test/r/view_grant.result
    M  mysql-test/suite/backup/r/backup_security.result
    M  mysql-test/suite/binlog/r/binlog_grant.result
    M  mysql-test/suite/falcon/r/falcon_tablespace_priv.result
    M  mysql-test/suite/federated/federated_server.result
    M  mysql-test/suite/funcs_1/r/falcon_trig_03e.result
    M  mysql-test/suite/funcs_1/r/innodb_trig_03e.result
    M  mysql-test/suite/funcs_1/r/memory_trig_03e.result
    M  mysql-test/suite/funcs_1/r/myisam_trig_03e.result
    M  mysql-test/suite/funcs_1/r/ndb_trig_03e.result
    M  mysql-test/suite/rpl/r/rpl_temporary.result
    M  mysql-test/suite/sys_vars/r/read_only_func.result
=== modified file 'mysql-test/r/debug_sync.result'
--- a/mysql-test/r/debug_sync.result	2009-03-18 21:09:40 +0000
+++ b/mysql-test/r/debug_sync.result	2009-05-21 06:25:17 +0000
@@ -228,7 +228,7 @@ GRANT ALL ON *.* TO mysqltest_2@localhos
 REVOKE SUPER ON *.* FROM mysqltest_2@localhost;
 connection con1, mysqltest_2
 SET DEBUG_SYNC= 'RESET';
-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
 DROP USER mysqltest_2@localhost;
 SET DEBUG_SYNC= 'RESET';

=== modified file 'mysql-test/r/events_bugs.result'
--- a/mysql-test/r/events_bugs.result	2009-03-11 21:22:33 +0000
+++ b/mysql-test/r/events_bugs.result	2009-05-21 06:25:17 +0000
@@ -375,7 +375,7 @@ SELECT event_name, definer FROM INFORMAT
 event_name	definer
 e1	mysqltest_u1@localhost
 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;
 event_name	definer
 e1	mysqltest_u1@localhost
@@ -386,7 +386,7 @@ event_name	definer
 e1	mysqltest_u1@localhost
 DROP EVENT e1;
 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;
 ERROR HY000: Unknown event 'e1'
 DROP USER mysqltest_u1@localhost;

=== modified file 'mysql-test/r/grant2.result'
--- a/mysql-test/r/grant2.result	2009-02-27 08:20:47 +0000
+++ b/mysql-test/r/grant2.result	2009-05-21 06:25:17 +0000
@@ -121,9 +121,9 @@ mysqltest_5@host5, mysqltest_6@host6, my
 create database mysqltest_1;
 grant select, insert, update on `mysqltest\_1`.* to mysqltest_1@localhost;
 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;
-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.db where user like 'mysqltest\_1';
 drop database mysqltest_1;

=== modified file 'mysql-test/r/information_schema_db.result'
--- a/mysql-test/r/information_schema_db.result	2009-02-25 12:42:06 +0000
+++ b/mysql-test/r/information_schema_db.result	2009-05-21 06:25:17 +0000
@@ -124,7 +124,7 @@ grant insert on v1 to testdb_2@localhost
 create view v5 as select f1 from t1;
 grant select, show view on v5 to testdb_2@localhost;
 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;
 create view v6 as select f1 from t1;
 grant select, show view on v6 to testdb_2@localhost;

=== modified file 'mysql-test/r/sp-security.result'
--- a/mysql-test/r/sp-security.result	2009-03-06 14:56:17 +0000
+++ b/mysql-test/r/sp-security.result	2009-05-21 06:25:17 +0000
@@ -349,9 +349,9 @@ CREATE FUNCTION wl2897_f1() RETURNS INT 
 ---> connection: mysqltest_1_con
 USE mysqltest;
 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;
-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
 use mysqltest;

=== modified file 'mysql-test/r/trigger_notembedded.result'
--- a/mysql-test/r/trigger_notembedded.result	2009-02-16 14:47:53 +0000
+++ b/mysql-test/r/trigger_notembedded.result	2009-05-21 06:25:17 +0000
@@ -117,7 +117,7 @@ CREATE DEFINER='mysqltest_inv'@'localhos
   TRIGGER trg1 BEFORE INSERT ON t1
 FOR EACH ROW
 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
 use mysqltest_db1;

=== modified file 'mysql-test/r/view_grant.result'
--- a/mysql-test/r/view_grant.result	2009-03-06 20:33:52 +0000
+++ b/mysql-test/r/view_grant.result	2009-05-21 06:25:17 +0000
@@ -16,7 +16,7 @@ create table mysqltest.t2 (a int, b int)
 grant select on mysqltest.t1 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;
-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;
 alter view v1 as select * from mysqltest.t1;
 ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table 'v1'
@@ -783,7 +783,7 @@ ERROR 42000: CREATE VIEW command denied 
 ALTER VIEW v2 AS SELECT f2 FROM t1;
 ERROR 42000: DROP command denied to user 'u26813'@'localhost' for table 'v2'
 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;
 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
@@ -807,9 +807,9 @@ GRANT DROP, CREATE VIEW ON mysqltest_299
 GRANT DROP, CREATE VIEW, SHOW VIEW ON mysqltest_29908.v2 TO u29908_2@localhost;
 GRANT SELECT ON mysqltest_29908.t1 TO u29908_2@localhost;
 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;
-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 v1 AS SELECT f2 FROM t1;
 ALTER VIEW v2 AS SELECT f2 FROM t1;
 ALTER VIEW v1 AS SELECT f1 FROM t1;

=== modified file 'mysql-test/suite/backup/r/backup_security.result'
--- a/mysql-test/suite/backup/r/backup_security.result	2008-12-10 23:50:10 +0000
+++ b/mysql-test/suite/backup/r/backup_security.result	2009-05-21 06:25:17 +0000
@@ -24,16 +24,16 @@ backup_id
 default: Connect as user with no rights and attempt backup and restore.
 no_rights: Attempting backup. Should fail with error 1227
 BACKUP DATABASE backup_test to 'bup_no_rights.bak';
-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 ERRORS;
 Level	Code	Message
-Error	1227	Access denied; you need the SUPER privilege for this operation
+Error	1227	Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 no_rights: Attempting restore. Should fail with error 1227
 RESTORE FROM 'bup_no_rights.bak';
-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 ERRORS;
 Level	Code	Message
-Error	1227	Access denied; you need the SUPER privilege for this operation
+Error	1227	Access denied; you need (at least one of) the SUPER privilege(s) for this operation
 SELECT * FROM backup_test.t1;
 a
 01 Test #1 - super privilege

=== modified file 'mysql-test/suite/binlog/r/binlog_grant.result'
--- a/mysql-test/suite/binlog/r/binlog_grant.result	2008-09-09 10:19:31 +0000
+++ b/mysql-test/suite/binlog/r/binlog_grant.result	2009-05-21 06:25:17 +0000
@@ -13,16 +13,16 @@ set session 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
 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 ****
 [root]
 set global binlog_format = row;
 set session binlog_format = row;
 [plain]
 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;
-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 ****
 set global binlog_format = @saved_binlog_format;
 drop user mysqltest_1@localhost;

=== modified file 'mysql-test/suite/falcon/r/falcon_tablespace_priv.result'
--- a/mysql-test/suite/falcon/r/falcon_tablespace_priv.result	2008-08-05 14:14:11 +0000
+++ b/mysql-test/suite/falcon/r/falcon_tablespace_priv.result	2009-05-21 06:25:17 +0000
@@ -31,12 +31,12 @@ GRANT SUPER ON *.* TO 'mysqltest_u2'@'lo
 CREATE TABLESPACE ts1
 ADD DATAFILE 'datafile.dat'
 ENGINE = Falcon;
-ERROR 42000: Access denied; you need the CREATE TABLESPACE privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the CREATE TABLESPACE privilege(s) for this operation
 
 # -- Check DROP TABLESPACE...
 DROP TABLESPACE ts1 
 ENGINE = Falcon;
-ERROR 42000: Access denied; you need the CREATE TABLESPACE privilege for this operation
+ERROR 42000: Access denied; you need (at least one of) the CREATE TABLESPACE privilege(s) for this operation
 
 # -- Connection: root@localhost
 

=== modified file 'mysql-test/suite/federated/federated_server.result'
--- a/mysql-test/suite/federated/federated_server.result	2009-02-02 11:36:03 +0000
+++ b/mysql-test/suite/federated/federated_server.result	2009-05-21 06:25:17 +0000
@@ -197,13 +197,13 @@ select * from federated.t1;
 id	name
 1	this is legitimate
 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;
 select * from federated.t1;
 id	name
 1	this is legitimate
 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;
 select * from federated.t1;
 id	name
@@ -214,7 +214,7 @@ select * from federated.t1;
 id	name
 2	this is bogus
 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
 (HOST '127.0.0.1',
 DATABASE 'db_legitimate',
@@ -223,7 +223,7 @@ PASSWORD '',
 PORT SLAVE_PORT,
 SOCKET '',
 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';
 create server 's1' foreign data wrapper 'mysql' options
 (HOST '127.0.0.1',

=== modified file 'mysql-test/suite/funcs_1/r/falcon_trig_03e.result'
--- a/mysql-test/suite/funcs_1/r/falcon_trig_03e.result	2008-08-07 13:38:29 +0000
+++ b/mysql-test/suite/funcs_1/r/falcon_trig_03e.result	2009-05-21 06:25:17 +0000
@@ -1251,7 +1251,7 @@ drop trigger trg1_0;
 create definer=not_ex_user@localhost trigger trg1_0
 before INSERT on t1 for each row
 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
 before INSERT on t1 for each row
 set new.f1 = 'trig 1_1-yes';
@@ -1284,7 +1284,7 @@ GRANT SELECT, INSERT, UPDATE, TRIGGER ON
 create definer=not_ex_user@localhost trigger trg1_3
 after UPDATE on t1 for each row
 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;
 current_user
 root@localhost

=== modified file 'mysql-test/suite/funcs_1/r/innodb_trig_03e.result'
--- a/mysql-test/suite/funcs_1/r/innodb_trig_03e.result	2008-08-07 13:38:29 +0000
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_03e.result	2009-05-21 06:25:17 +0000
@@ -1251,7 +1251,7 @@ drop trigger trg1_0;
 create definer=not_ex_user@localhost trigger trg1_0
 before INSERT on t1 for each row
 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
 before INSERT on t1 for each row
 set new.f1 = 'trig 1_1-yes';
@@ -1284,7 +1284,7 @@ GRANT SELECT, INSERT, UPDATE, TRIGGER ON
 create definer=not_ex_user@localhost trigger trg1_3
 after UPDATE on t1 for each row
 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;
 current_user
 root@localhost

=== modified file 'mysql-test/suite/funcs_1/r/memory_trig_03e.result'
--- a/mysql-test/suite/funcs_1/r/memory_trig_03e.result	2008-08-07 13:38:29 +0000
+++ b/mysql-test/suite/funcs_1/r/memory_trig_03e.result	2009-05-21 06:25:17 +0000
@@ -1252,7 +1252,7 @@ drop trigger trg1_0;
 create definer=not_ex_user@localhost trigger trg1_0
 before INSERT on t1 for each row
 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
 before INSERT on t1 for each row
 set new.f1 = 'trig 1_1-yes';
@@ -1285,7 +1285,7 @@ GRANT SELECT, INSERT, UPDATE, TRIGGER ON
 create definer=not_ex_user@localhost trigger trg1_3
 after UPDATE on t1 for each row
 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;
 current_user
 root@localhost

=== modified file 'mysql-test/suite/funcs_1/r/myisam_trig_03e.result'
--- a/mysql-test/suite/funcs_1/r/myisam_trig_03e.result	2008-08-07 13:38:29 +0000
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_03e.result	2009-05-21 06:25:17 +0000
@@ -1252,7 +1252,7 @@ drop trigger trg1_0;
 create definer=not_ex_user@localhost trigger trg1_0
 before INSERT on t1 for each row
 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
 before INSERT on t1 for each row
 set new.f1 = 'trig 1_1-yes';
@@ -1285,7 +1285,7 @@ GRANT SELECT, INSERT, UPDATE, TRIGGER ON
 create definer=not_ex_user@localhost trigger trg1_3
 after UPDATE on t1 for each row
 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;
 current_user
 root@localhost

=== modified file 'mysql-test/suite/funcs_1/r/ndb_trig_03e.result'
--- a/mysql-test/suite/funcs_1/r/ndb_trig_03e.result	2008-08-16 05:15:49 +0000
+++ b/mysql-test/suite/funcs_1/r/ndb_trig_03e.result	2009-05-21 06:25:17 +0000
@@ -1251,7 +1251,7 @@ drop trigger trg1_0;
 create definer=not_ex_user@localhost trigger trg1_0
 before INSERT on t1 for each row
 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
 before INSERT on t1 for each row
 set new.f1 = 'trig 1_1-yes';
@@ -1284,7 +1284,7 @@ GRANT SELECT, INSERT, UPDATE, TRIGGER ON
 create definer=not_ex_user@localhost trigger trg1_3
 after UPDATE on t1 for each row
 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;
 current_user
 root@localhost

=== modified file 'mysql-test/suite/rpl/r/rpl_temporary.result'
--- a/mysql-test/suite/rpl/r/rpl_temporary.result	2009-03-27 12:20:39 +0000
+++ b/mysql-test/suite/rpl/r/rpl_temporary.result	2009-05-21 06:25:17 +0000
@@ -8,12 +8,12 @@ call mtr.add_suppression("Slave: Can\'t 
 reset master;
 SET @save_select_limit=@@session.sql_select_limit;
 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;
 @@session.sql_select_limit = @save_select_limit
 1
 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;
 @@session.sql_select_limit = @save_select_limit
 1

=== modified file 'mysql-test/suite/sys_vars/r/read_only_func.result'
--- a/mysql-test/suite/sys_vars/r/read_only_func.result	2008-12-19 15:12:15 +0000
+++ b/mysql-test/suite/sys_vars/r/read_only_func.result	2009-05-21 06:25:17 +0000
@@ -20,7 +20,7 @@ id	name
 CREATE user sameea;
 ** Connecting connn using username 'sameea' **
 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
 (
 id INT NOT NULL auto_increment,


Attachment: [text/bzr-bundle] bzr/zhenxing.he@sun.com-20090521062517-g5pj4s70px23wtnh.bundle
Thread
bzr commit into mysql-6.0-rpl branch (zhenxing.he:2857) Bug#34227He Zhenxing21 May