bk commit into 6.0 tree (istruewing:1.2662) BUG#31210

[Ingo Struewing]

Below is the list of changes that have just been committed into a local
6.0 repository of istruewing. When istruewing 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@stripped, 2007-11-13 15:15:50+01:00, istruewing@stripped +2 -0
  Bug#31210 - INSERT DELAYED crashes server when used on
              partitioned table
  Post-merge fix. Privileges are now in column 32.

  mysql-test/r/join.result@stripped, 2007-11-13 15:15:48+01:00, istruewing@stripped +2 -2
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Post-merge fix. Privileges are now in column 32.

  mysql-test/t/join.test@stripped, 2007-11-13 15:15:48+01:00, istruewing@stripped +1 -1
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Post-merge fix. Privileges are now in column 32.

diff -Nrup a/mysql-test/r/join.result b/mysql-test/r/join.result
--- a/mysql-test/r/join.result	2007-10-30 14:09:47 +01:00
+++ b/mysql-test/r/join.result	2007-11-13 15:15:48 +01:00
@@ -750,8 +750,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	INDEX_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	STORAGE	FORMAT
-user	Host	NULL	mysql	0	mysql	PRIMARY	1	A	NULL	NULL	NULL		BTREE			NULL	mysql	1		NO	char	60	180	NULL	NULL	utf8	utf8_bin	char(60)	PRI	#	select,insert,update,references		Default	Default
-user	User	NULL	mysql	0	mysql	PRIMARY	2	A	3	NULL	NULL		BTREE			NULL	mysql	2		NO	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)	PRI	#	select,insert,update,references		Default	Default
+user	Host	NULL	mysql	0	mysql	PRIMARY	1	A	NULL	NULL	NULL		BTREE			NULL	mysql	1		NO	char	60	180	NULL	NULL	utf8	utf8_bin	char(60)	PRI		#		Default	Default
+user	User	NULL	mysql	0	mysql	PRIMARY	2	A	3	NULL	NULL		BTREE			NULL	mysql	2		NO	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)	PRI		#		Default	Default
 drop table t1;
 drop table t2;
 drop table t3;
diff -Nrup a/mysql-test/t/join.test b/mysql-test/t/join.test
--- a/mysql-test/t/join.test	2007-10-05 16:28:31 +02:00
+++ b/mysql-test/t/join.test	2007-11-13 15:15:48 +01:00
@@ -547,7 +547,7 @@ select * from v1a join v1b on t1.b = t2.
 # Bug #17523 natural join and information_schema
 #
 # We mask out the Privileges column because it differs with embedded server
---replace_column 31 #
+--replace_column 32 #
 select * from information_schema.statistics join information_schema.columns
               using(table_name,column_name) where table_name='user';