| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| | |
into mysql.com:/users/lthalmann/bk/mysql-5.0
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into mysql.com:/users/lthalmann/bk/mysql-5.0
myisam/mi_rkey.c:
Auto merged
mysql-test/r/subselect2.result:
Auto merged
mysql-test/t/select.test:
Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
configure.in:
After merge fixes
myisam/mi_search.c:
After merge fixes
mysql-test/r/select.result:
After merge fixes
sql/item.cc:
After merge fixes
sql/sql_parse.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
- Added error printout and nice exit for duplicate default sections
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Corrected platform name output
Services.cpp:
Dont print null address (back port from 5.0)
ndb/src/mgmsrv/Services.cpp:
Dont print null address (back port from 5.0)
scripts/make_binary_distribution.sh:
Corrected platform name output
|
|/ / |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
ndb/src/mgmsrv/Services.cpp:
Auto merged
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
(and contain extern "C" when necessary)
|
| | | |
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | | |
BitKeeper/deleted/.del-ndb_range_bounds.pl~ff7e47a35fb44c74:
Delete: mysql-test/ndb/ndb_range_bounds.pl
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Check returnvalue on load/fetch configuration
ndb/tools/ndb_config.cpp:
Check returnvalue on load/fetch configuration
|
| | | | |
|
|\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
ndb/src/mgmsrv/Services.cpp:
Auto merged
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
message)
+ revised error messages after feedback
+ revides classifications and status
+ removed all progError(..0..) to make sure all error invocations have an error code
+ added some new error codes to replace some generic usage of SYSTEM_ERROR
+ removed some unused codes
configure.in:
Bug #11749 No message slogan found for Signal 8 received. (need better message)
ndb/include/kernel/signaldata/SystemError.hpp:
+ removed some unused codes
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
+ removed all progError(..0..) to make sure all error invocations have an error code
ndb/src/kernel/main.cpp:
Bug #11749 No message slogan found for Signal 8 received. (need better message)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
moved all array allocation to READ_CONFIG_REQ (except CMVI which was not possible)
reorganized READ_CONFIG_REQ call order in ndb cntr to make sure TUP allocates first
moved allocations internally in TUP to allocate DataMem first
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
- added proper error message on all failed array pool mallocs
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
- added 2 new error codes for out of data and index memory during SR
+ removed c++ style comments from c file
ndb/include/mgmapi/ndbd_exit_codes.h:
Bug #13197 NDB needs better error message for not enough memory.
- added 2 new error codes for out of data and index memory during SR
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Bug #13197 NDB needs better error message for not enough memory.
- added 2 new error codes for out of data and index memory during SR
ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp:
Bug #13197 NDB needs better error message for not enough memory.
- added 2 new error codes for out of data and index memory during SR
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
BitKeeper/deleted/.del-ErrorMessages.hpp~9ab815d55a13433a:
Delete: ndb/src/kernel/error/ErrorMessages.hpp
config/ac-macros/ha_ndbcluster.m4:
add ndb mgmapi to ndbcluster_includes
extra/perror.c:
perror to print also ndbd exit codes
ndb/include/Makefile.am:
added new ndbd exit code include file to src distribution
ndb/include/kernel/signaldata/EventReport.hpp:
backported from 5.1, included node id in event report signal
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
backported from 5.1, included node id in event report signal
|
|\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
sql/sql_table.cc:
Auto merged
sql/table.cc:
Auto merged
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
fix solaris problem
(dont print null)
ndb/src/mgmsrv/Services.cpp:
Dont print null address
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix 32/64 bit insecure code
ndb/src/mgmsrv/InitConfigFileParser.cpp:
Fix 32/64 bit insecure/useless code
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into mysql.com:/home/hartmut/projects/mysql/dev/5.0
ndb/tools/ndb_config.cpp:
Auto merged
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Fix compile error with gcc296
ndb/src/common/util/SimpleProperties.cpp:
Fix compile error with gcc296
|
| |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvrConfig.cpp:
Auto merged
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
include/my_sys.h:
Auto merged
mysys/default.c:
Auto merged
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Add support/test for using my.cnf [cluster_config]
mysql-test/r/ndb_config.result:
Add support for ndb_config to read my.cnf
mysql-test/t/ndb_config.test:
Add support for ndb_config to read my.cnf
ndb/src/mgmsrv/InitConfigFileParser.cpp:
merge
ndb/tools/ndb_config.cpp:
Add support for ndb_config to read my.cnf
mysql-test/std_data/ndb_config_mycnf1.cnf:
New BitKeeper file ``mysql-test/std_data/ndb_config_mycnf1.cnf''
|
| | | |\ \ \
| | | | | |/
| | | | |/|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
mysql-test/r/ndb_config.result:
Auto merged
mysql-test/t/ndb_config.test:
Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
Auto merged
ndb/src/mgmsrv/InitConfigFileParser.hpp:
Auto merged
ndb/tools/ndb_config.cpp:
Auto merged
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
add support for reading config.ini from ndb_config
(as alternative to contacting ndb_mgmd)
mysql-test/r/ndb_config.result:
Add support for reading config.ini from ndb_config
mysql-test/t/ndb_config.test:
Add support for reading config.ini from ndb_config
ndb/src/mgmsrv/InitConfigFileParser.cpp:
Handle prinouts better
ndb/src/mgmsrv/InitConfigFileParser.hpp:
Handle prinouts better
ndb/tools/ndb_config.cpp:
Add support for reading config.ini from ndb_config
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
allow ndb_mgmd to use my.cnf for cluster configuration
ndb/src/mgmsrv/ConfigInfo.cpp:
Depricate Id infavor of nodeid in config.ini
ndb/src/mgmsrv/InitConfigFileParser.cpp:
Add support for getting cluster config from my.cnf [cluster_config]
ndb/src/mgmsrv/InitConfigFileParser.hpp:
Add support for getting cluster config from my.cnf [cluster_config]
ndb/src/mgmsrv/MgmtSrvr.cpp:
Add support for getting cluster config from my.cnf [cluster_config]
ndb/src/mgmsrv/MgmtSrvrConfig.cpp:
Add support for getting cluster config from my.cnf [cluster_config]
ndb/src/mgmsrv/main.cpp:
Add support for getting cluster config from my.cnf [cluster_config]
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
ndb/include/mgmapi/ndb_logevent.h:
more post-merge fixes
ndb/src/mgmapi/ndb_logevent.cpp:
more post-merge fixes
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
ndb/include/mgmapi/ndb_logevent.h:
Merge fix - add SingleUser log events
ndb/src/common/debugger/EventLogger.cpp:
merge fix - add text for SingleUser log events.
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
merge fix
ndb/src/mgmapi/ndb_logevent.cpp:
add SingeUser log info
|
| |\ \ \ \ \
| | | |_|_|/
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
into mysql.com:/home/stewart/Documents/MySQL/5.0/main
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
ndb/src/mgmclient/CommandInterpreter.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/include/kernel/signaldata/EventReport.hpp:
merge
ndb/src/common/debugger/EventLogger.cpp:
merge
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
merge
ndb/src/mgmsrv/MgmtSrvr.cpp:
merge
|
| | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
into mysql.com:/home/stewart/Documents/MySQL/4.1/main
|
| | | |\ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
into mysql.com:/home/stewart/Documents/MySQL/4.1/main
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Bug reported by Adam Dixon - table name needs quoting.
ndb/tools/ndb_size.pl:
Always quote the table and database names when sending to cluster.
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Initial ndb_size.pl
Connects to an existing MySQL database and produces a XHTML document containing
an estimation of storage requirements.
ndb/tools/ndb_size.pl:
Initial checkin of ndb_size.pl
ndb/tools/ndb_size.tmpl:
Initial checkin of XHTML template file for ndb_size.pl
|
| | |\ \ \ \ \ \
| | | |/ / / / /
| | |/| | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
into mysql.com:/home/stewart/Documents/MySQL/4.1/mgmd
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
ndb/src/mgmsrv/MgmtSrvr.cpp:
Document why getOwnNodeID==nodeId is different in ::versionNode
ndb/src/mgmsrv/MgmtSrvr.hpp:
Document the usage of the address pointer returned from status()
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
BUG#12037 ndb_mgmd IP address do not show in other ndb_mgmd processes
Extend ApiVersionConf to include address.
ndb/include/kernel/signaldata/ApiVersion.hpp:
Extend ApiVersionConf to include inet_addr. the address used for communication to this node.
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
include connect address in ApiVersionConf
ndb/src/mgmsrv/MgmtSrvr.cpp:
::status() now also returns char* address of the node.
For API or MGM, this is in ApiVersionConf.
For NDB, this is the standard get_connect_address.
When sending ApiVersionReq, try to send to a STARTED node (as these have
properly joined the cluster and know the connect addresses).
If versionNode is called for getOwnNodeId()==nodeId, try to get the address
via ApiVersionConf. If that fails, look it up in the configuration.
ndb/src/mgmsrv/MgmtSrvr.hpp:
Add char **address to prototypes.
ndb/src/mgmsrv/Services.cpp:
Get the connect address from mgmsrv.status()
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Some new code that does this job is being written against 5.1. This code is
largely removed from that work.
ndb/include/kernel/GlobalSignalNumbers.h:
remove dead (never used) MGM_(UN)LOCK signal numbers
ndb/src/mgmsrv/Config.cpp:
remove unused generation number code.
remove unused Config::change
ndb/src/mgmsrv/Config.hpp:
remove unused generation number prototypes.
ndb/src/mgmsrv/MgmtSrvr.cpp:
remove unused getPrimaryNode
ndb/src/mgmsrv/MgmtSrvr.hpp:
remove prototypes for config lock and commit/rollback.
ndb/src/mgmsrv/MgmtSrvrConfig.cpp:
remove CONFIG (UN)LOCK signals, lockConf/unlockConf, commit/rollback and changeConfig.
never used.
ndb/src/mgmsrv/Services.cpp:
remove unused configuration locking code
ndb/src/mgmsrv/Services.hpp:
remove usused configuration locking code
|
| | | |\ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
into mysql.com:/home/stewart/Documents/MySQL/4.1/mgmd
|
| | | | | | | | | |
|
| | | | |\ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
|
| | | | | | | | | | |
|
| | | | | |\ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
|
| | | | | | | | | | | |
|
| | |\ \ \ \ \ \ \ \ \
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
into mysql.com:/home/stewart/Documents/MySQL/4.1/main
|
| | |\ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|_|/
| | | |/| | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
into mysql.com:/home/stewart/Documents/MySQL/4.1/main
|