From dfdcaf5f01864d46b9ee95bd3c8c8e34887618dc Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 29 Oct 2007 09:31:13 +0100 Subject: [PATCH] Fix for Bug#31857 funcs_1: a_processlist_priv_no_prot and b_processlist_priv_ps fail Reason for the changes is: WL4007 Deprecate RENAME DATABASE: replace with ALTER DATABASE UPGRADE mysql-test/suite/funcs_1/datadict/datadict_priv.inc: 1. Adjustment to new server response (ER_PARSE_ERROR instead of ER_DBACCESS_DENIED_ERROR) 2. Add missing subtest with ALTER DATABASE ... UPGRADE ... mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result: Updated results mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result: Updated results --- mysql-test/suite/funcs_1/datadict/datadict_priv.inc | 5 ++++- mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result | 4 ++++ mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result | 4 ++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/mysql-test/suite/funcs_1/datadict/datadict_priv.inc b/mysql-test/suite/funcs_1/datadict/datadict_priv.inc index 36143e1526e..8256b51949e 100644 --- a/mysql-test/suite/funcs_1/datadict/datadict_priv.inc +++ b/mysql-test/suite/funcs_1/datadict/datadict_priv.inc @@ -103,5 +103,8 @@ eval CREATE TABLE new_$table AS SELECT * FROM $table; --error ER_DBACCESS_DENIED_ERROR DROP DATABASE information_schema; ---error ER_DBACCESS_DENIED_ERROR +--error ER_PARSE_ERROR RENAME DATABASE information_schema TO info_schema; + +--error ER_DBACCESS_DENIED_ERROR +ALTER DATABASE information_schema UPGRADE DATA DIRECTORY NAME; diff --git a/mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result b/mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result index 13055b5543b..233544ec134 100644 --- a/mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result +++ b/mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result @@ -84,6 +84,8 @@ ERROR 42S02: Unknown table 'new_processlist' in information_schema DROP DATABASE information_schema; ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema' RENAME DATABASE information_schema TO info_schema; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DATABASE information_schema TO info_schema' at line 1 +ALTER DATABASE information_schema UPGRADE DATA DIRECTORY NAME; ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema' #################################################################################### 3 Switch to connection con100 (user=ddicttestuser1 with no PROCESS privilege): @@ -149,6 +151,8 @@ ERROR 42S02: Unknown table 'new_processlist' in information_schema DROP DATABASE information_schema; ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema' RENAME DATABASE information_schema TO info_schema; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DATABASE information_schema TO info_schema' at line 1 +ALTER DATABASE information_schema UPGRADE DATA DIRECTORY NAME; ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema' #################################################################################### 4 Grant PROCESS privilege to ddicttestuser1 diff --git a/mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result b/mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result index b10a6c1a5d2..c37d47eaf97 100644 --- a/mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result +++ b/mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result @@ -84,6 +84,8 @@ ERROR 42S02: Unknown table 'new_processlist' in information_schema DROP DATABASE information_schema; ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema' RENAME DATABASE information_schema TO info_schema; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DATABASE information_schema TO info_schema' at line 1 +ALTER DATABASE information_schema UPGRADE DATA DIRECTORY NAME; ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema' #################################################################################### 3 Switch to connection con100 (user=ddicttestuser1 with no PROCESS privilege): @@ -149,6 +151,8 @@ ERROR 42S02: Unknown table 'new_processlist' in information_schema DROP DATABASE information_schema; ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema' RENAME DATABASE information_schema TO info_schema; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DATABASE information_schema TO info_schema' at line 1 +ALTER DATABASE information_schema UPGRADE DATA DIRECTORY NAME; ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema' #################################################################################### 4 Grant PROCESS privilege to ddicttestuser1