bk commit into 5.0 tree (sergefp:1.1853) BUG#9439

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
5.0 repository of psergey. When psergey 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.1853 05/04/18 22:30:22 sergefp@stripped +1 -0
  Post merge fix - updated the test results (BUG#9439)

  mysql-test/r/show_check.result
    1.68 05/04/18 22:30:17 sergefp@stripped +12 -12
    Post merge fix - updated the test results (BUG#9439)

# 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:	sergefp
# Host:	newbox.mylan
# Root:	/home/psergey/mysql-5.0-tests-fix

--- 1.67/mysql-test/r/show_check.result	2005-04-17 20:50:17 +04:00
+++ 1.68/mysql-test/r/show_check.result	2005-04-18 22:30:17 +04:00
@@ -482,18 +482,18 @@
 );
 show index from t1;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max
length	Is_null	Flags	Decimals	Charsetnr
-def					Table	253	64	2	N	129	31	63
-def					Non_unique	1	1	1	N	32929	0	63
-def					Key_name	253	64	7	N	129	31	63
-def					Seq_in_index	1	2	1	N	32929	0	63
-def					Column_name	253	64	6	N	129	31	63
-def					Collation	253	1	1	Y	128	31	63
-def					Cardinality	8	21	1	Y	32896	0	63
-def					Sub_part	2	3	4	Y	32928	0	63
-def					Packed	253	10	0	Y	128	31	63
-def					Null	253	3	0	N	129	31	63
-def					Index_type	253	16	5	N	129	31	63
-def					Comment	253	255	0	N	129	31	63
+def			STATISTICS	TABLE_NAME	Table	253	64	2	N	1	0	63
+def			STATISTICS	NON_UNIQUE	Non_unique	8	1	1	N	32769	0	63
+def			STATISTICS	INDEX_NAME	Key_name	253	64	7	N	1	0	63
+def			STATISTICS	SEQ_IN_INDEX	Seq_in_index	8	2	1	N	32769	0	63
+def			STATISTICS	COLUMN_NAME	Column_name	253	64	6	N	1	0	63
+def			STATISTICS	COLLATION	Collation	253	1	1	Y	0	0	63
+def			STATISTICS	CARDINALITY	Cardinality	8	21	1	Y	32768	0	63
+def			STATISTICS	SUB_PART	Sub_part	8	3	4	Y	32768	0	63
+def			STATISTICS	PACKED	Packed	253	10	0	Y	0	0	63
+def			STATISTICS	NULLABLE	Null	253	3	0	N	1	0	63
+def			STATISTICS	INDEX_TYPE	Index_type	253	16	5	N	1	0	63
+def			STATISTICS	COMMENT	Comment	253	16	0	Y	0	0	63
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
 t1	0	PRIMARY	1	field1	A	0	1000	NULL		BTREE	
 drop table t1;