4274 magnus.blaudd@stripped 2011-07-01 [merge]
Merge 7.0 -> 7.1
added:
mysql-test/suite/ndb/bug12712109.ini
modified:
mysql-test/suite/ndb/r/ndb_config.result
mysql-test/suite/ndb/t/ndb_config.test
storage/ndb/src/mgmsrv/ConfigInfo.cpp
4273 jonas oreland 2011-07-01 [merge]
ndb - merge 70 to 71
modified:
storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp
=== added file 'mysql-test/suite/ndb/bug12712109.ini'
--- a/mysql-test/suite/ndb/bug12712109.ini 1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/ndb/bug12712109.ini 2011-07-01 09:16:46 +0000
@@ -0,0 +1,8 @@
+[TCP DEFAULT]
+OverloadLimit=10M
+
+[ndb_mgmd]
+Hostname=localhost
+[ndbd]
+[ndbd]
+[mysqld]
=== modified file 'mysql-test/suite/ndb/r/ndb_config.result'
--- a/mysql-test/suite/ndb/r/ndb_config.result 2010-10-13 15:05:36 +0000
+++ b/mysql-test/suite/ndb/r/ndb_config.result 2011-07-01 09:20:02 +0000
@@ -37,3 +37,5 @@ tcp,3,4,55,3 tcp,3,5,55,3 tcp,3,6,55,3 t
== 18 == bug56185
0,0-65535
2,37-48 1,1-2
+== 19 == bug12712109
+10485760 10485760 10485760 10485760 10485760
=== modified file 'mysql-test/suite/ndb/t/ndb_config.test'
--- a/mysql-test/suite/ndb/t/ndb_config.test 2010-08-27 12:12:51 +0000
+++ b/mysql-test/suite/ndb/t/ndb_config.test 2011-07-01 09:16:46 +0000
@@ -61,3 +61,6 @@ echo == 18 == bug56185;
# Read bitmask value and enum from config.ini
--exec $NDB_CONFIG --config-file=$MYSQL_TEST_DIR/suite/ndb/bug56185.ini --query=Arbitration,LockExecuteThreadToCPU --type=ndbd
+echo == 19 == bug12712109;
+--exec $NDB_CONFIG --config-file=$MYSQL_TEST_DIR/suite/ndb/bug12712109.ini --query=OverloadLimit --connections 2>&1
+
=== modified file 'storage/ndb/src/mgmsrv/ConfigInfo.cpp'
--- a/storage/ndb/src/mgmsrv/ConfigInfo.cpp 2011-06-15 10:55:06 +0000
+++ b/storage/ndb/src/mgmsrv/ConfigInfo.cpp 2011-07-01 09:16:46 +0000
@@ -2747,7 +2747,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
ConfigInfo::CI_INT,
"0",
"0",
- "0"
+ STR_VALUE(MAX_INT_RNIL)
},
/****************************************************************************
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-5.1-telco-7.1 branch (magnus.blaudd:4273 to 4274) | magnus.blaudd | 4 Jul |
