From: Jonas Oreland
Date: March 21 2012 2:45pm
Subject: bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4898 to 4900)
List-Archive: http://lists.mysql.com/commits/143270
Message-Id: <20120321144513.21EB655C8EA@perch.localdomain>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4900 Jonas Oreland	2012-03-21
      ndb - increase MaxNoOfAttributes which increased when adding columns to T6

    modified:
      storage/ndb/test/run-test/conf-blade08.cnf
      storage/ndb/test/run-test/conf-ndb07.cnf
      storage/ndb/test/run-test/conf-tyr13.cnf
 4899 Jonas Oreland	2012-03-21
      ndb - increase testtime for Bug44065_org which increased when adding columns to T6

    modified:
      storage/ndb/test/run-test/daily-basic-tests.txt
 4898 Jonas Oreland	2012-03-21
      ndb - fix win32 compile failure in mt-send-t.cpp (rand_r)

    modified:
      storage/ndb/src/kernel/vm/mt-send-t.cpp
=== modified file 'storage/ndb/test/run-test/conf-blade08.cnf'
--- a/storage/ndb/test/run-test/conf-blade08.cnf	2011-05-19 17:47:28 +0000
+++ b/storage/ndb/test/run-test/conf-blade08.cnf	2012-03-21 14:43:07 +0000
@@ -26,6 +26,7 @@ FragmentLogFileSize = 64M
 CompressedLCP=1
 CompressedBackup=1
 ODirect=1
+MaxNoOfAttributes=2000
 
 SharedGlobalMemory=256M
 InitialLogfileGroup=undo_buffer_size=64M;undofile01.dat:256M;undofile02.dat:128M

=== modified file 'storage/ndb/test/run-test/conf-ndb07.cnf'
--- a/storage/ndb/test/run-test/conf-ndb07.cnf	2011-05-19 18:19:47 +0000
+++ b/storage/ndb/test/run-test/conf-ndb07.cnf	2012-03-21 14:43:07 +0000
@@ -31,6 +31,7 @@ MaxNoOfSavedMessages= 5
 NoOfFragmentLogFiles = 8
 FragmentLogFileSize = 64M
 ODirect=1
+MaxNoOfAttributes=2000
 
 SharedGlobalMemory=256M
 DiskPageBufferMemory=256M

=== modified file 'storage/ndb/test/run-test/conf-tyr13.cnf'
--- a/storage/ndb/test/run-test/conf-tyr13.cnf	2011-12-09 15:11:21 +0000
+++ b/storage/ndb/test/run-test/conf-tyr13.cnf	2012-03-21 14:43:07 +0000
@@ -34,6 +34,7 @@ FragmentLogFileSize = 64M
 ODirect=1
 MaxNoOfExecutionThreads=8
 SendBufferMemory=4M
+MaxNoOfAttributes=2000
 
 SharedGlobalMemory=256M
 DiskPageBufferMemory=256M

=== modified file 'storage/ndb/test/run-test/daily-basic-tests.txt'
--- a/storage/ndb/test/run-test/daily-basic-tests.txt	2011-12-16 13:57:51 +0000
+++ b/storage/ndb/test/run-test/daily-basic-tests.txt	2012-03-21 14:39:22 +0000
@@ -946,7 +946,7 @@ max-time: 500
 cmd: testNdbApi
 args: -n Bug44065
 
-max-time: 500
+max-time: 1000
 cmd: testNdbApi
 args: -n Bug44065_org
 

No bundle (reason: useless for push emails).