bk commit into 5.1 tree (gluh:1.2400) BUG#19720

[gluh]

Below is the list of changes that have just been committed into a local
5.1 repository of gluh. When gluh does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2400 06/05/29 12:42:22 gluh@stripped +2 -0
  Bug#19720 "Information Schema" output does not list privileges when running "embedded"
   replace PRVILEGES column result with # for compatibility with embedded

  mysql-test/t/join.test
    1.32 06/05/29 12:42:14 gluh@stripped +1 -0
    Bug#19720 "Information Schema" output does not list privileges when running "embedded"
     replace PRVILEGES column result with # for compatibility with embedded

  mysql-test/r/join.result
    1.37 06/05/29 12:42:14 gluh@stripped +2 -2
    Bug#19720 "Information Schema" output does not list privileges when running "embedded"
     replace PRVILEGES column result with # for compatibility with embedded

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gluh
# Host:	eagle.intranet.mysql.r18.ru
# Root:	/home/gluh/MySQL/Bugs/5.1.18730

--- 1.36/mysql-test/r/join.result	Mon Mar  6 13:11:04 2006
+++ 1.37/mysql-test/r/join.result	Mon May 29 12:42:14 2006
@@ -700,8 +700,8 @@ ERROR 42S22: Unknown column 't1.b' in 'o
 select * from information_schema.statistics join information_schema.columns
 using(table_name,column_name) where table_name='user';
 TABLE_NAME	COLUMN_NAME	TABLE_CATALOG	TABLE_SCHEMA	NON_UNIQUE	INDEX_SCHEMA	INDEX_NAME	SEQ_IN_INDEX	COLLATION	CARDINALITY	SUB_PART	PACKED	NULLABLE	INDEX_TYPE	COMMENT	TABLE_CATALOG	TABLE_SCHEMA	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
-user	Host	NULL	mysql	0	mysql	PRIMARY	1	A	NULL	NULL	NULL		BTREE		NULL	mysql	1		NO	char	20	60	NULL	NULL	utf8	utf8_bin	char(60)	PRI		select,insert,update,references	
-user	User	NULL	mysql	0	mysql	PRIMARY	2	A	5	NULL	NULL		BTREE		NULL	mysql	2		NO	char	5	16	NULL	NULL	utf8	utf8_bin	char(16)	PRI		select,insert,update,references	
+user	Host	NULL	mysql	0	mysql	PRIMARY	1	A	NULL	NULL	NULL		BTREE		NULL	mysql	1		NO	char	20	60	NULL	NULL	utf8	utf8_bin	char(60)	PRI		#	
+user	User	NULL	mysql	0	mysql	PRIMARY	2	A	5	NULL	NULL		BTREE		NULL	mysql	2		NO	char	5	16	NULL	NULL	utf8	utf8_bin	char(16)	PRI		#	
 drop table t1;
 drop table t2;
 drop table t3;

--- 1.31/mysql-test/t/join.test	Mon Mar  6 13:11:04 2006
+++ 1.32/mysql-test/t/join.test	Mon May 29 12:42:14 2006
@@ -520,6 +520,7 @@ select * from v1a join v1b on t1.b = t2.
 #
 # Bug #17523 natural join and information_schema
 #
+--replace_column 31 #
 select * from information_schema.statistics join information_schema.columns
               using(table_name,column_name) where table_name='user';