diff --git a/.bzrignore b/.bzrignore
index bb1cdb1c0c3a256f0552c7a9bb6607d0161681fa..74e098e888fd81d75da6a3f9c6a65bb8925636ee 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1055,3 +1055,4 @@ vio/viotest-ssl
 include/mysqld_ername.h
 include/mysqld_error.h
 include/sql_state.h
+support-files/ndb-config-2-node.ini
diff --git a/mysql-test/r/ndb_basic.result b/mysql-test/r/ndb_basic.result
index a6396080ef0f09c41e1d7de5b852c3eb2f4a76cc..e1aa045d16ee0f2006d4e07d0dbdf52ff581ddd8 100644
--- a/mysql-test/r/ndb_basic.result
+++ b/mysql-test/r/ndb_basic.result
@@ -577,7 +577,7 @@ create table t1
 (a bigint, b bigint, c bigint, d bigint, 
 primary key (a,b,c,d)) 
 engine=ndb
-max_rows=200000000;
+max_rows=800000000;
 Warnings:
 Warning	1105	Ndb might have problems storing the max amount of rows specified
 insert into t1 values
diff --git a/mysql-test/t/ndb_basic.test b/mysql-test/t/ndb_basic.test
index f460c573a9d3d3f5f7b4877b128855d3ced30b17..0f6a2f5696b0051cd7c6554faced20f766a514d0 100644
--- a/mysql-test/t/ndb_basic.test
+++ b/mysql-test/t/ndb_basic.test
@@ -546,11 +546,12 @@ drop table t1;
 # first a table with _many_ fragments per node group
 # then a table with just one fragment per node group
 #
+set @a= show status like 'Ndb_number_of_storage_nodes';
 create table t1
   (a bigint, b bigint, c bigint, d bigint, 
    primary key (a,b,c,d)) 
   engine=ndb
-  max_rows=200000000;
+  max_rows=800000000;
 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),