bzr push into mysql-5.1-telco-7.1 branch (jonas:3878 to 3879)

[Jonas Oreland]

 3879 Jonas Oreland	2010-10-11 [merge]
      ndb - merge 70 to 71

    modified:
      mysql-test/suite/ndb/r/ndb_basic.result
 3878 Jonas Oreland	2010-10-11 [merge]
      ndb - merge 70 to 71

    modified:
      sql/ha_ndbcluster.cc
=== modified file 'mysql-test/suite/ndb/r/ndb_basic.result'
--- a/mysql-test/suite/ndb/r/ndb_basic.result	2010-06-16 20:49:05 +0000
+++ b/mysql-test/suite/ndb/r/ndb_basic.result	2010-10-11 11:19:57 +0000
@@ -1006,6 +1006,8 @@ create table t1
 primary key (a,b,c,d)) 
 engine=ndb
 max_rows=800000000;
+Warnings:
+Warning	1105	Ndb might have problems storing the max amount of rows specified
 insert into t1 values
 (1,2,3,4),(2,3,4,5),(3,4,5,6),
 (3,2,3,4),(1,3,4,5),(2,4,5,6),


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