From 90e2ad95959870e537d40040d926f55333182722 Mon Sep 17 00:00:00 2001 From: Sergey Glukhov Date: Mon, 26 Oct 2009 11:35:20 +0400 Subject: [PATCH] Bug#35427 INFORMATION_SCHEMA.TABLES.TABLE_CATALOG is NULL, should be "def" additional fix(Betony) --- .../suite/funcs_1/r/is_user_privileges.result | 83 +------------------ .../suite/funcs_1/t/is_user_privileges.test | 4 +- 2 files changed, 3 insertions(+), 84 deletions(-) diff --git a/mysql-test/suite/funcs_1/r/is_user_privileges.result b/mysql-test/suite/funcs_1/r/is_user_privileges.result index f717d286c69..1dc9694180e 100644 --- a/mysql-test/suite/funcs_1/r/is_user_privileges.result +++ b/mysql-test/suite/funcs_1/r/is_user_privileges.result @@ -48,89 +48,8 @@ PRIVILEGE_TYPE varchar(64) NO IS_GRANTABLE varchar(3) NO SELECT grantee, table_catalog, privilege_type FROM information_schema.user_privileges -WHERE table_catalog IS NOT NULL; +WHERE table_catalog IS NULL OR table_catalog <> 'def'; grantee table_catalog privilege_type -'root'@'localhost' def SELECT -'root'@'localhost' def INSERT -'root'@'localhost' def UPDATE -'root'@'localhost' def DELETE -'root'@'localhost' def CREATE -'root'@'localhost' def DROP -'root'@'localhost' def RELOAD -'root'@'localhost' def SHUTDOWN -'root'@'localhost' def PROCESS -'root'@'localhost' def FILE -'root'@'localhost' def REFERENCES -'root'@'localhost' def INDEX -'root'@'localhost' def ALTER -'root'@'localhost' def SHOW DATABASES -'root'@'localhost' def SUPER -'root'@'localhost' def CREATE TEMPORARY TABLES -'root'@'localhost' def LOCK TABLES -'root'@'localhost' def EXECUTE -'root'@'localhost' def REPLICATION SLAVE -'root'@'localhost' def REPLICATION CLIENT -'root'@'localhost' def CREATE VIEW -'root'@'localhost' def SHOW VIEW -'root'@'localhost' def CREATE ROUTINE -'root'@'localhost' def ALTER ROUTINE -'root'@'localhost' def CREATE USER -'root'@'localhost' def EVENT -'root'@'localhost' def TRIGGER -'root'@'gluh' def SELECT -'root'@'gluh' def INSERT -'root'@'gluh' def UPDATE -'root'@'gluh' def DELETE -'root'@'gluh' def CREATE -'root'@'gluh' def DROP -'root'@'gluh' def RELOAD -'root'@'gluh' def SHUTDOWN -'root'@'gluh' def PROCESS -'root'@'gluh' def FILE -'root'@'gluh' def REFERENCES -'root'@'gluh' def INDEX -'root'@'gluh' def ALTER -'root'@'gluh' def SHOW DATABASES -'root'@'gluh' def SUPER -'root'@'gluh' def CREATE TEMPORARY TABLES -'root'@'gluh' def LOCK TABLES -'root'@'gluh' def EXECUTE -'root'@'gluh' def REPLICATION SLAVE -'root'@'gluh' def REPLICATION CLIENT -'root'@'gluh' def CREATE VIEW -'root'@'gluh' def SHOW VIEW -'root'@'gluh' def CREATE ROUTINE -'root'@'gluh' def ALTER ROUTINE -'root'@'gluh' def CREATE USER -'root'@'gluh' def EVENT -'root'@'gluh' def TRIGGER -'root'@'127.0.0.1' def SELECT -'root'@'127.0.0.1' def INSERT -'root'@'127.0.0.1' def UPDATE -'root'@'127.0.0.1' def DELETE -'root'@'127.0.0.1' def CREATE -'root'@'127.0.0.1' def DROP -'root'@'127.0.0.1' def RELOAD -'root'@'127.0.0.1' def SHUTDOWN -'root'@'127.0.0.1' def PROCESS -'root'@'127.0.0.1' def FILE -'root'@'127.0.0.1' def REFERENCES -'root'@'127.0.0.1' def INDEX -'root'@'127.0.0.1' def ALTER -'root'@'127.0.0.1' def SHOW DATABASES -'root'@'127.0.0.1' def SUPER -'root'@'127.0.0.1' def CREATE TEMPORARY TABLES -'root'@'127.0.0.1' def LOCK TABLES -'root'@'127.0.0.1' def EXECUTE -'root'@'127.0.0.1' def REPLICATION SLAVE -'root'@'127.0.0.1' def REPLICATION CLIENT -'root'@'127.0.0.1' def CREATE VIEW -'root'@'127.0.0.1' def SHOW VIEW -'root'@'127.0.0.1' def CREATE ROUTINE -'root'@'127.0.0.1' def ALTER ROUTINE -'root'@'127.0.0.1' def CREATE USER -'root'@'127.0.0.1' def EVENT -'root'@'127.0.0.1' def TRIGGER ########################################################################## # Testcases 3.2.16.2+3.2.16.3+3.2.16.4: INFORMATION_SCHEMA.USER_PRIVILEGES # accessible information diff --git a/mysql-test/suite/funcs_1/t/is_user_privileges.test b/mysql-test/suite/funcs_1/t/is_user_privileges.test index 1d0d3e51aae..253323af9a7 100644 --- a/mysql-test/suite/funcs_1/t/is_user_privileges.test +++ b/mysql-test/suite/funcs_1/t/is_user_privileges.test @@ -58,10 +58,10 @@ eval SHOW COLUMNS FROM information_schema.$is_table; # Note: Retrieval of information within information_schema.columns about # information_schema.user_privileges is in is_columns_is.test. -# Show that TABLE_CATALOG is always NULL. +# Show that TABLE_CATALOG is always 'def'. SELECT grantee, table_catalog, privilege_type FROM information_schema.user_privileges -WHERE table_catalog IS NOT NULL; +WHERE table_catalog IS NULL OR table_catalog <> 'def'; --echo ##########################################################################