- record structure wrongly deallocated during online alter on remote mysqld
- change so that ndb handler allocates the buffer itself, so it can be reused after alter
Fix recursive mutex lock in drop index (ndbapi programs only)
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Fix recursive mutex lock in drop index (ndbapi programs only)
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Fix recursive mutex lock in drop index (ndbapi programs only)
into mysql.com:/home/psergey/mysql-5.1-merge
include/my_sys.h:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/include/util/SocketServer.hpp:
Auto merged
storage/ndb/src/common/util/SocketServer.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
Add mutex surronding sessions, as ndb_mgmd now actively tries to go and "purge stale sessions"
ndb/include/util/SocketServer.hpp:
Add mutex surronding sessions, as ndb_mgmd now actively tries to go and "purge stale sessions"
ndb/src/common/util/SocketServer.cpp:
Add mutex surronding sessions, as ndb_mgmd now actively tries to go and "purge stale sessions"
ndb/src/mgmsrv/Services.cpp:
Add mutex surronding sessions, as ndb_mgmd now actively tries to go and "purge stale sessions"
into mysql.com:/users/lthalmann/bk/mysql-5.1-new
mysql-test/r/binlog_stm_drop_tmp_tbl.result:
Auto merged
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
Auto merged
mysql-test/r/rpl_temporary.result:
Auto merged
mysql-test/t/mysqlbinlog.test:
Auto merged
mysql-test/t/rpl_stm_until.test:
Auto merged
sql/mysql_priv.h:
Auto merged
mysql-test/r/rpl_stm_until.result:
Manual merge
mysql-test/t/rpl_temporary.test:
Manual merge
sql/sql_base.cc:
Manual merge
into mysql.com:/usr/local/mysql/merge-5.1
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/trigger-grant.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/trigger-grant.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
server-tools/instance-manager/options.h:
Auto merged
sql/field_conv.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
server-tools/instance-manager/options.cc:
Manual merge
sql/item_func.cc:
Manual merge
sql/mysql_priv.h:
Manual merge
sql/sp_head.cc:
Manual merge
sql/sql_table.cc:
Manual merge
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/item_timefunc.cc:
Auto merged
Fixes bug#19040 "yaSSL does not compile on AIX".
extra/yassl/taocrypt/include/runtime.hpp:
Include "config.h" (if it exists) in all yaSSL files. This is needed to ensure the same
configure settings are used for yaSSL as for the other modules linked together.
Example: the settings for "large file" on AIX.
Fixes bug#19040 "yaSSL does not compile on AIX".
configure.in:
Auto merged
BitKeeper/deleted/.del-ctype_ucs_binlog.result~280d136b1a0bcf17:
Auto merged
BitKeeper/deleted/.del-mysql_prepare_privilege_tables_for_5.sql~76ea3c82bdbbead4:
Auto merged
mysql-test/extra/binlog_tests/binlog.test:
Auto merged
mysql-test/extra/rpl_tests/rpl_ddl.test:
Auto merged
mysql-test/extra/rpl_tests/rpl_multi_query.test:
Auto merged
mysql-test/r/archive_gis.result:
Auto merged
mysql-test/r/bdb_gis.result:
Auto merged
mysql-test/r/binlog_stm_binlog.result:
Auto merged
mysql-test/r/binlog_stm_blackhole.result:
Auto merged
mysql-test/r/binlog_stm_ctype_ucs.result:
Auto merged
mysql-test/r/grant2.result:
Auto merged
mysql-test/r/im_life_cycle.result:
Auto merged
mysql-test/r/im_utils.result:
Auto merged
mysql-test/r/insert_update.result:
Auto merged
mysql-test/r/innodb_gis.result:
Auto merged
mysql-test/r/mysqldump-max.result:
Auto merged
mysql-test/r/ndb_bitfield.result:
Auto merged
mysql-test/r/ndb_condition_pushdown.result:
Auto merged
mysql-test/r/ndb_database.result:
Auto merged
mysql-test/r/ndb_gis.result:
Auto merged
mysql-test/r/ndb_update.result:
Auto merged
mysql-test/r/rpl_create_database.result:
Auto merged
mysql-test/r/query_cache_notembedded.result:
Auto merged
mysql-test/r/rpl_drop_db.result:
Auto merged
mysql-test/r/rpl_multi_update3.result:
Auto merged
mysql-test/r/rpl_slave_status.result:
Auto merged
mysql-test/r/rpl_trigger.result:
Auto merged
mysql-test/r/rpl_view.result:
Auto merged
mysql-test/r/sp-code.result:
Auto merged
mysql-test/r/sp-vars.result:
Auto merged
mysql-test/r/sp_trans.result:
Auto merged
mysql-test/r/timezone_grant.result:
Auto merged
mysql-test/r/trigger-compat.result:
Auto merged
mysql-test/r/trigger-grant.result:
Auto merged
mysql-test/r/type_bit_innodb.result:
Auto merged
mysql-test/r/type_newdecimal.result:
Auto merged
mysql-test/r/view_grant.result:
Auto merged
mysql-test/t/binlog_row_binlog-master.opt:
Auto merged
mysql-test/t/binlog_stm_mix_innodb_myisam-master.opt:
Auto merged
mysql-test/t/create_select_tmp.test:
Auto merged
mysql-test/t/grant2.test:
Auto merged
mysql-test/t/handler.test:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/rpl_commit_after_flush.test:
Auto merged
mysql-test/t/rpl_insert_ignore.test:
Auto merged
mysql-test/t/rpl_rewrt_db-slave.opt:
Auto merged
mysql-test/t/rpl_rewrt_db.test:
Auto merged
mysys/mf_tempdir.c:
Auto merged
mysys/my_mmap.c:
Auto merged
sql/sql_bitmap.h:
Auto merged
sql/sql_handler.cc:
Auto merged
storage/bdb/dist/s_dir:
Auto merged
storage/myisam/ftbench/Ecompare.pl:
Auto merged
storage/myisam/ftbench/Ecreate.pl:
Auto merged
storage/myisam/ftbench/Ereport.pl:
Auto merged
storage/myisam/ftbench/README:
Auto merged
storage/myisammrg/myrg_range.c:
Auto merged
storage/myisammrg/myrg_rnext_same.c:
Auto merged
strings/decimal.c:
Auto merged
zlib/Makefile.am:
Auto merged
- Implement new switch --with-ssl to configure used for both bundled yaSSL or OpenSSL
BitKeeper/deleted/.del-yassl.m4~e55e55c1e863abaf:
Delete: config/ac-macros/yassl.m4
BitKeeper/deleted/.del-openssl.m4~41cebd0ba8281769:
Delete: config/ac-macros/openssl.m4
BUILD/SETUP.sh:
Use switch --with-ssl to configure
BUILD/compile-pentium-debug-openssl:
Use switch --with-ssl to configure
BUILD/compile-pentium-debug-yassl:
Use switch --with-ssl to configure
configure.in:
Change to use the MYSQL_CHECK_SSL macro from ssl.m4
config/ac-macros/ssl.m4:
New BitKeeper file ``config/ac-macros/ssl.m4''
into mysql.com:/home/kgeorge/mysql/5.1/merge
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/view.result:
Auto merged
sql/item_subselect.cc:
Auto merged
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
client/mysql.cc:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/rpl_temporary.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/rpl_temporary.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
- small correction of previous patch
storage/ndb/src/ndbapi/DictCache.cpp:
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
- cache not released properly
storage/ndb/tools/desc.cpp:
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
- added retry option so that ndb_desc can be used to wait for a table to be created
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
client/mysql.cc:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/rpl_temporary.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/rpl_temporary.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
ndb: ndb_waiter disconnect/reconnect on get status error
ndb/src/mgmapi/mgmapi.cpp:
ndb: added some missing error codes to mgmapi
ndb/tools/waiter.cpp:
ndb: ndb_waiter disconnect/reconnect on get status error
Removed Berkeley DB
configure.in:
Adjusted Netware support
basic.t.c:
Change for Netware
Makefile.am:
Use thread safe libmysqlclient_r if it was built
valgrind.supp:
Hide report about strlen/_dl_init_paths
ha_tina.cc:
Temporarely disable CSV engine on Netware,
as the engine depends on mmap()
net_serv.cc:
Include <sys/select.h> for Netware
sql/net_serv.cc:
Include <sys/select.h> for Netware
storage/csv/ha_tina.cc:
Temporarely disable CSV engine on Netware,
as the engine depends on mmap()
mysql-test/valgrind.supp:
Hide report about strlen/_dl_init_paths
tests/Makefile.am:
Use thread safe libmysqlclient_r if it was built
unittest/mytap/t/basic.t.c:
Change for Netware
configure.in:
Adjusted Netware support
support-files/mysql.spec.sh:
Removed Berkeley DB
