- 21 Feb, 2007 6 commits
-
-
unknown authored
into mysql.com:/home/my/mysql-5.0 ndb/include/util/OutputStream.hpp: Auto merged ndb/src/common/debugger/EventLogger.cpp: Auto merged ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Auto merged ndb/src/kernel/blocks/dbdih/Dbdih.hpp: Auto merged ndb/src/kernel/blocks/dblqh/Dblqh.hpp: Auto merged ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Auto merged ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged ndb/src/kernel/blocks/dbtup/Dbtup.hpp: Auto merged ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp: Auto merged ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Auto merged ndb/src/kernel/blocks/qmgr/Qmgr.hpp: Auto merged ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Auto merged ndb/src/mgmapi/mgmapi.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/ndbapi/ClusterMgr.hpp: Auto merged ndb/src/ndbapi/SignalSender.cpp: Auto merged sql/ha_ndbcluster.cc: Auto merged
-
unknown authored
This also fixes a bug in counting number of rows that are updated when we have many simultanous queries extra/yassl/src/ssl.cpp: Removed compiler warning extra/yassl/taocrypt/src/asn.cpp: After merge fixes extra/yassl/testsuite/testsuite.cpp: Removed compiler warning mysql-test/r/ndb_lock.result: After merge fixes ndb/src/common/debugger/EventLogger.cpp: Removed compiler warning ndb/src/common/util/ConfigValues.cpp: Removed compiler warning ndb/src/common/util/NdbSqlUtil.cpp: Removed compiler warning ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Removed compiler warning ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp: Removed compiler warning ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp: Removed compiler warning ndb/src/kernel/vm/ndbd_malloc.cpp: Removed compiler warning ndb/src/mgmclient/main.cpp: Removed compiler warning ndb/src/ndbapi/SignalSender.cpp: Removed compiler warning sql/ha_ndbcluster.cc: Some extra safety sql/item_cmpfunc.cc: After merge fixes sql/item_subselect.cc: After merge fixes sql/sql_insert.cc: After merge fixes (This actually fixes a bug in old code when many connections are in use) support-files/compiler_warnings.supp: Removed some suppressed warnings
-
unknown authored
into poseidon.mysql.com:/home/tomas/mysql-5.0
-
unknown authored
into mysql.com:/home/my/mysql-5.0 BitKeeper/etc/ignore: auto-union BUILD/SETUP.sh: Auto merged Makefile.am: Auto merged client/mysql.cc: Auto merged cmd-line-utils/readline/display.c: Auto merged configure.in: Auto merged extra/yassl/include/buffer.hpp: Auto merged extra/yassl/include/crypto_wrapper.hpp: Auto merged extra/yassl/include/yassl_imp.hpp: Auto merged extra/yassl/include/yassl_int.hpp: Auto merged extra/yassl/src/crypto_wrapper.cpp: Auto merged extra/yassl/taocrypt/include/algebra.hpp: Auto merged extra/yassl/taocrypt/include/des.hpp: Auto merged extra/yassl/taocrypt/include/hash.hpp: Auto merged extra/yassl/taocrypt/include/hmac.hpp: Auto merged extra/yassl/taocrypt/include/modarith.hpp: Auto merged extra/yassl/taocrypt/include/modes.hpp: Auto merged extra/yassl/taocrypt/include/rsa.hpp: Auto merged extra/yassl/taocrypt/include/type_traits.hpp: Auto merged extra/yassl/taocrypt/mySTL/list.hpp: Auto merged extra/yassl/taocrypt/src/aes.cpp: Auto merged extra/yassl/taocrypt/src/algebra.cpp: Auto merged extra/yassl/testsuite/testsuite.cpp: Auto merged include/my_global.h: Auto merged include/my_pthread.h: Auto merged libmysqld/lib_sql.cc: Auto merged myisam/mi_open.c: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/mysqltest.result: Auto merged mysql-test/t/mysqltest.test: Auto merged mysys/default.c: Auto merged ndb/src/common/transporter/Transporter.cpp: Auto merged ndb/src/common/util/File.cpp: Auto merged ndb/src/common/util/SocketClient.cpp: Auto merged ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Auto merged ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Auto merged ndb/src/kernel/blocks/qmgr/Qmgr.hpp: Auto merged ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Auto merged ndb/src/mgmapi/mgmapi.cpp: Auto merged ndb/src/mgmclient/CommandInterpreter.cpp: Auto merged ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged ndb/src/ndbapi/ClusterMgr.hpp: Auto merged ndb/src/ndbapi/Ndb.cpp: Auto merged ndb/src/ndbapi/NdbScanOperation.cpp: Auto merged ndb/src/ndbapi/SignalSender.cpp: Auto merged sql/field.cc: Auto merged sql/filesort.cc: Auto merged sql/ha_myisammrg.cc: Auto merged sql/handler.cc: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_func.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_subselect.h: Auto merged sql/item_sum.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/net_serv.cc: Auto merged sql/opt_range.cc: Auto merged sql/opt_range.h: Auto merged sql/repl_failsafe.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/slave.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_union.cc: Auto merged sql/sql_update.cc: Auto merged sql-common/client.c: Auto merged sql/sql_view.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged sql/unireg.cc: Auto merged extra/yassl/taocrypt/src/asn.cpp: Manual merge (Fix shadowed variable name) extra/yassl/taocrypt/test/test.cpp: No changes ndb/src/common/util/ConfigValues.cpp: Manual merge (Fix shadowed variable name) sql/field.h: manual merge sql/ha_myisam.cc: manual merge sql/ha_ndbcluster.cc: manual merge sql/item_cmpfunc.cc: manual merge sql/item_subselect.cc: Manual merge (Fix shadowed variable name) sql/mysqld.cc: no changes
-
unknown authored
Fixed that --extern works with mysql-test-run.pl Small trivial cleanups include/my_global.h: Fixed unsafe define of uint4korr() mysql-test/lib/mtr_report.pl: Removed wrong messages when using --extern mysql-test/mysql-test-run.pl: Fixed that --extern works Print help on stdout instead of stderr (make it easier to pipe it to less) mysql-test/t/ndb_lock.test: Added other possible error code sql/sql_prepare.cc: Removed not needed casts
-
unknown authored
into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
-
- 20 Feb, 2007 4 commits
- 19 Feb, 2007 7 commits
-
-
unknown authored
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
-
unknown authored
ndb/test/ndbapi/testBitfield.cpp: fix correct argv/argc handling in testBitfield
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb ndb/test/run-test/daily-basic-tests.txt: Auto merged
-
unknown authored
forgott to add testcase for bug#26481 ndb/test/run-test/daily-basic-tests.txt: forgott to add testcase for bug#26481
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb ndb/src/kernel/blocks/dbdih/Dbdih.hpp: Auto merged ndb/src/kernel/blocks/dbdih/DbdihInit.cpp: Auto merged ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged ndb/test/ndbapi/testNodeRestart.cpp: Auto merged
-
unknown authored
fix for killed node during initial node restart ndb/src/kernel/blocks/dbdih/Dbdih.hpp: add flag for initial node restart, to keep track on when to concider it to be "done" ndb/src/kernel/blocks/dbdih/DbdihInit.cpp: add flag for initial node restart, to keep track on when to concider it to be "done" ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: add flag for initial node restart, to keep track on when to concider it to be "done" ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Check cstartRecReq also when refusing GCP_SAVEREQ ndb/test/ndbapi/testNodeRestart.cpp: add testcase
-
- 17 Feb, 2007 3 commits
-
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb ndb/test/include/NdbRestarter.hpp: Auto merged ndb/test/ndbapi/testNodeRestart.cpp: Auto merged ndb/test/run-test/daily-basic-tests.txt: Auto merged ndb/test/src/NdbRestarter.cpp: Auto merged ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: merge
-
unknown authored
master failure during master take over ndb/src/kernel/blocks/ERROR_codes.txt: new error code ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Make sure to clear NF_XX_LCP if master fails during master take-over ndb/test/include/NdbRestarter.hpp: Add support for querying next master and node group (for multi node failure testing) ndb/test/ndbapi/testNodeRestart.cpp: testcase ndb/test/run-test/daily-basic-tests.txt: testcase ndb/test/src/NdbRestarter.cpp: Add support for querying next master and node group (for multi node failure testing)
-
unknown authored
into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
-
- 16 Feb, 2007 7 commits
-
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb ndb/src/mgmsrv/InitConfigFileParser.cpp: Auto merged
-
unknown authored
backport fix from 5.1 ndb/src/mgmsrv/InitConfigFileParser.cpp: backport fix from 5.1
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Auto merged
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Auto merged
-
unknown authored
make lockpages=1 run a bit earlier in startup ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: change order
-
unknown authored
into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
-
unknown authored
into chilla.local:/home/mydev/mysql-5.0-axmrg
-
- 14 Feb, 2007 13 commits
-
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint sql/mysql_priv.h: Auto merged
-
unknown authored
into chilla.local:/home/mydev/mysql-5.0-axmrg sql/item.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/sql_select.cc: Auto merged
-
unknown authored
into chilla.local:/home/mydev/mysql-5.0-axmrg mysys/my_pthread.c: SCCS merged
-
unknown authored
into willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-merge
-
unknown authored
new file
-
unknown authored
remove compiler warning EventLogger.cpp Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11 - partial fix - object map to handle failed realloc mysql-test/ndb/ndb_config_2_node.ini: backport some mysql-test ndbcluster things from 5.1 mysql-test/ndb/ndbcluster.sh: backport some mysql-test ndbcluster things from 5.1 ndb/src/common/debugger/EventLogger.cpp: remove compiler warning ndb/src/ndbapi/ObjectMap.hpp: Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11 - partial fix - object map to handle failed realloc
-
unknown authored
into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb sql/ha_ndbcluster.cc: Auto merged
-
unknown authored
- do not call function if table has no autoincrement
-
unknown authored
into willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-merge ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: SCCS merged
-
unknown authored
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing Remove the dead SET_VAR_REQ,REF,CONF signals. They: a) don't currently work b) will cause confusion with future mgmd updates for signal interface to configuration things (e.g. port numbers) ndb/include/kernel/GlobalSignalNumbers.h: remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing Remove the dead SET_VAR_REQ,REF,CONF signals. They: a) don't currently work b) will cause confusion with future mgmd updates for signal interface to configuration things (e.g. port numbers) ndb/src/common/debugger/signaldata/SignalNames.cpp: remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing Remove the dead SET_VAR_REQ,REF,CONF signals. They: a) don't currently work b) will cause confusion with future mgmd updates for signal interface to configuration things (e.g. port numbers) ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing Remove the dead SET_VAR_REQ,REF,CONF signals. They: a) don't currently work b) will cause confusion with future mgmd updates for signal interface to configuration things (e.g. port numbers) ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp: remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing Remove the dead SET_VAR_REQ,REF,CONF signals. They: a) don't currently work b) will cause confusion with future mgmd updates for signal interface to configuration things (e.g. port numbers) ndb/src/kernel/blocks/dbacc/Dbacc.hpp: remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing Remove the dead SET_VAR_REQ,REF,CONF signals. They: a) don't currently work b) will cause confusion with future mgmd updates for signal interface to configuration things (e.g. port numbers) ndb/src/kernel/blocks/dbacc/DbaccInit.cpp: remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing Remove the dead SET_VAR_REQ,REF,CONF signals. They: a) don't currently work b) will cause confusion with future mgmd updates for signal interface to configuration things (e.g. port numbers) ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing Remove the dead SET_VAR_REQ,REF,CONF signals. They: a) don't currently work b) will cause confusion with future mgmd updates for signal interface to configuration things (e.g. port numbers) ndb/src/kernel/blocks/dbdih/Dbdih.hpp: remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing Remove the dead SET_VAR_REQ,REF,CONF signals. They: a) don't currently work b) will cause confusion with future mgmd updates for signal interface to configuration things (e.g. port numbers) ndb/src/kernel/blocks/dbdih/DbdihInit.cpp: remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing Remove the dead SET_VAR_REQ,REF,CONF signals. They: a) don't currently work b) will cause confusion with future mgmd updates for signal interface to configuration things (e.g. port numbers) ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing Remove the dead SET_VAR_REQ,REF,CONF signals. They: a) don't currently work b) will cause confusion with future mgmd updates for signal interface to configuration things (e.g. port numbers) ndb/src/kernel/blocks/dblqh/Dblqh.hpp: remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing Remove the dead SET_VAR_REQ,REF,CONF signals. They: a) don't currently work b) will cause confusion with future mgmd updates for signal interface to configuration things (e.g. port numbers) ndb/src/kernel/blocks/dblqh/DblqhInit.cpp: remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing Remove the dead SET_VAR_REQ,REF,CONF signals. They: a) don't currently work b) will cause confusion with future mgmd updates for signal interface to configuration things (e.g. port numbers) ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing Remove the dead SET_VAR_REQ,REF,CONF signals. They: a) don't currently work b) will cause confusion with future mgmd updates for signal interface to configuration things (e.g. port numbers) ndb/src/kernel/blocks/dbtc/Dbtc.hpp: remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing Remove the dead SET_VAR_REQ,REF,CONF signals. They: a) don't currently work b) will cause confusion with future mgmd updates for signal interface to configuration things (e.g. port numbers) ndb/src/kernel/blocks/dbtc/DbtcInit.cpp: remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing Remove the dead SET_VAR_REQ,REF,CONF signals. They: a) don't currently work b) will cause confusion with future mgmd updates for signal interface to configuration things (e.g. port numbers) ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing Remove the dead SET_VAR_REQ,REF,CONF signals. They: a) don't currently work b) will cause confusion with future mgmd updates for signal interface to configuration things (e.g. port numbers) ndb/src/kernel/blocks/dbtup/Dbtup.hpp: remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing Remove the dead SET_VAR_REQ,REF,CONF signals. They: a) don't currently work b) will cause confusion with future mgmd updates for signal interface to configuration things (e.g. port numbers) ndb/src/kernel/blocks/dbtup/DbtupGen.cpp: remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing Remove the dead SET_VAR_REQ,REF,CONF signals. They: a) don't currently work b) will cause confusion with future mgmd updates for signal interface to configuration things (e.g. port numbers) ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp: remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing Remove the dead SET_VAR_REQ,REF,CONF signals. They: a) don't currently work b) will cause confusion with future mgmd updates for signal interface to configuration things (e.g. port numbers) ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp: remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing Remove the dead SET_VAR_REQ,REF,CONF signals. They: a) don't currently work b) will cause confusion with future mgmd updates for signal interface to configuration things (e.g. port numbers) ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing Remove the dead SET_VAR_REQ,REF,CONF signals. They: a) don't currently work b) will cause confusion with future mgmd updates for signal interface to configuration things (e.g. port numbers) ndb/src/kernel/blocks/qmgr/Qmgr.hpp: remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing Remove the dead SET_VAR_REQ,REF,CONF signals. They: a) don't currently work b) will cause confusion with future mgmd updates for signal interface to configuration things (e.g. port numbers) ndb/src/kernel/blocks/qmgr/QmgrInit.cpp: remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing Remove the dead SET_VAR_REQ,REF,CONF signals. They: a) don't currently work b) will cause confusion with future mgmd updates for signal interface to configuration things (e.g. port numbers) ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing Remove the dead SET_VAR_REQ,REF,CONF signals. They: a) don't currently work b) will cause confusion with future mgmd updates for signal interface to configuration things (e.g. port numbers) ndb/src/mgmsrv/MgmtSrvr.hpp: remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing Remove the dead SET_VAR_REQ,REF,CONF signals. They: a) don't currently work b) will cause confusion with future mgmd updates for signal interface to configuration things (e.g. port numbers)
-
unknown authored
remove GSN_STATISTICS_REQ and CONF These are unused and have been since BK import. not needed. ndb/include/kernel/GlobalSignalNumbers.h: remove STATISTICS_REQ and CONF ndb/src/common/debugger/signaldata/SignalNames.cpp: remove signal names for STATISTICS_REQ and CONF (unused) ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: remove unused STATISTICS signals ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp: remove unused STATISTICS signals
-
unknown authored
Don't send uninit data in TAMPER_ORD to DIHNDBTAMPER Even though this data is unused from the CMVMI (mgmd) signal, we shouldn't be doing stuff with uninited data. ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: init the 3rd word of DIHNDBTAMPER before sending to DIH.
-
unknown authored
ndb/include/mgmapi/mgmapi.h: use constant for max log level in ndb_mgmd. (more useful in 5.1 due to other defines and refinements of mgmapi) ndb/src/mgmsrv/Services.cpp: fix the XXX fixme of constant for max log level
-