into msdesk.(none):/home/msvensson/mysql-5.0
BUILD/SETUP.sh:
Auto merged
BitKeeper/deleted/.del-ctype-cp932.c:
Auto merged
BitKeeper/deleted/.del-ctype_cp932.result:
Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
Auto merged
BitKeeper/deleted/.del-ndb_range_bounds.pl~ff7e47a35fb44c74:
Auto merged
innobase/os/os0sync.c:
Auto merged
mysql-test/r/ctype_tis620.result:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_uca.test:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/ctype_ujis.test:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-gbk.c:
Auto merged
strings/ctype-simple.c:
Auto merged
strings/ctype-sjis.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
client/mysql.cc:
Sam change in both 4.1 and 5.0
mysql-test/r/ctype_uca.result:
Merge
mysql-test/r/ctype_ujis.result:
Merge
strings/ctype-mb.c:
Merge
strings/ctype-tis620.c:
Merge
changed ndb_restore test somewhat to fisrt make the tables in myisam
mysql-test/mysql-test-run.sh:
backported ndb_mgm options from 5.0
mysql-test/ndb/ndbcluster.sh:
backported ndb_mgm options from 5.0
mysql-test/r/ndb_restore.result:
changed ndb_restore test somewhat to fisrt make the tables in myisam
mysql-test/t/ndb_restore.test:
changed ndb_restore test somewhat to fisrt make the tables in myisam
increased timeouts to see if more tests get started automatically
mysql-test/ndb/ndbcluster.sh:
increased timeouts to see if more tests get started automatically
VC++Files/libmysqld/libmysqld.dsp:
Auto merged
client/mysql.cc:
Auto merged
include/my_sys.h:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/strfunc.cc:
Auto merged
VC++Files/sql/mysqld.dsp:
Libraries changed
mysys/default.c:
get_defaults_files implementation added
sql/sql_base.cc:
merging
sql/sql_show.cc:
merging
removed grep event and added congestion event
more docs
changed some naming, expecially regarding severities
added config param for logevel for congestion
mysql-test/ndb/basic.result:
updated ndb_mgm test
mysql-test/ndb/restart.test:
updated ndb_mgm test
ndb/include/kernel/LogLevel.hpp:
removed grep event and added congestion event
ndb/include/mgmapi/mgmapi.h:
more docs
changed some naming, expecially regarding severities
ndb/include/mgmapi/mgmapi_config_parameters.h:
removed grep event and added congestion event
ndb/src/common/debugger/EventLogger.cpp:
removed grep event and added congestion event
ndb/src/mgmapi/mgmapi.cpp:
changed some naming, expecially regarding severities
ndb/src/mgmsrv/ConfigInfo.cpp:
added config param for logevel for congestion
ndb/src/mgmsrv/Services.cpp:
just som variable name changes
configure.in:
Auto merged
ndb/include/ndbapi/NdbApi.hpp:
Auto merged
ndb/include/ndbapi/NdbReceiver.hpp:
Auto merged
ndb/include/transporter/TransporterRegistry.hpp:
Auto merged
ndb/src/common/logger/Logger.cpp:
Auto merged
ndb/src/common/mgmcommon/IPCConfig.cpp:
Auto merged
ndb/src/common/transporter/Transporter.hpp:
Auto merged
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
ndb/src/ndbapi/Ndb.cpp:
Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
Auto merged
ndb/test/ndbapi/testBlobs.cpp:
Auto merged
BitKeeper/etc/logging_ok:
auto-union
ndb/docs/wl2077.txt:
Auto merged
ndb/include/Makefile.am:
Auto merged
ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
ndb/src/common/debugger/EventLogger.cpp:
Auto merged
ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
Auto merged
ndb/src/common/logger/Logger.cpp:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/common/util/Makefile.am:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
Auto merged
ndb/src/kernel/blocks/dbacc/Makefile.am:
Auto merged
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
Auto merged
ndb/src/kernel/vm/Configuration.cpp:
Auto merged
ndb/src/kernel/vm/Configuration.hpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmsrv/CommandInterpreter.cpp:
Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
ndb/src/mgmsrv/Services.hpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
ndb/src/ndbapi/NdbOperationExec.cpp:
Auto merged
ndb/src/ndbapi/NdbReceiver.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
ndb/src/ndbapi/Ndbif.cpp:
Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
Auto merged
ndb/src/ndbapi/Ndblist.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
ndb/test/ndbapi/Makefile.am:
Auto merged
ndb/test/ndbapi/testDict.cpp:
Auto merged
ndb/test/ndbapi/testNdbApi.cpp:
Auto merged
ndb/test/src/NdbRestarter.cpp:
Auto merged
ndb/test/tools/Makefile.am:
Auto merged
ndb/tools/Makefile.am:
Auto merged
ndb/tools/delete_all.cpp:
Auto merged
ndb/tools/desc.cpp:
Auto merged
ndb/tools/select_all.cpp:
Auto merged
ndb/tools/select_count.cpp:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
ndb/test/ndbapi/testOIBasic.cpp:
test ordering, add hash indexes, fix result verification
mysql-test/ndb/ndb_range_bounds.pl:
minor
mysql-test/r/ndb_index_ordered.result:
minor
mysql-test/t/ndb_index_ordered.test:
minor
mysql-test/ndb/ndb_range_bounds.pl:
test ordered scan
mysql-test/r/ndb_index_ordered.result:
test ordered scan
mysql-test/t/ndb_index_ordered.test:
test ordered scan
sql/ha_ndbcluster.cc:
wl-1893: range scanning backwards, handler
sql/ha_ndbcluster.h:
wl-1893: range scanning backwards, handler
made compare of logs possible in ndb test
restart_log.result, restart.test, restart.result:
new file
mysql-test/ndb/ndbcluster.sh:
made compare of logs possible in ndb test
added new variable for ndb port 1186
changed meaning of ndb_port_base to be default tcp port setting
changed to use split between port and port_base for ndbcluster
so that ndb_port and ndb_port_base are propagated to startscript for ndbcluster
added larger space to pid print
moved readAndExecute out of CommandInterpreter to avoid linking lib with readline
added c-api to Ndb_mgmclient
pass also ndb_port to make
acinclude.m4:
added configure switch for ndb port number
configure.in:
added new variable for ndb port 1186
changed meaning of ndb_port_base to be default tcp port setting
mysql-test/mysql-test-run.sh:
changed to use split between port and port_base for ndbcluster
mysql-test/ndb/Makefile.am:
so that ndb_port and ndb_port_base are propagated to startscript for ndbcluster
mysql-test/ndb/ndbcluster.sh:
so that ndb_port and ndb_port_base are propagated to startscript for ndbcluster
ndb/src/common/mgmcommon/LocalConfig.cpp:
so that ndb_port and ndb_port_base are propagated to startscript for ndbcluster
ndb/src/common/mgmcommon/Makefile.am:
so that ndb_port and ndb_port_base are propagated to startscript for ndbcluster
ndb/src/common/mgmcommon/NdbConfig.c:
added larger space to pid print
ndb/src/mgmclient/CommandInterpreter.cpp:
moved readAndExecute out of CommandInterpreter to avoid linking lib with readline
added c-api to Ndb_mgmclient
ndb/src/mgmclient/main.cpp:
moved readAndExecute out of CommandInterpreter to avoid linking lib with readline
ndb/src/mgmclient/ndb_mgmclient.hpp:
moved readAndExecute out of CommandInterpreter to avoid linking lib with readline
ndb/src/mgmsrv/ConfigInfo.cpp:
moved readAndExecute out of CommandInterpreter to avoid linking lib with readline
ndb/src/mgmsrv/Makefile.am:
pass also ndb_port to make
changed to use new switch
mysql-test/ndb/ndbcluster.sh:
updated start script for ndbcluster to make better cleanup
ndb/test/run-test/main.cpp:
changed to use new switch
there was a clash in using -c, added -f as the future proof switch
mysql-test/ndb/ndbcluster.sh:
changed to use the future-proof option to ndb_mgmd
ndb/src/mgmsrv/main.cpp:
there was a clash in using -c, added -f as the future proof switch
debug printouts
mysql-test/ndb/ndbcluster.sh:
.
ndb/include/mgmcommon/ConfigRetriever.hpp:
added printout for where configuration is fetched
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
added printout for where configuration is fetched
ndb/src/kernel/main.cpp:
added printout for where configuration is fetched
ndb/src/kernel/vm/Configuration.cpp:
added printout for where configuration is fetched
ndb/src/kernel/vm/Configuration.hpp:
added printout for where configuration is fetched
ndb/src/ndbapi/Ndb.cpp:
debug printouts
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
-i depricated on ndbd
fixed bug in shutdown command in ndb_mgm
ndb/src/mgmsrv/main.cpp:
added config.ini as default configuration file
-d default on ndb_mgmd and ndbd
-i depricated on ndbd
fixed bug in shutdown command in ndb_mgm
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
"test: argument expected" error when trying to run the NDB test
suite on Solaris
mysql-test/ndb/ndbcluster.sh:
- fixed typo that caused a "test: argument expected" error when trying
to run the NDB test suite on Solaris
