bzr commit into mysql-5.5-telco-7.0 branch (magnus.blaudd:3147)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/5.5-telco-7.0/ based on revid:magnus.blaudd@strippedtfau5

 3147 Magnus Blåudd	2011-01-21
      ndb
       - SHOW INDEX has got a new column in 5.5, add it to .result file

    modified:
      mysql-test/suite/ndb/r/ndb_basic.result
=== modified file 'mysql-test/suite/ndb/r/ndb_basic.result'
--- a/mysql-test/suite/ndb/r/ndb_basic.result	2011-01-21 13:15:31 +0000
+++ b/mysql-test/suite/ndb/r/ndb_basic.result	2011-01-21 13:28:09 +0000
@@ -63,12 +63,12 @@ attr2 INT,
 attr3 VARCHAR(10)
 ) ENGINE=ndbcluster;
 SHOW INDEX FROM t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	0	PRIMARY	1	pk1	A	0	NULL	NULL		BTREE	
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	0	PRIMARY	1	pk1	A	0	NULL	NULL		BTREE		
 INSERT INTO t1 VALUES (9410,9412, NULL, '9412'), (9411,9413, 17, '9413');
 SHOW INDEX FROM t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	0	PRIMARY	1	pk1	A	2	NULL	NULL		BTREE	
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t1	0	PRIMARY	1	pk1	A	2	NULL	NULL		BTREE		
 SELECT pk1 FROM t1 ORDER BY pk1;
 pk1
 9410

Attachment: [text/bzr-bundle] bzr/[e-mail]