Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  mysql.com:/home/alexi/dev/mysql-5.1-wl3148


sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged

3 files changed, 22 insertions, 2 deletions

diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
index daca6a94b0d..9962dfcdb11 100644
--- a/mysql-test/r/information_schema.result
+++ b/mysql-test/r/information_schema.result
@@ -49,6 +49,7 @@ FILES
 KEY_COLUMN_USAGE
 PARTITIONS
 PLUGINS
+PROCESSLIST
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
@@ -737,7 +738,7 @@ CREATE TABLE t_crashme ( f1 BIGINT);
 CREATE VIEW a1 (t_CRASHME) AS SELECT f1 FROM t_crashme GROUP BY f1;
 CREATE VIEW a2 AS SELECT t_CRASHME FROM a1;
 count(*)
-111
+112
 drop view a2, a1;
 drop table t_crashme;
 select table_schema,table_name, column_name from
@@ -835,7 +836,7 @@ flush privileges;
 SELECT table_schema, count(*) FROM information_schema.TABLES GROUP BY TABLE_SCHEMA;
 table_schema	count(*)
 cluster_replication	1
-information_schema	21
+information_schema	22
 mysql	21
 create table t1 (i int, j int);
 create trigger trg1 before insert on t1 for each row
@@ -1142,3 +1143,8 @@ varchar(20)	information_schema.COLUMNS,information_schema.FILES,information_sche
 select * from information_schema.engines WHERE ENGINE="MyISAM";
 ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
 MyISAM	ENABLED	Default engine as of MySQL 3.23 with great performance	NO	NO	NO
+grant select on *.* to user3148@localhost;
+select user,db from information_schema.processlist;
+user	db
+user3148	test
+drop user user3148@localhost;
diff --git a/mysql-test/r/information_schema_db.result b/mysql-test/r/information_schema_db.result
index 65277f46675..b9f19368635 100644
--- a/mysql-test/r/information_schema_db.result
+++ b/mysql-test/r/information_schema_db.result
@@ -12,6 +12,7 @@ FILES
 KEY_COLUMN_USAGE
 PARTITIONS
 PLUGINS
+PROCESSLIST
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
diff --git a/mysql-test/t/information_schema.test b/mysql-test/t/information_schema.test
index ce5c4f71c8c..6a1a9f60bc5 100644
--- a/mysql-test/t/information_schema.test
+++ b/mysql-test/t/information_schema.test
@@ -821,3 +821,16 @@ group by column_type order by num;
 #
 
 select * from information_schema.engines WHERE ENGINE="MyISAM";
+
+#
+# INFORMATION_SCHEMA.PROCESSLIST
+#
+
+grant select on *.* to user3148@localhost;
+connect (con3148,localhost,user3148,,test);
+connection con3148;
+select user,db from information_schema.processlist;
+connection default;
+drop user user3148@localhost;
+
+