bzr push into mysql-5.5-cluster branch (jonas.oreland:3548 to 3549)

[jonas oreland]

 3549 jonas oreland	2011-09-29
      ndb - win64, more supressions...also increase index-mem slightly...(clusterj got 625)

    modified:
      mysql-test/include/default_ndbd.cnf
      support-files/compiler_warnings.supp
 3548 Jonas Oreland	2011-09-29
      ndb - escaping on windows trial and terror attempt 977

    modified:
      cmake/configure.pl
=== modified file 'mysql-test/include/default_ndbd.cnf'
--- a/mysql-test/include/default_ndbd.cnf	2011-03-31 20:19:39 +0000
+++ b/mysql-test/include/default_ndbd.cnf	2011-09-29 17:47:44 +0000
@@ -4,7 +4,7 @@ MaxNoOfSavedMessages=          1000
 MaxNoOfConcurrentTransactions= 2048
 MaxNoOfConcurrentOperations=   10000
 DataMemory=                    20M
-IndexMemory=                   3M
+IndexMemory=                   5M
 Diskless=                      0
 TimeBetweenWatchDogCheck=      30000
 MaxNoOfOrderedIndexes=         128

=== modified file 'support-files/compiler_warnings.supp'
--- a/support-files/compiler_warnings.supp	2011-09-29 10:08:46 +0000
+++ b/support-files/compiler_warnings.supp	2011-09-29 17:47:44 +0000
@@ -148,6 +148,8 @@ mytap/tap.c : C4028: formal parameter .*
 .*/handler.cc             : .*C4244.* conversion .* possible loss of data
 .*/discover.cc            : .*C4244.* conversion .* possible loss of data
 .*/ha_archive.cc          : .*C4244.* conversion .* possible loss of data
+.*/client.c               : .*C4244.* conversion .* possible loss of data
+.*/sql_update.cc          : .*C4244.* conversion .* possible loss of data
 
 # const qualifiers
 replace/replace.c                     : .*C4090.*

No bundle (reason: useless for push emails).