bzr commit into mysql-5.1-telco-7.1 branch (jonas:3046)

[Jonas Oreland]

#At file:///home/jonas/src/telco-7.1/ based on revid:jonas@stripped

 3046 Jonas Oreland	2009-10-01
      ndb - post merge, fix resut files

    modified:
      mysql-test/suite/ndb/r/ndb_native_default_support.result
      mysql-test/suite/ndb/r/ndbinfo.result
=== modified file 'mysql-test/suite/ndb/r/ndb_native_default_support.result'
--- a/mysql-test/suite/ndb/r/ndb_native_default_support.result	2009-06-03 16:21:28 +0000
+++ b/mysql-test/suite/ndb/r/ndb_native_default_support.result	2009-10-01 14:22:40 +0000
@@ -134,7 +134,7 @@ Max load factor: 80
 Temporary table: no
 Number of attributes: 13
 Number of primary keys: 1
-Length of frm data: 518
+Length of frm data: 517
 Row Checksum: 1
 Row GCI: 1
 SingleUserMode: 0

=== modified file 'mysql-test/suite/ndb/r/ndbinfo.result'
--- a/mysql-test/suite/ndb/r/ndbinfo.result	2009-09-17 09:47:55 +0000
+++ b/mysql-test/suite/ndb/r/ndbinfo.result	2009-10-01 14:22:40 +0000
@@ -3,7 +3,7 @@ result_format: 2
 
 SELECT * FROM information_schema.plugins WHERE PLUGIN_NAME = 'ndbinfo';
 PLUGIN_NAME	PLUGIN_VERSION	PLUGIN_STATUS	PLUGIN_TYPE	PLUGIN_TYPE_VERSION	PLUGIN_LIBRARY	PLUGIN_LIBRARY_VERSION	PLUGIN_AUTHOR	PLUGIN_DESCRIPTION	PLUGIN_LICENSE
-ndbinfo	0.1	ACTIVE	STORAGE ENGINE	50135.0	NULL	NULL	Sun Microsystems Inc.	Ndb system information storage engine	GPL
+ndbinfo	0.1	ACTIVE	STORAGE ENGINE	50139.0	NULL	NULL	Sun Microsystems Inc.	Ndb system information storage engine	GPL
 
 USE ndb$info;
 


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