mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 21:42:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb

Browse source 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
This commit is contained in:
unknown 2007-04-02 09:34:33 +02:00
commit c86e03a2ad
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp
View file

@ -484,6 +484,13 @@ Uint32 Dbtup::leafPageRangeFull(Fragrecord* const regFragPtr, PageRangePtr curr
ptrCheckGuard(parentPageRangePtr, cnoOfPageRangeRec, pageRange);
if (parentPageRangePtr.p->currentIndexPos < 3) {
jam();
if (c_noOfFreePageRanges < tiprNoLevels)
{
jam();
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, */

2
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
View file

@ -669,7 +669,7 @@ InitConfigFileParser::store_in_properties(Vector<struct my_option>& 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;

9
storage/ndb/test/run-test/files.cpp
View file

@ -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
{