- no injected events if operation is not connected
- remove extra valgrind checks
sql/ha_ndbcluster_binlog.cc:
removed extra valgrind check
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
valgrind leak
- no injected events if operation is not connected
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
storage/ndb/test/ndbapi/testBasic.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
into mysql.com:/home/gluh/MySQL/Merge/5.1
mysql-test/r/view.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/item.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
- added extra cluster connect inicator bit for better handeling of delacation of event operations on cluster disconnect
- added extra assert to try to track down valgrind issue
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/gluh/MySQL/Merge/5.1-opt
BitKeeper/etc/ignore:
auto-union
mysql-test/r/func_in.result:
Auto merged
mysql-test/r/range.result:
Auto merged
mysql-test/r/sp-code.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/t/func_in.test:
Auto merged
mysql-test/t/range.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
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
mysql-test/r/select.result:
manual merge
mysql-test/r/view.result:
manual merge
mysql-test/t/select.test:
manual merge
mysql-test/t/view.test:
manual merge
Fix read after delete (in same op)
- lqh, handling of attrinfo
- tup, setup read for disk/varchar
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Dont save ATTRINFO "also" for DELETE, even when getting it in separate signal
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Add disk flag to signature
(for read after delete)
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Do setup read before read after delete
storage/ndb/test/ndbapi/testBasic.cpp:
testcase
storage/ndb/test/run-test/daily-basic-tests.txt:
testcase
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
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
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
- add some sanity check to marker/hash code to see that element isnt inserted twice into hashtable
(if defined VM_TRACE or ERROR_INSERT)
- allow REMOVE_MARKER_ORD to fail(dont find record) in release
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
add a bunch of sanity check ifdef#vmtrace of #error_insert
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
add a bunch of sanity check ifdef#vmtrace of #error_insert
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.hpp:
Auto merged
Make sure subscriber is removed from list when n_subscribers is decreased
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
Make sure subscriber is removed from list when n_subscribers is decreased
storage/ndb/src/kernel/blocks/suma/Suma.hpp:
Make sure subscriber is removed from list when n_subscribers is decreased
Fix assertion in corner-case where signal isnt sent to any node
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Fix corner-case where signal isnt sent to any node
storage/archive/archive_reader.c:
Print minor information version.
storage/archive/archive_test.c:
Fixed test
storage/archive/azio.c:
Added support for "minor" version.
storage/archive/azlib.h:
Added information for minor information.
2) We now store shortest and longest row information.
3) archive_reader can now check and backup files (even if they are hot)
4) We now record longest and shortest row information for stats.
storage/archive/archive_reader.c:
Added options for:
1) Online backup for tables
2) Check table option.
storage/archive/archive_test.c:
Additional test, format is now the same as an actual table.
storage/archive/azio.c:
Fixed issue closing files multiple times.
Added option for recording longest and shortest rows.
Additional "dirty" state added.
storage/archive/azlib.h:
Added additional space for longest and shortest row information.
storage/archive/ha_archive.cc:
Cleaned up warming and removed unneeded close.
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
fix some more sp100 hang cases
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
let suma know of API_FAILREQ even if not connected, to handle startme/handover
problem
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
some error inserts
+ resend API_FAILREQ during handover
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
BUILD/check-cpu:
Auto merged
client/mysqltest.c:
Auto merged
include/my_global.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~2f6eabb2f69cb33d:
Auto merged
mysql-test/lib/mtr_cases.pl:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/mysqladmin.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
mysys/mf_iocache.c:
Auto merged
mysys/my_read.c:
Auto merged
mysys/my_seek.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
scripts/mysqlbug.sh:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item_sum.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
storage/myisam/mi_packrec.c:
Auto merged
tests/mysql_client_test.c:
Auto merged
Makefile.am:
Use local
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
Use local
sql/mysqld.cc:
Use local
strings/ctype-extra.c:
SCCS merged
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
BUILD/check-cpu:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/type_enum.result:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/mysqladmin.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/type_enum.test:
Auto merged
mysql-test/t/view.test:
Auto merged
mysys/my_read.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
server-tools/instance-manager/Makefile.am:
Auto merged
sql/event_queue.cc:
Auto merged
sql/field.h:
Auto merged
sql/item_sum.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.cc:
Auto merged
storage/federated/ha_federated.cc:
Auto merged
server-tools/instance-manager/instance.cc:
Use remote (global 5.1 version)
sql/unireg.cc:
Use remote (5.1 global version)
mysql-test/t/trigger.test:
Manual merge
server-tools/instance-manager/guardian.cc:
Manual merge
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/include/portlib/NdbMem.h:
Auto merged
storage/ndb/src/common/portlib/NdbMem.c:
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.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
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/include/portlib/NdbMem.h:
Auto merged
storage/ndb/src/common/portlib/NdbMem.c:
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/src/kernel/blocks/cmvmi/Cmvmi.cpp:
merge
- blob event operation not reference counted correctly, missing TE_ACTIVE
- add reference counting for blobs events
- make sure also blob event operations get TE_ACTIVE
- some minor cleanups + adjustment of dbug prints
additional fix after autotest
dont send start_fragreq to temporary tables such as ordered indexes...
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
dont send START_FRAGREQ to temporary tables (such as ordered indexes)
