bk commit into 5.1 tree (mskold:1.2594)

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.1 repository of mskold.  When mskold does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-03-27 12:54:59+01:00, mskold@stripped +2 -0
  Decresed the number of parallel inserts to lower risk of test failure

  mysql-test/suite/ndb/r/ndb_optimize_table.result@stripped, 2008-03-27 12:54:10+01:00,
mskold@stripped +3 -0
    Decresed the number of parallel inserts to lower risk of test failure

  mysql-test/suite/ndb/t/ndb_optimize_table.test@stripped, 2008-03-27 12:54:10+01:00,
mskold@stripped +5 -3
    Decresed the number of parallel inserts to lower risk of test failure

diff -Nrup a/mysql-test/suite/ndb/r/ndb_optimize_table.result
b/mysql-test/suite/ndb/r/ndb_optimize_table.result
--- a/mysql-test/suite/ndb/r/ndb_optimize_table.result	2007-12-14 16:12:53 +01:00
+++ b/mysql-test/suite/ndb/r/ndb_optimize_table.result	2008-03-27 12:54:10 +01:00
@@ -8,6 +8,9 @@ attr2 VARBINARY(1024),
 attr3 TEXT
 ) ROW_FORMAT=DYNAMIC ENGINE=ndbcluster;
 CREATE UNIQUE INDEX ui on t1(pk,attr1,attr2);
+set @old_ndb_autoincrement_prefetch_sz = @@session.ndb_autoincrement_prefetch_sz;
+set ndb_autoincrement_prefetch_sz = 256;
+set ndb_autoincrement_prefetch_sz = @old_ndb_autoincrement_prefetch_sz;
 select count(*) from t1;
 count(*)
 10000
diff -Nrup a/mysql-test/suite/ndb/t/ndb_optimize_table.test
b/mysql-test/suite/ndb/t/ndb_optimize_table.test
--- a/mysql-test/suite/ndb/t/ndb_optimize_table.test	2007-12-14 16:12:53 +01:00
+++ b/mysql-test/suite/ndb/t/ndb_optimize_table.test	2008-03-27 12:54:10 +01:00
@@ -21,15 +21,17 @@ CREATE UNIQUE INDEX ui on t1(pk,attr1,at
 #
 # insert records into table
 #
-let $1=100;
+set @old_ndb_autoincrement_prefetch_sz = @@session.ndb_autoincrement_prefetch_sz;
+set ndb_autoincrement_prefetch_sz = 256;
+let $1=1000;
 disable_query_log;
 while ($1)
 {
-  eval insert into t1(attr1, attr2, attr3) values (@val, @val2, @val),(@val, @val2,
@val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2,
@val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2,
@val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2,
@val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2,
@val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2,
@val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2,
@val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2,
@val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2,
@val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2,
@val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2,
@val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2,
@val),(@val, @val2, @val!
 ),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2, @val),(@val,
@val2, @val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2,
@val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2,
@val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2,
@val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2,
@val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2,
@val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2,
@val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2,
@val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2,
@val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2,
@val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2,
@val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2,
@val),(@val,!
  @val2, @val),(@val, @val2, @val),(@val, @val2, @val),(@val, @!
 val2, @v
al);
+  eval insert into t1(attr1, attr2, attr3) values (@val, @val2, @val),(@val, @val2,
@val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2,
@val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2, @val),(@val, @val2, @val);
   dec $1;
 }
 enable_query_log;
-
+set ndb_autoincrement_prefetch_sz = @old_ndb_autoincrement_prefetch_sz;
 select count(*) from t1;
 
 #