sql/ha_ndbcluster.cc:
Bug #26021: make sure ndbcluster_create_event_ops even if no binlogging as flags NSF_NO_BINLOG is set there
set NSS_DROPPED state in handle_trailing_share if appropriate
added dbug printout and comments for NDB_SHARE references
sql/ha_ndbcluster_binlog.cc:
Bug #26021: set NSF_NO_BINLOG if !ndb_binlog_running
Bug #26021: only reuse share if share_may_exist
setup apply_status table to be logged always, even if no binlogging
added dbug printout and comments for NDB_SHARE references
- add ndb_share connect_count to decide if share can be reused to setup replication
sql/ha_ndbcluster.cc:
add additional logging info
remove inline real_free_share (not needed) and confuses valgrind printout
sql/ha_ndbcluster.h:
add connect_count to ndb_share to enable checking for version of share
sql/ha_ndbcluster_binlog.cc:
use ndb_share connect_count to decide if share can be reused to setup replication
- share will be created early if table is accessed prior to handler setting up binlog stuff, see bug 26021
sql/ha_ndbcluster_binlog.h:
remove inline real_free_share (not needed) and confuses valgrind printout
dbug/dbug.c:
Build fix for sunfire100b. The ld does not want to link with an empty library, so we put something in it.
dbug/factorial.c:
Build fix for sunfire100b. When DBUG_OFF is defined, dbug is not there, and we can't use it even if we try, period.
temporary fix
libmysqld/lib_sql.cc:
BUG#25895 compiling the server with embedded fails on several 64-bit platforms
do not try to cast THD* to pthread_t, this operation is not possible
- 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/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