Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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, 2007-03-07 17:52:03+01:00, jonas@stripped +1 -0
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco
into perch.ndb.mysql.com:/home/jonas/src/kjk
MERGE: 1.2453.1.2
storage/ndb/src/mgmsrv/ConfigInfo.cpp@stripped, 2007-03-07 17:51:58+01:00, jonas@stripped +0 -0
Auto merged
MERGE: 1.99.1.1
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: jonas
# Host: perch.ndb.mysql.com
# Root: /home/jonas/src/kjk/RESYNC
--- 1.100/storage/ndb/src/mgmsrv/ConfigInfo.cpp 2007-03-07 17:52:07 +01:00
+++ 1.101/storage/ndb/src/mgmsrv/ConfigInfo.cpp 2007-03-07 17:52:08 +01:00
@@ -343,6 +343,18 @@
"0",
STR_VALUE(MAX_INT_RNIL) },
+ {
+ KEY_INTERNAL,
+ "TcpBind_INADDR_ANY",
+ DB_TOKEN,
+ "Bind IP_ADDR_ANY so that connections can be made from anywhere (for autogenerated connections)",
+ ConfigInfo::CI_USED,
+ false,
+ ConfigInfo::CI_BOOL,
+ "false",
+ "false",
+ "true"},
+
/***************************************************************************
* DB
***************************************************************************/
@@ -1841,7 +1853,18 @@
"0",
"2G"
},
-
+
+ {
+ CFG_TCP_BIND_INADDR_ANY,
+ "TcpBind_INADDR_ANY",
+ "TCP",
+ "Bind InAddrAny instead of hostname for server part of connection",
+ ConfigInfo::CI_USED,
+ false,
+ ConfigInfo::CI_BOOL,
+ "false",
+ "false", "true" },
+
/****************************************************************************
* SHM
***************************************************************************/
@@ -3094,6 +3117,13 @@
DBUG_RETURN(false);
}
+ Uint32 bindAnyAddr = 0;
+ node1->get("TcpBind_INADDR_ANY", &bindAnyAddr);
+ if (bindAnyAddr)
+ {
+ ctx.m_currentSection->put("TcpBind_INADDR_ANY", 1, true);
+ }
+
Uint32 port= 0;
if(strcmp(type1, MGM_TOKEN)==0)
node1->get("PortNumber",&port);
| Thread |
|---|
| • bk commit into 5.1 tree (jonas:1.2456) | jonas | 7 Mar |