#At file:///home/gluh/MySQL/mysql-pe/ based on revid:dao-gang.qu@stripped
3650 Sergey Glukhov 2009-10-28 [merge]
5.1-bugteam->mysql-pe merge
@ mysql-test/suite/backup/r/backup_namecase.result
result fix
@ mysql-test/suite/backup/r/backup_security_check.result
result fix
@ mysql-test/suite/backup/r/backup_table_grants.result
result fix
@ mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn0.result
result fix
@ mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn1.result
result fix
@ mysql-test/suite/funcs_1/r/is_columns_mysql.result
result fix
@ mysql-test/suite/funcs_1/r/is_statistics.result
result fix
modified:
mysql-test/suite/backup/r/backup_namecase.result
mysql-test/suite/backup/r/backup_security.result
mysql-test/suite/backup/r/backup_security_check.result
mysql-test/suite/backup/r/backup_table_grants.result
mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn0.result
mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn1.result
mysql-test/suite/funcs_1/r/is_columns_mysql.result
mysql-test/suite/funcs_1/r/is_statistics.result
=== modified file 'mysql-test/suite/backup/r/backup_namecase.result'
--- a/mysql-test/suite/backup/r/backup_namecase.result 2009-09-03 11:35:02 +0000
+++ b/mysql-test/suite/backup/r/backup_namecase.result 2009-10-28 09:40:30 +0000
@@ -155,8 +155,8 @@ SHOW GRANTS FOR 'user_with_grants'@'%';
Grants for user_with_grants@%
GRANT USAGE ON *.* TO 'user_with_grants'@'%'
GRANT INSERT, UPDATE ON `changecase`.* TO 'user_with_grants'@'%'
-GRANT SELECT ON `changecase`.`v1` TO 'user_with_grants'@'%'
GRANT SELECT ON `changecase`.`t1` TO 'user_with_grants'@'%'
+GRANT SELECT ON `changecase`.`v1` TO 'user_with_grants'@'%'
# Cleanup
=== modified file 'mysql-test/suite/backup/r/backup_security.result'
--- a/mysql-test/suite/backup/r/backup_security.result 2009-07-15 19:19:14 +0000
+++ b/mysql-test/suite/backup/r/backup_security.result 2009-10-28 09:40:30 +0000
@@ -958,8 +958,8 @@ SHOW GRANTS FOR 'bup_full_priv'@'localho
Grants for bup_full_priv@localhost
GRANT USAGE ON *.* TO 'bup_full_priv'@'localhost'
GRANT BACKUP, RESTORE ON `backup_test`.* TO 'bup_full_priv'@'localhost'
-GRANT SELECT, TRIGGER ON `backup_test`.`t2` TO 'bup_full_priv'@'localhost'
GRANT SELECT, TRIGGER ON `backup_test`.`t1` TO 'bup_full_priv'@'localhost'
+GRANT SELECT, TRIGGER ON `backup_test`.`t2` TO 'bup_full_priv'@'localhost'
#
# Connect as user with explicit on database objects and attempt backup.
#
@@ -987,9 +987,9 @@ SHOW GRANTS FOR 'bup_full_priv'@'localho
Grants for bup_full_priv@localhost
GRANT USAGE ON *.* TO 'bup_full_priv'@'localhost'
GRANT BACKUP, RESTORE ON `backup_test`.* TO 'bup_full_priv'@'localhost'
-GRANT SELECT, TRIGGER ON `backup_test`.`t2` TO 'bup_full_priv'@'localhost'
GRANT SELECT, TRIGGER ON `backup_test`.`t1` TO 'bup_full_priv'@'localhost'
GRANT SELECT, SHOW VIEW ON `backup_test`.`v1` TO 'bup_full_priv'@'localhost'
+GRANT SELECT, TRIGGER ON `backup_test`.`t2` TO 'bup_full_priv'@'localhost'
#
# Connect as user with explicit on database objects and attempt backup.
#
@@ -1017,9 +1017,9 @@ SHOW GRANTS FOR 'bup_full_priv'@'localho
Grants for bup_full_priv@localhost
GRANT USAGE ON *.* TO 'bup_full_priv'@'localhost'
GRANT EVENT, BACKUP, RESTORE ON `backup_test`.* TO 'bup_full_priv'@'localhost'
-GRANT SELECT, TRIGGER ON `backup_test`.`t2` TO 'bup_full_priv'@'localhost'
GRANT SELECT, TRIGGER ON `backup_test`.`t1` TO 'bup_full_priv'@'localhost'
GRANT SELECT, SHOW VIEW ON `backup_test`.`v1` TO 'bup_full_priv'@'localhost'
+GRANT SELECT, TRIGGER ON `backup_test`.`t2` TO 'bup_full_priv'@'localhost'
#
# Connect as user with explicit on database objects and attempt backup.
#
@@ -1048,9 +1048,9 @@ Grants for bup_full_priv@localhost
GRANT USAGE ON *.* TO 'bup_full_priv'@'localhost'
GRANT SELECT ON `mysql`.* TO 'bup_full_priv'@'localhost'
GRANT EVENT, BACKUP, RESTORE ON `backup_test`.* TO 'bup_full_priv'@'localhost'
-GRANT SELECT, TRIGGER ON `backup_test`.`t2` TO 'bup_full_priv'@'localhost'
GRANT SELECT, TRIGGER ON `backup_test`.`t1` TO 'bup_full_priv'@'localhost'
GRANT SELECT, SHOW VIEW ON `backup_test`.`v1` TO 'bup_full_priv'@'localhost'
+GRANT SELECT, TRIGGER ON `backup_test`.`t2` TO 'bup_full_priv'@'localhost'
#
# Connect as user with explicit on database objects and attempt backup.
#
=== modified file 'mysql-test/suite/backup/r/backup_security_check.result'
--- a/mysql-test/suite/backup/r/backup_security_check.result 2009-09-03 11:35:02 +0000
+++ b/mysql-test/suite/backup/r/backup_security_check.result 2009-10-28 09:40:30 +0000
@@ -148,11 +148,11 @@ Grants for bup_sec_user1@localhost
GRANT USAGE ON *.* TO 'bup_sec_user1'@'localhost'
GRANT EVENT, BACKUP ON `bup_sec_db1`.* TO 'bup_sec_user1'@'localhost'
GRANT BACKUP ON `bup_sec_db2`.* TO 'bup_sec_user1'@'localhost'
-GRANT SELECT ON `bup_sec_db1`.`t2` TO 'bup_sec_user1'@'localhost'
GRANT SELECT ON `mysql`.`procs_priv` TO 'bup_sec_user1'@'localhost'
+GRANT SELECT, SHOW VIEW ON `bup_sec_db1`.`v1` TO 'bup_sec_user1'@'localhost'
+GRANT SELECT ON `bup_sec_db1`.`t2` TO 'bup_sec_user1'@'localhost'
GRANT SELECT, TRIGGER ON `bup_sec_db2`.`t1` TO 'bup_sec_user1'@'localhost'
GRANT SELECT, TRIGGER ON `bup_sec_db1`.`t1` TO 'bup_sec_user1'@'localhost'
-GRANT SELECT, SHOW VIEW ON `bup_sec_db1`.`v1` TO 'bup_sec_user1'@'localhost'
GRANT EXECUTE ON PROCEDURE `bup_sec_db1`.`p1` TO 'bup_sec_user1'@'localhost'
GRANT EXECUTE ON FUNCTION `bup_sec_db1`.`f1` TO 'bup_sec_user1'@'localhost'
#
@@ -353,11 +353,11 @@ GRANT USAGE ON *.* TO 'bup_sec_user1'@'l
GRANT ALL PRIVILEGES ON `mtr`.* TO 'bup_sec_user1'@'localhost'
GRANT EVENT, BACKUP ON `bup_sec_db1`.* TO 'bup_sec_user1'@'localhost'
GRANT BACKUP ON `bup_sec_db2`.* TO 'bup_sec_user1'@'localhost'
-GRANT SELECT ON `bup_sec_db1`.`t2` TO 'bup_sec_user1'@'localhost'
GRANT SELECT ON `mysql`.`procs_priv` TO 'bup_sec_user1'@'localhost'
+GRANT SELECT, SHOW VIEW ON `bup_sec_db1`.`v1` TO 'bup_sec_user1'@'localhost'
+GRANT SELECT ON `bup_sec_db1`.`t2` TO 'bup_sec_user1'@'localhost'
GRANT SELECT, TRIGGER ON `bup_sec_db2`.`t1` TO 'bup_sec_user1'@'localhost'
GRANT SELECT, TRIGGER ON `bup_sec_db1`.`t1` TO 'bup_sec_user1'@'localhost'
-GRANT SELECT, SHOW VIEW ON `bup_sec_db1`.`v1` TO 'bup_sec_user1'@'localhost'
GRANT EXECUTE ON PROCEDURE `bup_sec_db1`.`p1` TO 'bup_sec_user1'@'localhost'
GRANT EXECUTE ON FUNCTION `bup_sec_db1`.`f1` TO 'bup_sec_user1'@'localhost'
#
=== modified file 'mysql-test/suite/backup/r/backup_table_grants.result'
--- a/mysql-test/suite/backup/r/backup_table_grants.result 2009-08-07 07:50:49 +0000
+++ b/mysql-test/suite/backup/r/backup_table_grants.result 2009-10-28 09:40:30 +0000
@@ -28,8 +28,8 @@ GRANT INSERT ON mysqltest1.t2 TO 'mysqlu
SHOW GRANTS FOR 'mysqluser2';
Grants for mysqluser2@%
GRANT USAGE ON *.* TO 'mysqluser2'@'%'
-GRANT INSERT ON `mysqltest1`.`t2` TO 'mysqluser2'@'%'
GRANT SELECT (col1), UPDATE (col2) ON `mysqltest1`.`t1` TO 'mysqluser2'@'%'
+GRANT INSERT ON `mysqltest1`.`t2` TO 'mysqluser2'@'%'
#
# Drop objects
ALTER TABLE mysqltest1.t1 DROP COLUMN col2;
@@ -42,8 +42,8 @@ GRANT INSERT ON `mysqltest1`.`t2` TO 'my
SHOW GRANTS FOR 'mysqluser2';
Grants for mysqluser2@%
GRANT USAGE ON *.* TO 'mysqluser2'@'%'
-GRANT INSERT ON `mysqltest1`.`t2` TO 'mysqluser2'@'%'
GRANT SELECT (col1), UPDATE (col2) ON `mysqltest1`.`t1` TO 'mysqluser2'@'%'
+GRANT INSERT ON `mysqltest1`.`t2` TO 'mysqluser2'@'%'
#
# Backup
BACKUP DATABASE mysqltest1 TO 'mysqltest1.bak';
@@ -71,8 +71,8 @@ Warning # The grant 'UPDATE(`col2`) ON `
SHOW GRANTS FOR 'mysqluser1';
Grants for mysqluser1@%
GRANT USAGE ON *.* TO 'mysqluser1'@'%'
-GRANT SELECT (col1), UPDATE (col2) ON `mysqltest1`.`t1` TO 'mysqluser1'@'%'
GRANT INSERT ON `mysqltest1`.`t2` TO 'mysqluser1'@'%'
+GRANT SELECT (col1), UPDATE (col2) ON `mysqltest1`.`t1` TO 'mysqluser1'@'%'
SHOW GRANTS FOR 'mysqluser2';
ERROR 42000: There is no such grant defined for user 'mysqluser2' on host '%'
SELECT * FROM t1;
=== modified file 'mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn0.result'
--- a/mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn0.result 2009-08-07 07:50:49 +0000
+++ b/mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn0.result 2009-10-28 09:40:30 +0000
@@ -751,8 +751,8 @@ SHOW GRANTS FOR 'bup_user1'@'%';
Grants for bup_user1@%
GRANT USAGE ON *.* TO 'bup_user1'@'%'
GRANT ALL PRIVILEGES ON `bup_xpfm_compat_db1`.* TO 'bup_user1'@'%'
-GRANT SELECT (c13) ON `BupXPfmCompat_db3`.`TaBle3` TO 'bup_user1'@'%'
GRANT SELECT ON `BUP_XPFM_COMPAT_DB2`.`TABLE2` TO 'bup_user1'@'%'
+GRANT SELECT (c13) ON `BupXPfmCompat_db3`.`TaBle3` TO 'bup_user1'@'%'
GRANT EXECUTE ON PROCEDURE `bup_xpfm_compat_db1`.`proc1` TO 'bup_user1'@'%'
GRANT EXECUTE ON FUNCTION `bup_xpfm_compat_db1`.`func1` TO 'bup_user1'@'%'
SHOW GRANTS FOR 'BUP_USER2';
@@ -761,16 +761,16 @@ GRANT USAGE ON *.* TO 'BUP_USER2'@'%'
GRANT ALL PRIVILEGES ON `BUP_XPFM_COMPAT_DB2`.* TO 'BUP_USER2'@'%'
GRANT SELECT ON `BupXPfmCompat_db3`.`TaBle3` TO 'BUP_USER2'@'%'
GRANT SELECT (c48), INSERT (c48) ON `bup_xpfm_compat_db1`.`table1` TO 'BUP_USER2'@'%'
-GRANT EXECUTE ON PROCEDURE `BUP_XPFM_COMPAT_DB2`.`PROC2` TO 'BUP_USER2'@'%'
-GRANT EXECUTE ON FUNCTION `BUP_XPFM_COMPAT_DB2`.`FUNC2` TO 'BUP_USER2'@'%'
+GRANT EXECUTE ON PROCEDURE `BUP_XPFM_COMPAT_DB2`.`proc2` TO 'BUP_USER2'@'%'
+GRANT EXECUTE ON FUNCTION `BUP_XPFM_COMPAT_DB2`.`func2` TO 'BUP_USER2'@'%'
SHOW GRANTS FOR 'BupUser3'@'%';
Grants for BupUser3@%
GRANT USAGE ON *.* TO 'BupUser3'@'%'
GRANT ALL PRIVILEGES ON `BupXPfmCompat_db3`.* TO 'BupUser3'@'%'
-GRANT SELECT ON `bup_xpfm_compat_db1`.`table1` TO 'BupUser3'@'%'
GRANT INSERT (c13) ON `BUP_XPFM_COMPAT_DB2`.`TABLE2` TO 'BupUser3'@'%'
-GRANT EXECUTE ON PROCEDURE `BupXPfmCompat_db3`.`PrOc3` TO 'BupUser3'@'%'
-GRANT EXECUTE ON FUNCTION `BupXPfmCompat_db3`.`FuNc3` TO 'BupUser3'@'%'
+GRANT SELECT ON `bup_xpfm_compat_db1`.`table1` TO 'BupUser3'@'%'
+GRANT EXECUTE ON PROCEDURE `BupXPfmCompat_db3`.`proc3` TO 'BupUser3'@'%'
+GRANT EXECUTE ON FUNCTION `BupXPfmCompat_db3`.`func3` TO 'BupUser3'@'%'
#
# Show objects.
#
=== modified file 'mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn1.result'
--- a/mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn1.result 2009-08-07 07:50:49 +0000
+++ b/mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn1.result 2009-10-28 09:40:30 +0000
@@ -751,8 +751,8 @@ SHOW GRANTS FOR 'bup_user1'@'%';
Grants for bup_user1@%
GRANT USAGE ON *.* TO 'bup_user1'@'%'
GRANT ALL PRIVILEGES ON `bup_xpfm_compat_db1`.* TO 'bup_user1'@'%'
-GRANT SELECT (c13) ON `bupxpfmcompat_db3`.`table3` TO 'bup_user1'@'%'
GRANT SELECT ON `bup_xpfm_compat_db2`.`table2` TO 'bup_user1'@'%'
+GRANT SELECT (c13) ON `bupxpfmcompat_db3`.`table3` TO 'bup_user1'@'%'
GRANT EXECUTE ON PROCEDURE `bup_xpfm_compat_db1`.`proc1` TO 'bup_user1'@'%'
GRANT EXECUTE ON FUNCTION `bup_xpfm_compat_db1`.`func1` TO 'bup_user1'@'%'
SHOW GRANTS FOR 'BUP_USER2';
@@ -767,8 +767,8 @@ SHOW GRANTS FOR 'BupUser3'@'%';
Grants for BupUser3@%
GRANT USAGE ON *.* TO 'BupUser3'@'%'
GRANT ALL PRIVILEGES ON `bupxpfmcompat_db3`.* TO 'BupUser3'@'%'
-GRANT SELECT ON `bup_xpfm_compat_db1`.`table1` TO 'BupUser3'@'%'
GRANT INSERT (c13) ON `bup_xpfm_compat_db2`.`table2` TO 'BupUser3'@'%'
+GRANT SELECT ON `bup_xpfm_compat_db1`.`table1` TO 'BupUser3'@'%'
GRANT EXECUTE ON PROCEDURE `bupxpfmcompat_db3`.`proc3` TO 'BupUser3'@'%'
GRANT EXECUTE ON FUNCTION `bupxpfmcompat_db3`.`func3` TO 'BupUser3'@'%'
#
=== modified file 'mysql-test/suite/funcs_1/r/is_columns_mysql.result'
--- a/mysql-test/suite/funcs_1/r/is_columns_mysql.result 2009-07-02 11:04:23 +0000
+++ b/mysql-test/suite/funcs_1/r/is_columns_mysql.result 2009-10-28 09:40:30 +0000
@@ -158,7 +158,7 @@ def mysql procs_priv Db 2 NO char 64 19
def mysql procs_priv Grantor 6 NO char 77 231 NULL NULL utf8 utf8_bin char(77) MUL select,insert,update,references Default Default
def mysql procs_priv Host 1 NO char 60 180 NULL NULL utf8 utf8_bin char(60) PRI select,insert,update,references Default Default
def mysql procs_priv Proc_priv 7 NO set 27 81 NULL NULL utf8 utf8_general_ci set('Execute','Alter Routine','Grant') select,insert,update,references Default Default
-def mysql procs_priv Routine_name 4 NO char 64 192 NULL NULL utf8 utf8_bin char(64) PRI select,insert,update,references Default Default
+def mysql procs_priv Routine_name 4 NO char 64 192 NULL NULL utf8 utf8_general_ci char(64) PRI select,insert,update,references Default Default
def mysql procs_priv Routine_type 5 NULL NO enum 9 27 NULL NULL utf8 utf8_bin enum('FUNCTION','PROCEDURE') PRI select,insert,update,references Default Default
def mysql procs_priv Timestamp 8 CURRENT_TIMESTAMP NO timestamp NULL NULL NULL NULL NULL NULL timestamp on update CURRENT_TIMESTAMP select,insert,update,references Default Default
def mysql procs_priv User 3 NO char 16 48 NULL NULL utf8 utf8_bin char(16) PRI select,insert,update,references Default Default
@@ -471,7 +471,7 @@ NULL mysql proc modified timestamp NULL
3.0000 mysql procs_priv Host char 60 180 utf8 utf8_bin char(60)
3.0000 mysql procs_priv Db char 64 192 utf8 utf8_bin char(64)
3.0000 mysql procs_priv User char 16 48 utf8 utf8_bin char(16)
-3.0000 mysql procs_priv Routine_name char 64 192 utf8 utf8_bin char(64)
+3.0000 mysql procs_priv Routine_name char 64 192 utf8 utf8_general_ci char(64)
3.0000 mysql procs_priv Routine_type enum 9 27 utf8 utf8_bin enum('FUNCTION','PROCEDURE')
3.0000 mysql procs_priv Grantor char 77 231 utf8 utf8_bin char(77)
3.0000 mysql procs_priv Proc_priv set 27 81 utf8 utf8_general_ci set('Execute','Alter Routine','Grant')
=== modified file 'mysql-test/suite/funcs_1/r/is_statistics.result'
--- a/mysql-test/suite/funcs_1/r/is_statistics.result 2009-02-16 14:47:53 +0000
+++ b/mysql-test/suite/funcs_1/r/is_statistics.result 2009-10-28 09:40:30 +0000
@@ -219,8 +219,8 @@ def db_datadict_2 t4 0 db_datadict_2 PRI
SHOW GRANTS FOR 'testuser1'@'localhost';
Grants for testuser1@localhost
GRANT USAGE ON *.* TO 'testuser1'@'localhost'
-GRANT SELECT (f5, f1) ON `db_datadict_2`.`t3` TO 'testuser1'@'localhost'
GRANT SELECT ON `db_datadict`.`t1` TO 'testuser1'@'localhost' WITH GRANT OPTION
+GRANT SELECT (f5, f1) ON `db_datadict_2`.`t3` TO 'testuser1'@'localhost'
SHOW GRANTS FOR 'testuser2'@'localhost';
Grants for testuser2@localhost
GRANT USAGE ON *.* TO 'testuser2'@'localhost'
@@ -238,8 +238,8 @@ def db_datadict_2 t3 0 db_datadict_2 PRI
SHOW GRANTS FOR 'testuser1'@'localhost';
Grants for testuser1@localhost
GRANT USAGE ON *.* TO 'testuser1'@'localhost'
-GRANT SELECT (f5, f1) ON `db_datadict_2`.`t3` TO 'testuser1'@'localhost'
GRANT SELECT ON `db_datadict`.`t1` TO 'testuser1'@'localhost' WITH GRANT OPTION
+GRANT SELECT (f5, f1) ON `db_datadict_2`.`t3` TO 'testuser1'@'localhost'
SHOW GRANTS FOR 'testuser2'@'localhost';
ERROR 42000: Access denied for user 'testuser1'@'localhost' to database 'mysql'
# Switch to connection testuser2
Attachment: [text/bzr-bundle] bzr/sergey.glukhov@sun.com-20091028094030-yysuvqc4zuv9yer3.bundle
| Thread |
|---|
| • bzr commit into mysql-pe branch (Sergey.Glukhov:3650) | Sergey Glukhov | 28 Oct |
