into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/symlink.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/table.cc:
Auto merged
mysql-test/r/myisam.result:
Use local.
mysql-test/t/myisam.test:
Use local.
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/symlink.test:
Auto merged
sql/lock.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/table.cc:
Auto merged
storage/federated/ha_federated.cc:
Auto merged
storage/myisam/mi_check.c:
Auto merged
storage/myisam/mi_packrec.c:
Auto merged
mysql-test/r/myisam.result:
Manually merged.
mysql-test/t/myisam.test:
Manually merged.
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/symlink.test:
Auto merged
sql/table.cc:
Auto merged
mysql-test/r/myisam.result:
Manually merged.
mysql-test/t/myisam.test:
Manually merged.
Fixed test. On 32-bit machines which compile without
-DBIG_TABLES, MAX_ROWS is truncated to a 32-bit value.
Using a value below 4G is portable.
mysql-test/r/myisam.result:
Bug#24607 - MyISAM pointer size determined incorrectly
Fixed test results.
into mysql.com:/data0/mysqldev/users/tomas/mysql-5.1-build
configure.in:
Auto merged
cmd-line-utils/readline/undo.c:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
storage/myisam/mi_packrec.c:
Auto merged
into willster.(none):/home/stewart/Documents/MySQL/5.1/bug25567
storage/ndb/include/mgmapi/mgmapi.h:
Auto merged
storage/ndb/include/util/SocketClient.hpp:
Auto merged
storage/ndb/src/common/transporter/Transporter.cpp:
Auto merged
storage/ndb/src/common/util/SocketClient.cpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
mysql-test/r/ndb_basic.result:
from spaces, to tabs. what fun!
sql/ha_ndbcluster.h:
fix estimate_rows_upper_bound() to be correct for NDB
sql/sql_select.cc:
use non-exact records information
"Valgrind leak in closecon_handlerton"
plugin_shutdown() calls plugin_deinitialize() which calls ha_finalize_handlerton().
ndbcluster_end() fails to wait for the ndb utility thread to exit which results in
the handlerton struct being freed before the ndb utility thread has destroyed it's THD
but before the plugin has been marked as UNINITIALIZED
Bug is caused by misuse of abort_loops variable and not locking mutex during calls to
pthread condition variable functions causing a race in valgrind's pthread_cond_wait
implementation.
sql/ha_ndbcluster.cc:
Bug25396
Valgrind requires that mutex be held during call to pthread_cond_signal.
Change pthread_cond_timedwait() to pthread_cond_wait() where the timeout is not needed.
Ensure that appropiate variables are protected by mutex.
Remove use of abort_loop global variable.
Ensure that ndbcluster_end waits for util thread to exit.
Add an extra cond_var as insurance against non-conforming pthreads implementations.
sql/mysqld.cc:
Bug25386
Valgrind requires that mutex be held during call to pthread_cond_signal.
BUILD/compile-amd64-valgrind-max:
New BitKeeper file ``BUILD/compile-amd64-valgrind-max''
aim is to:
a) if set_connect_timeout called, timeout connect attempt (for retry on
next call) after timeout period
b) preserve existing blocking behaviour otherwise (for, e.g. mgmapi)
Related to customer issue with long time deleting ndb_cluster_connection
object. believe we're hanging on the connect(2) call until timeout (when
we then realise we should exit the thread).
ndb/include/mgmapi/mgmapi.h:
add ndb_mgm_set_connect_timeout
ndb/include/util/SocketClient.hpp:
add timeout (seconds) for max time to wait for connection
ndb/src/common/transporter/Transporter.cpp:
set limit on amount of time we'll wait for tcp connect
ndb/src/common/util/SocketClient.cpp:
only try to connect for a maximum of timeout time
ndb/src/mgmapi/mgmapi.cpp:
add ndb_mgm_set_connect_timeout
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
Auto merged
storage/ndb/src/ndbapi/ClusterMgr.hpp:
Auto merged
storage/ndb/src/ndbapi/SignalSender.cpp:
Auto merged
Fix bug in event handling wrt early node shutdown
ndb/src/mgmsrv/MgmtSrvr.cpp:
Fix bug in event handling wrt early node shutdown
ndb/src/ndbapi/ClusterMgr.cpp:
Fix reportNodeFailed if only connected wo/ having received any API_REGCONF
ndb/src/ndbapi/ClusterMgr.hpp:
Fix reportNodeFailed if only connected wo/ having received any API_REGCONF
ndb/src/ndbapi/SignalSender.cpp:
Fix memleak
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
sql/ha_ndbcluster.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
Auto merged
storage/ndb/include/portlib/NdbMem.h:
Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
Auto merged
storage/ndb/src/common/portlib/NdbMem.c:
Auto merged
storage/ndb/src/common/util/ConfigValues.cpp:
Auto merged
storage/ndb/src/common/util/File.cpp:
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
Auto merged
storage/ndb/src/kernel/vm/Configuration.hpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
mysql-test/r/ndb_basic.result:
manual merge
mysql-test/t/ndb_basic.test:
manual merge
storage/ndb/src/ndbapi/ndberror.c:
manual merge
