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 | 60306250dd021c13e206c8f64d2cab59bd2a1a37 (patch) | |
tree | d6a73fa294acb3c1fa59dc4ee0c2f8d71e785d29 /ndb | |
parent | 40f9f83df7c62cb3416846e17d972fd3a9cf7bc9 (diff) | |
parent | 78ba03d2328a98dc9ae14d6bc80a2cf79f730bc8 (diff) | |
download | mariadb-git-60306250dd021c13e206c8f64d2cab59bd2a1a37.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) }, { |