into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
mysql-test/ndb/ndb_config_2_node.ini:
Auto merged
storage/ndb/include/ndb_global.h.in:
Auto merged
storage/ndb/src/common/portlib/NdbTick.c:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
storage/ndb/src/kernel/blocks/restore.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
Auto merged
storage/ndb/src/kernel/vm/WatchDog.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/tools/restore/Restore.cpp:
Auto merged
into poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
mysql-test/ndb/ndb_config_2_node.ini:
Auto merged
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
manual merge
- add odirect option for lcp+backup+redo log to lower CPU/kswapd usage
- writing odirect removes need for kernel write buffers avoiding kswapd to kick in
mysql-test/ndb/ndb_config_2_node.ini:
run mysql-test-run using ODirect
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
add new config parameter to choose ODirect
storage/ndb/include/ndb_global.h.in:
specify alignment needed for odirect
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
read odirect config param
open LCP and Backup datafiles with odirect if specified
insert empty padding record if odirect is used
allocate buffers aligned to be able to use odirect
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
odirect and padding options
storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp:
add empty_record in file format
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
read odirect config and allocate aligned
storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp:
correct debug printouts
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
read odirect config param and align buffers
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
read odirect config param and align buffers
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
read config params and open redo log files with odirect if set
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
aligned writing for odirect
correct odirect open options with test+fallback if odirect fails
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
align + odirect check
storage/ndb/src/kernel/blocks/restore.cpp:
restor block to ignore new lcp padding empty_record
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
alligend log buffer allocation for odirect
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
alligend log buffer allocation for odirect
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
new config param for odirect, default false
storage/ndb/tools/restore/Restore.cpp:
ndb_restore to skip empty_record alignment padding in backup file
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
mysql-test/ndb/ndb_config_1_node.ini:
Auto merged
mysql-test/ndb/ndb_config_2_node.ini:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
mysql-test/r/ndb_basic.result:
Auto merged
mysql-test/t/ndb_basic.test:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/set_var.cc:
Auto merged
BitKeeper/deleted/.del-ndb_config_1_node.ini:
Auto merged
BitKeeper/deleted/.del-ndb_config_4_node.ini:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Auto merged
mysql-test/ndb/ndb_config_2_node.ini:
manual merge
(mysql-test-run only)
mysql-test/ndb/ndb_config_1_node.ini:
revert timeout changes, as a test depends on it, it mysterious ways
mysql-test/ndb/ndb_config_2_node.ini:
revert timeout changes, as a test depends on it, it mysterious ways
mysql-test/ndb/ndb_config_4_node.ini:
revert timeout changes, as a test depends on it, it mysterious ways
mysql-test/t/rpl_ndb_basic.test:
revert timeout changes, as a test depends on it, it mysterious ways
Increase deadlock-timeout to cater for slow test-machines (possibly running several tests in parallell)
This will hopefully remove some volatile testfailures in pushbuild
(i've seen a couple by looking at logs)
mysql-test/ndb/ndb_config_1_node.ini:
Increase deadlock-timeout to cater for slow test-machines (possibly running several tests in parallell)
mysql-test/ndb/ndb_config_2_node.ini:
Increase deadlock-timeout to cater for slow test-machines (possibly running several tests in parallell)
mysql-test/ndb/ndb_config_4_node.ini:
Increase deadlock-timeout to cater for slow test-machines (possibly running several tests in parallell)
removed debug printout
new test in alter table for dictionay update test with multiple connections
added coice of setting MaxNoOfOrderedIndexes
added option to run "--small-bench"
mysql-test/mysql-test-run.sh:
added option to run "--small-bench"
mysql-test/ndb/ndb_config_2_node.ini:
added coice of setting MaxNoOfOrderedIndexes
mysql-test/ndb/ndbcluster.sh:
added coice of setting MaxNoOfOrderedIndexes
mysql-test/r/ndb_alter_table.result:
new test in alter table for dictionay update test with multiple connections
mysql-test/t/ndb_alter_table.test:
new test in alter table for dictionay update test with multiple connections
ndb/src/ndbapi/DictCache.cpp:
removed debug printout
sql/ha_ndbcluster.cc:
fix for invalidating table if mismatch with frm
mysql-test/ndb/ndb_config_2_node.ini:
added new config parameter datadir
ndb/include/mgmapi/mgmapi_config_parameters.h:
added new config parameter datadir and backup data dir
ndb/include/mgmcommon/ConfigRetriever.hpp:
changed verify config so that it can be used by mgmt srvr
ndb/include/mgmcommon/NdbConfig.h:
added option to set path for ndb files
ndb/src/common/mgmcommon/ConfigInfo.cpp:
changed token names for DB, MGM and API
added config parametsers for datadir and backup data dir
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
changed verify config so that it can be used by mgmt srvr
ndb/src/common/mgmcommon/InitConfigFileParser.cpp:
no need anymore to make uppercase
ndb/src/common/mgmcommon/NdbConfig.c:
bugfix+
added method to set datadir
ndb/src/kernel/Makefile.am:
added debug libs to ndbd
ndb/src/kernel/vm/Configuration.cpp:
added debug libs to ndbd
ndb/src/mgmsrv/MgmtSrvr.cpp:
added verify config to mgmt srvr
ndb/src/mgmsrv/main.cpp:
.
acinclude.m4:
Auto merged
configure.in:
Auto merged
ndb/src/common/mgmcommon/ConfigInfo.hpp:
Auto merged
ndb/src/common/mgmcommon/InitConfigFileParser.cpp:
Auto merged
mysql-test/ndb/ndb_config_2_node.ini:
SCCS merged
ndb/src/common/mgmcommon/ConfigInfo.cpp:
SCCS merged
mysql-test/ndb/ndb_config_2_node.ini:
using new naming capabilities
ndb/src/common/mgmcommon/ConfigInfo.cpp:
fixes case insensitive
+ removed abort from config handling
ndb/src/common/mgmcommon/InitConfigFileParser.cpp:
fixed alias handling
some requires in config handling
ndb/src/mgmclient/CommandInterpreter.cpp:
new printout to reflect new naming in config
added choice of : or = in config file
set case insensitive section names
mysql-test/ndb/ndb_config_2_node.ini:
added alias MYSQLD for API
ndb/src/common/mgmcommon/ConfigInfo.cpp:
added alias MYSQLD for API
ndb/src/common/mgmcommon/ConfigInfo.hpp:
added alias MYSQLD for API
ndb/src/common/mgmcommon/InitConfigFileParser.cpp:
added choice of : or = in config file
acinclude.m4:
added configure switch for ndb base port
configure.in:
ndb gcc compile now works with -fno-implicit-templates
mysql-test/ndb/ndb_config_2_node.ini:
further simplifications of config, removed need for [COMPUTER] section
ndb/include/ndb_global.h:
moved this to configure option
ndb/src/common/mgmcommon/ConfigInfo.cpp:
changed config to take to take strings instead of ints
ndb/src/common/mgmcommon/ConfigInfo.hpp:
changed config to take to take strings instead of ints
ndb/src/common/mgmcommon/InitConfigFileParser.cpp:
string to number convert to accept "0x" prefix on numbers
ndb/src/common/mgmcommon/InitConfigFileParser.hpp:
movet convert function to public and static
ndb/src/common/mgmcommon/LocalConfig.cpp:
define NDB_BASE_PORT now string instead of number
ndb/src/common/mgmcommon/Makefile.am:
added mysqld defines in mgmcommon to be able to configure default data dir to be the same as for mysqld
bug#4761 - more validation of hosts
bug#4511 - only non depricated should be saved in config
- fix ConfigInfo::BOOL w.r.t deprication
mysql-test/ndb/ndb_config_2_node.ini:
Removed need of unique filesystem
mysql-test/ndb/ndbcluster.sh:
Removed need of unique filesystem
Add "" around variables for increased portability
ndb/src/common/mgmcommon/ConfigInfo.cpp:
Added checking of hostnames already in InitConfigFileParser
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Add checking of hostnames when retreiving configuration
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
Added ndb_%u to filesystempath
ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
Added ndb_%u to filesystempath
ndb/src/kernel/blocks/ndbfs/Filename.cpp:
Added ndb_%u to filesystempath
ndb/src/kernel/blocks/ndbfs/Filename.hpp:
Added ndb_%u to filesystempath
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
Added ndb_%u to filesystempath
mysql-test/mysql-test-run.sh:
Change to diskless
mysql-test/ndb/ndb_config_2_node.ini:
Change to diskless
mysql-test/ndb/ndbcluster.sh:
Change to diskless
ndb/src/common/mgmcommon/ConfigInfo.cpp:
Making Discless deprecated, so it still can be used but a warning will be printed if used.
Adde possibilty to transform a value of type ConfigInfo::BOOL, neede for depicated Discless
Updated sql-bench configs to take NDB's limitations into account
mysql-test/mysql-test-run.sh:
Instruct run-all-tests to create tables in NDB if USE_NDBCLUSTER is set
mysql-test/ndb/ndb_config_2_node.ini:
Increase MaxNumberOfOperations to 100000 to support large deletes and inserts.
sql-bench/server-cfg.sh:
Add settings and limitations for NDB
