Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/jonas/src/mysql-5.0

.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

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

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),