Fix uninit variable (potential segv) in Dbacc::sendNextScanConf
discovered by magnus addition in "globals_list"
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Fix uninit variable (potential segv) in sendNextScanConf
discovered by magnus addition in "globals_list"
into mysql.com:/home/jonas/src/mysql-5.0-ndb
BitKeeper/etc/logging_ok:
auto-union
sql/item.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
BitKeeper/etc/logging_ok:
auto-union
sql/item.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/ha_ndbcluster.cc:
SCCS merged
sql/ha_ndbcluster.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/ha_ndbcluster.cc:
Manual merge
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Proactive compile fix (in case we ever enable "EVENT_DEBUG" on IRIX):
Two identical declarations on loop level will collide at function level.
at function level.
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Avoid compilation error: On IRIX, variables declared within a loop control statement
seem to have function scope. Either use different identifiers, or declare them
at function level.
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Found use of uninitialised variable when increasing m_commit_count.
Moved initialisation of rootfragrecptr to before increase of m_commit_count, and removed the two initializations further down, since they are now unneccessary.
into hundin.mysql.fi:/home/heikki/mysql-5.0
innobase/log/log0recv.c:
Auto merged
ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb - Reenable MAX_OPEN_FILES to enable LCP in some situations
ndb/include/mgmapi/mgmapi_config_parameters.h:
Reenable MAX_OPEN_FILES to enable LCP in some situations
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
Reenable MAX_OPEN_FILES to enable LCP in some situations
ndb/src/mgmsrv/ConfigInfo.cpp:
Reenable MAX_OPEN_FILES to enable LCP in some situations
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
Build-tools/Do-compile:
Auto merged
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
include/my_sys.h:
Auto merged
innobase/buf/buf0lru.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/include/page0page.ic:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/os/os0thread.c:
Auto merged
innobase/rem/rem0cmp.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/trx/trx0sys.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
innobase/ut/ut0ut.c:
Auto merged
myisam/ft_parser.c:
Auto merged
myisam/mi_create.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/ndb_alter_table.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/ndb_alter_table.test:
Auto merged
mysys/hash.c:
Auto merged
mysys/my_bitmap.c:
Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
sql/net_serv.cc:
Auto merged
sql/sql_select.cc:
Auto merged
into mysql.com:/home/jonas/src/mysql-5.0
ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
ndb/test/run-test/daily-devel-tests.txt:
Auto merged
debug printouts
ndb documentation update
ndb/include/ndbapi/Ndb.hpp:
ndb documentation update
ndb/src/kernel/blocks/suma/Suma.cpp:
fixed mem leak in subscriction handling in Suma
debug printouts
ndb/src/kernel/blocks/suma/Suma.hpp:
fixed mem leak in subscriction handling in Suma
fix crashing bug in Dict caused by Suma on CREATE_SUBID_REF
ndb/include/kernel/signaldata/SumaImpl.hpp:
fix crashing bug in Dict caused by Suma on CREATE_SUBID_REF
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
fixed bug in event handling of several tables
ndb/include/kernel/signaldata/CreateEvnt.hpp:
remove obsolete attribute storage type ACC vs TUP
ndb/include/kernel/signaldata/CreateIndx.hpp:
remove obsolete attribute storage type ACC vs TUP
ndb/src/ndbapi/ndberror.c:
remove obsolete attribute storage type ACC vs TUP
ndb/test/include/NdbSchemaOp.hpp:
remove obsolete attribute storage type ACC vs TUP
ndb/test/ndbapi/bench/userInterface.cpp:
remove obsolete attribute storage type ACC vs TUP
ndb/test/src/NdbSchemaOp.cpp:
remove obsolete attribute storage type ACC vs TUP
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
ndb/test/run-test/daily-devel-tests.txt:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
mysql-test/r/bigint.result:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/symlink.test:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
ndb/test/run-test/daily-devel-tests.txt:
Auto merged
sql/item.h:
Auto merged
strings/ctype-win1250ch.c:
Auto merged
mysql-test/r/grant2.result:
Hand-merged new test
mysql-test/t/grant2.test:
Hand-merged new test
ndb/include/ndbapi/NdbTransaction.hpp:
Used 5.0 version per tomas
sql/sql_acl.cc:
Merge fix for Bug #3309.
temporary added trace printouts for ndb autotest
ndb/ndbapi-examples/ndbapi_async_example/Makefile:
updated example makefiles to add libmystrings
ndb/ndbapi-examples/ndbapi_async_example1/Makefile:
updated example makefiles to add libmystrings
ndb/ndbapi-examples/ndbapi_event_example/Makefile:
updated example makefiles to add libmystrings
ndb/ndbapi-examples/ndbapi_retries_example/Makefile:
updated example makefiles to add libmystrings
ndb/ndbapi-examples/ndbapi_scan_example/Makefile:
updated example makefiles to add libmystrings
ndb/ndbapi-examples/ndbapi_simple_example/Makefile:
updated example makefiles to add libmystrings
ndb/ndbapi-examples/ndbapi_simple_index_example/Makefile:
updated example makefiles to add libmystrings
ndb/src/common/transporter/TransporterRegistry.cpp:
temporary added trace printouts for ndb autotest
