diff options
author | unknown <stewart@mysql.com> | 2006-06-28 22:25:41 +1000 |
---|---|---|
committer | unknown <stewart@mysql.com> | 2006-06-28 22:25:41 +1000 |
commit | 7e4ae350ea374a2f3dc14c5025505c290ab07322 (patch) | |
tree | d6a73fa294acb3c1fa59dc4ee0c2f8d71e785d29 /ndb | |
parent | d2da3c9685d1105f7e021c9b05b2b0248135a897 (diff) | |
parent | 3e8cba8be10e0131fa3743a57af5dbebc8527674 (diff) | |
download | mariadb-git-7e4ae350ea374a2f3dc14c5025505c290ab07322.tar.gz |
Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
into mysql.com:/home/stewart/Documents/MySQL/5.0/merge
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'ndb')
-rw-r--r-- | ndb/src/mgmsrv/ConfigInfo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ndb/src/mgmsrv/ConfigInfo.cpp b/ndb/src/mgmsrv/ConfigInfo.cpp index dfe4f9aa63e..629ddf7a655 100644 --- a/ndb/src/mgmsrv/ConfigInfo.cpp +++ b/ndb/src/mgmsrv/ConfigInfo.cpp @@ -853,7 +853,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { false, ConfigInfo::CI_INT, "8", - "1", + "3", STR_VALUE(MAX_INT_RNIL) }, { |