Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/gluh/MySQL/Bugs/5.0.10261

1 files changed, 14 insertions, 0 deletions

diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
index 0aa5e759207..6c8e7a9cf8b 100644
--- a/mysql-test/r/information_schema.result
+++ b/mysql-test/r/information_schema.result
@@ -734,3 +734,17 @@ x_real	NULL	NULL
 x_float	NULL	NULL
 x_double_precision	NULL	NULL
 drop table t1;
+create user mysqltest_4@localhost;
+SELECT TABLE_NAME, COLUMN_NAME, PRIVILEGES FROM INFORMATION_SCHEMA.COLUMNS 
+where COLUMN_NAME='TABLE_NAME';
+TABLE_NAME	COLUMN_NAME	PRIVILEGES
+TABLES	TABLE_NAME	select
+COLUMNS	TABLE_NAME	select
+STATISTICS	TABLE_NAME	select
+VIEWS	TABLE_NAME	select
+TABLE_PRIVILEGES	TABLE_NAME	select
+COLUMN_PRIVILEGES	TABLE_NAME	select
+TABLE_CONSTRAINTS	TABLE_NAME	select
+KEY_COLUMN_USAGE	TABLE_NAME	select
+delete from mysql.user where user='mysqltest_4';
+flush privileges;