From b84e64f7dfc6dc883c8dc4afc20f2fca046e0e7d Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 2 Apr 2007 08:36:00 +0200 Subject: [PATCH 1/3] ndb - fix bug in my.cnf config handling put64 for 64-bit variables ndb/src/mgmsrv/InitConfigFileParser.cpp: put64 --- ndb/src/mgmsrv/InitConfigFileParser.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ndb/src/mgmsrv/InitConfigFileParser.cpp b/ndb/src/mgmsrv/InitConfigFileParser.cpp index 264a998a67b..e03c5408837 100644 --- a/ndb/src/mgmsrv/InitConfigFileParser.cpp +++ b/ndb/src/mgmsrv/InitConfigFileParser.cpp @@ -658,7 +658,7 @@ InitConfigFileParser::store_in_properties(Vector& options, if (options[i].var_type == GET_INT) ctx.m_currentSection->put(options[i].name, (Uint32)value_int); else - ctx.m_currentSection->put(options[i].name, value_int); + ctx.m_currentSection->put64(options[i].name, value_int); } } return true; From 22edf82592823203885247e2e7c1bcad280dc19f Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 2 Apr 2007 08:39:58 +0200 Subject: [PATCH 2/3] fix atrt mysql_install_db, make sure no extra my.cnf is read --- storage/ndb/test/run-test/files.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/storage/ndb/test/run-test/files.cpp b/storage/ndb/test/run-test/files.cpp index 231f7c88abc..c6a29350b91 100644 --- a/storage/ndb/test/run-test/files.cpp +++ b/storage/ndb/test/run-test/files.cpp @@ -155,12 +155,13 @@ setup_files(atrt_config& config, int setup, int sshx) const char * val; require(proc.m_options.m_loaded.get("--datadir=", &val)); BaseString tmp; - tmp.assfmt("%s/bin/mysql_install_db --datadir=%s > /dev/null 2>&1", - g_prefix, val); + tmp.assfmt("%s/bin/mysql_install_db --defaults-file=%s/my.cnf --datadir=%s > /dev/null 2>&1", + g_prefix, g_basedir, val); if (system(tmp.c_str()) != 0) { - g_logger.error("Failed to mysql_install_db for %s", - proc.m_proc.m_cwd.c_str()); + g_logger.error("Failed to mysql_install_db for %s, cmd: >%s<", + proc.m_proc.m_cwd.c_str(), + tmp.c_str()); } else { From d71a221d243bab6388d15d6fbb7228d365385e85 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 2 Apr 2007 09:07:15 +0200 Subject: [PATCH 3/3] ndb - bug#27581 make sure not to leave partially initialized pagerage-records ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp: make sure not to leave partially initialized pagerage-records --- ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp b/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp index 0bb7c8a1e41..e227ac8b5bf 100644 --- a/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp +++ b/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp @@ -453,6 +453,13 @@ Uint32 Dbtup::leafPageRangeFull(Fragrecord* const regFragPtr, PageRangePtr curr ptrCheckGuard(parentPageRangePtr, cnoOfPageRangeRec, pageRange); if (parentPageRangePtr.p->currentIndexPos < 3) { ljam(); + + if (c_noOfFreePageRanges < tiprNoLevels) + { + ljam(); + return RNIL; + }//if + /* ---------------------------------------------------------------- */ /* WE HAVE FOUND AN EMPTY ENTRY IN A PAGE RANGE RECORD. */ /* ALLOCATE A NEW PAGE RANGE RECORD, FILL IN THE START RANGE, */