From: magnus.blaudd Date: June 8 2011 11:37am Subject: bzr push into mysql-trunk-cluster branch (magnus.blaudd:3312 to 3314) List-Archive: http://lists.mysql.com/commits/138863 MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3314 magnus.blaudd@stripped 2011-06-08 ndb - adapt to use mark_modified_non_trans_table() and has_modified_non_trans_table() - there is not way to turn off the flag, so remove the code setting it to false. Only keep the assert. modified: sql/ha_ndbcluster.cc sql/ndb_local_connection.cc 3313 magnus.blaudd@stripped 2011-06-08 ndb - remove subtraction of extra_length from key_length, since key_length no longer includes null bytes etc. modified: sql/ha_ndbcluster.cc 3312 magnus.blaudd@stripped 2011-05-20 [merge] Merge 5.5-cluster -> trunk-cluster removed: mysql-test/suite/ndb/include/add_six_nodes.inc mysql-test/suite/ndb/include/add_two_nodes.inc mysql-test/suite/ndb/include/reload_ndb_mgmd.inc mysql-test/suite/ndb/r/add_node01.result mysql-test/suite/ndb/r/add_node02.result mysql-test/suite/ndb/r/add_node03.result mysql-test/suite/ndb/t/add_node01.test mysql-test/suite/ndb/t/add_node02.test mysql-test/suite/ndb/t/add_node03.test mysql-test/suite/rpl_ndb/combinations mysql-test/suite/rpl_ndb/have_one_ndb.inc mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_d_d.inc mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_d_u.inc mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_i_i.inc mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_init.inc mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_u_d.inc mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_u_u.inc added: mysql-test/suite/ndb/data/ mysql-test/suite/ndb/r/ndb_global_schema_lock_error.result mysql-test/suite/ndb/t/ndb_global_schema_lock_error.test mysql-test/suite/ndb/t/ndb_mgm.inc mysql-test/suite/ndb/t/ndb_restart_nostart.inc mysql-test/suite/ndb/t/ndb_restart_start.inc mysql-test/suite/ndb/t/ndb_wait_nostart.inc mysql-test/suite/ndb/t/ndb_wait_started.inc mysql-test/suite/ndb/t/ndb_waiter.inc mysql-test/suite/ndb_rpl/ mysql-test/suite/ndb_rpl/my.cnf mysql-test/suite/ndb_rpl/r/ mysql-test/suite/ndb_rpl/r/ndb_rpl_ui.result mysql-test/suite/ndb_rpl/r/ndb_rpl_ui2.result mysql-test/suite/ndb_rpl/r/ndb_rpl_ui3.result mysql-test/suite/ndb_rpl/t/ mysql-test/suite/ndb_rpl/t/disabled.def mysql-test/suite/ndb_rpl/t/ndb_rpl_ui.test mysql-test/suite/ndb_rpl/t/ndb_rpl_ui2.test mysql-test/suite/ndb_rpl/t/ndb_rpl_ui3.test mysql-test/suite/rpl_ndb/t/check_conversions.inc storage/ndb/include/kernel/signaldata/DihRestart.hpp storage/ndb/include/kernel/signaldata/NodePing.hpp storage/ndb/src/common/debugger/signaldata/NodePing.cpp storage/ndb/src/kernel/blocks/dbtc/DbtcProxy.cpp storage/ndb/src/kernel/blocks/dbtc/DbtcProxy.hpp storage/ndb/src/kernel/vm/NdbSeqLock.hpp storage/ndb/src/ndbapi/NdbQueryBuilder.cpp storage/ndb/src/ndbapi/NdbQueryBuilder.hpp storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp storage/ndb/src/ndbapi/NdbQueryOperation.cpp storage/ndb/src/ndbapi/NdbQueryOperation.hpp storage/ndb/src/ndbapi/NdbQueryOperationImpl.hpp storage/ndb/test/include/HugoQueries.hpp storage/ndb/test/include/HugoQueryBuilder.hpp storage/ndb/test/ndbapi/testSpj.cpp storage/ndb/test/rqg/ storage/ndb/test/rqg/runall.sh storage/ndb/test/rqg/simple.zz storage/ndb/test/rqg/spj_test.yy storage/ndb/test/run-test/conf-blade08.cnf storage/ndb/test/src/HugoQueries.cpp storage/ndb/test/src/HugoQueryBuilder.cpp storage/ndb/test/tools/hugoJoin.cpp renamed: mysql-test/extra/rpl_tests/rpl_ndb_2multi_basic.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_2multi_basic.inc mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_2multi_eng.inc mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_xxx_innodb.inc mysql-test/extra/rpl_tests/select_ndb_apply_status.inc => mysql-test/suite/ndb_rpl/t/select_ndb_apply_status.inc mysql-test/include/ndb_conflict_info.inc => mysql-test/suite/ndb_rpl/t/ndb_conflict_info.inc mysql-test/include/ndb_conflict_info_init.inc => mysql-test/suite/ndb_rpl/t/ndb_conflict_info_init.inc mysql-test/suite/ndb/std_data/ => mysql-test/suite/ndb/backups/ mysql-test/suite/ndb/std_data/ndb_backup50/ => mysql-test/suite/ndb/backups/50/ mysql-test/suite/ndb/std_data/ndb_backup51/ => mysql-test/suite/ndb/backups/51/ mysql-test/suite/ndb/std_data/ndb_backup51_d2_be/ => mysql-test/suite/ndb/backups/51_d2_be/ mysql-test/suite/ndb/std_data/ndb_backup51_d2_le/ => mysql-test/suite/ndb/backups/51_d2_le/ mysql-test/suite/ndb/std_data/ndb_backup51_data_be/ => mysql-test/suite/ndb/backups/51_data_be/ mysql-test/suite/ndb/std_data/ndb_backup51_data_le/ => mysql-test/suite/ndb/backups/51_data_le/ mysql-test/suite/ndb/std_data/ndb_backup51_dd/ => mysql-test/suite/ndb/backups/51_dd/ mysql-test/suite/ndb/std_data/ndb_backup51_undolog_be/ => mysql-test/suite/ndb/backups/51_undolog_be/ mysql-test/suite/ndb/std_data/ndb_backup51_undolog_le/ => mysql-test/suite/ndb/backups/51_undolog_le/ mysql-test/suite/ndb/std_data/ndb_backup_before_native_default/ => mysql-test/suite/ndb/backups/before_native_default/ mysql-test/suite/ndb/std_data/ndb_backup_bug54613/ => mysql-test/suite/ndb/backups/bug54613/ mysql-test/suite/ndb/std_data/ndb_backup_hashmap/ => mysql-test/suite/ndb/backups/hashmap/ mysql-test/suite/ndb/std_data/ndb_backup_packed/ => mysql-test/suite/ndb/backups/packed/ mysql-test/suite/ndb/std_data/table_data10000.dat => mysql-test/suite/ndb/data/table_data10000.dat mysql-test/suite/ndb/std_data/table_data100000.dat => mysql-test/suite/ndb/data/table_data100000.dat mysql-test/suite/rpl_ndb/ndb_master-slave.inc => mysql-test/suite/ndb_rpl/ndb_master-slave.inc mysql-test/suite/rpl_ndb/ndb_master-slave_2ch.inc => mysql-test/suite/ndb_rpl/ndb_master-slave_2ch.inc mysql-test/suite/rpl_ndb/r/rpl_ndb_2innodb.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_2innodb.result mysql-test/suite/rpl_ndb/r/rpl_ndb_2myisam.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_2myisam.result mysql-test/suite/rpl_ndb/r/rpl_ndb_2ndb.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_2ndb.result mysql-test/suite/rpl_ndb/r/rpl_ndb_2other.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_2other.result mysql-test/suite/rpl_ndb/r/rpl_ndb_add_column.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_add_column.result mysql-test/suite/rpl_ndb/r/rpl_ndb_apply_status.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_apply_status.result mysql-test/suite/rpl_ndb/r/rpl_ndb_auto_inc.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_auto_inc.result mysql-test/suite/rpl_ndb/r/rpl_ndb_bank.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_bank.result mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_basic.result mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_binlog_format_errors.result mysql-test/suite/rpl_ndb/r/rpl_ndb_bitfield.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_bitfield.result mysql-test/suite/rpl_ndb/r/rpl_ndb_blob.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_blob.result mysql-test/suite/rpl_ndb/r/rpl_ndb_break_3_chain.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_break_3_chain.result mysql-test/suite/rpl_ndb/r/rpl_ndb_bug22045.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_bug22045.result mysql-test/suite/rpl_ndb/r/rpl_ndb_check_for_mixed.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_check_for_mixed.result mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_circular.result mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_circular_2ch.result mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_circular_simplex.result mysql-test/suite/rpl_ndb/r/rpl_ndb_conflict.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict.result mysql-test/suite/rpl_ndb/r/rpl_ndb_conflict_max.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_max.result mysql-test/suite/rpl_ndb/r/rpl_ndb_conflict_max_delete_win.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_max_delete_win.result mysql-test/suite/rpl_ndb/r/rpl_ndb_conflict_old.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_old.result mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_ctype_ucs2_def.result mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_dd_advance.result mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_basic.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_dd_basic.result mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_partitions.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_dd_partitions.result mysql-test/suite/rpl_ndb/r/rpl_ndb_do_db.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_do_db.result mysql-test/suite/rpl_ndb/r/rpl_ndb_do_table.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_do_table.result mysql-test/suite/rpl_ndb/r/rpl_ndb_empty_epoch.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_empty_epoch.result mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result => mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_slave.result mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result => mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_master.result mysql-test/suite/rpl_ndb/r/rpl_ndb_gap_event.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_gap_event.result mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_idempotent.result mysql-test/suite/rpl_ndb/r/rpl_ndb_ignore_db.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_ignore_db.result mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb2ndb.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_innodb2ndb.result mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb_trans.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_innodb_trans.result mysql-test/suite/rpl_ndb/r/rpl_ndb_load.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_load.result mysql-test/suite/rpl_ndb/r/rpl_ndb_logging.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_logging.result mysql-test/suite/rpl_ndb/r/rpl_ndb_mix_eng_trans.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_mix_eng_trans.result mysql-test/suite/rpl_ndb/r/rpl_ndb_mix_innodb.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_mix_innodb.result mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_tables.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_mixed_tables.result mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_multi.result mysql-test/suite/rpl_ndb/r/rpl_ndb_myisam2ndb.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_myisam2ndb.result mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_error.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_rep_error.result mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_ignore.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_rep_ignore.result mysql-test/suite/rpl_ndb/r/rpl_ndb_skip_gap_event.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_skip_gap_event.result mysql-test/suite/rpl_ndb/r/rpl_ndb_slave_lsu.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_slave_lsu.result mysql-test/suite/rpl_ndb/r/rpl_ndb_slave_lsu_anyval.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_slave_lsu_anyval.result mysql-test/suite/rpl_ndb/r/rpl_ndb_slave_restart.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_slave_restart.result mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_stm_innodb.result mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_sync.result mysql-test/suite/rpl_ndb/r/rpl_ndbapi_multi.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_ndbapi_multi.result mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result => mysql-test/suite/rpl_ndb/r/rpl_ndb_row_basic.result mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result => mysql-test/suite/ndb_rpl/r/rpl_truncate_7ndb.result mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result => mysql-test/suite/ndb_rpl/r/rpl_truncate_7ndb_2.result mysql-test/suite/rpl_ndb/t/ndb_apply_status.frm => mysql-test/suite/ndb_rpl/t/ndb_apply_status.frm mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-master.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_2innodb-master.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_2innodb-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_2innodb.test mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-master.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_2myisam-master.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_2myisam-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_2myisam.test mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_2ndb-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_2ndb.test mysql-test/suite/rpl_ndb/t/rpl_ndb_2other-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_2other-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_2other.test mysql-test/suite/rpl_ndb/t/rpl_ndb_add_column.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_add_column.test mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status-master.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_apply_status-master.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_apply_status.test mysql-test/suite/rpl_ndb/t/rpl_ndb_auto_inc.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_auto_inc.test mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_bank.test mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_basic.test mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors-master.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_binlog_format_errors-master.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_binlog_format_errors-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_binlog_format_errors.test mysql-test/suite/rpl_ndb/t/rpl_ndb_bitfield.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_bitfield.test mysql-test/suite/rpl_ndb/t/rpl_ndb_blob.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_blob.test mysql-test/suite/rpl_ndb/t/rpl_ndb_break_3_chain.cnf => mysql-test/suite/ndb_rpl/t/ndb_rpl_break_3_chain.cnf mysql-test/suite/rpl_ndb/t/rpl_ndb_break_3_chain.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_break_3_chain.test mysql-test/suite/rpl_ndb/t/rpl_ndb_bug22045.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_bug22045.test mysql-test/suite/rpl_ndb/t/rpl_ndb_check_for_mixed.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_check_for_mixed.test mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_circular.test mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf => mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_2ch.cnf mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_2ch.test mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_simplex.test mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict.test mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_1.inc => mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_1.inc mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_max-master.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_max-master.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_max.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_max.test mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_max_delete_win-master.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_max_delete_win-master.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_max_delete_win.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_max_delete_win.test mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_old-master.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_old-master.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_old.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_old.test mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def-master.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_ctype_ucs2_def-master.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_ctype_ucs2_def.test mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_dd_advance.test mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_basic.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_dd_basic.test mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-master.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_dd_partitions-master.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_dd_partitions-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_dd_partitions.test mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_do_db-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_do_db.test mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_do_table-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_do_table.test mysql-test/suite/rpl_ndb/t/rpl_ndb_empty_epoch.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_empty_epoch.test mysql-test/suite/rpl_ndb/t/rpl_ndb_extraCol.test => mysql-test/suite/rpl_ndb/t/rpl_ndb_extra_col_slave.test mysql-test/suite/rpl_ndb/t/rpl_ndb_extraColMaster.test => mysql-test/suite/rpl_ndb/t/rpl_ndb_extra_col_master.test mysql-test/suite/rpl_ndb/t/rpl_ndb_gap_event-master.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_gap_event-master.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_gap_event.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_gap_event.test mysql-test/suite/rpl_ndb/t/rpl_ndb_get_binlog_events.inc => mysql-test/suite/ndb_rpl/t/ndb_rpl_get_binlog_events.inc mysql-test/suite/rpl_ndb/t/rpl_ndb_idempotent.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_idempotent.test mysql-test/suite/rpl_ndb/t/rpl_ndb_ignore_db-master.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_ignore_db-master.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_ignore_db.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_ignore_db.test mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-master.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_innodb2ndb-master.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_innodb2ndb-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_innodb2ndb.test mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_innodb_trans-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_innodb_trans.test mysql-test/suite/rpl_ndb/t/rpl_ndb_load.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_load.test mysql-test/suite/rpl_ndb/t/rpl_ndb_logging.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_logging.test mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_eng_trans-master.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_mix_eng_trans-master.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_eng_trans-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_mix_eng_trans-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_eng_trans.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_mix_eng_trans.test mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb-master.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_mix_innodb-master.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_mix_innodb.test mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables-master.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_mixed_tables-master.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_mixed_tables-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_mixed_tables.test mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_multi.test mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_binlog_update.cnf => mysql-test/suite/ndb_rpl/t/ndb_rpl_multi_binlog_update.cnf mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_binlog_update.inc => mysql-test/suite/ndb_rpl/t/ndb_rpl_multi_binlog_update.inc mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_multi_update2-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_myisam2ndb-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_myisam2ndb.test mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_relayrotate-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_error.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_rep_error.test mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_rep_ignore-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_rep_ignore.test mysql-test/suite/rpl_ndb/t/rpl_ndb_skip_gap_event-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_skip_gap_event-slave.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_skip_gap_event.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_skip_gap_event.test mysql-test/suite/rpl_ndb/t/rpl_ndb_slave_lsu.cnf => mysql-test/suite/ndb_rpl/t/ndb_rpl_slave_lsu.cnf mysql-test/suite/rpl_ndb/t/rpl_ndb_slave_lsu.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_slave_lsu.test mysql-test/suite/rpl_ndb/t/rpl_ndb_slave_lsu_anyval.cnf => mysql-test/suite/ndb_rpl/t/ndb_rpl_slave_lsu_anyval.cnf mysql-test/suite/rpl_ndb/t/rpl_ndb_slave_lsu_anyval.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_slave_lsu_anyval.test mysql-test/suite/rpl_ndb/t/rpl_ndb_slave_restart.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_slave_restart.test mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-master.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_stm_innodb-master.opt mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_stm_innodb.test mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_sync.test mysql-test/suite/rpl_ndb/t/rpl_ndb_wait_schema_logging.inc => mysql-test/suite/ndb_rpl/t/wait_schema_logging.inc mysql-test/suite/rpl_ndb/t/rpl_ndbapi_multi.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_ndbapi_multi.test mysql-test/suite/rpl_ndb/t/rpl_row_basic_7ndb.test => mysql-test/suite/rpl_ndb/t/rpl_ndb_row_basic.test mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb.test => mysql-test/suite/ndb_rpl/t/rpl_truncate_7ndb.test mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test => mysql-test/suite/ndb_rpl/t/rpl_truncate_7ndb_2.test storage/ndb/include/util/azlib.h => storage/ndb/include/util/ndbzio.h storage/ndb/src/common/util/azio.c => storage/ndb/src/common/util/ndbzio.c modified: VERSION mysql-test/include/default_ndbd.cnf mysql-test/include/ndb_backup_id.inc mysql-test/include/not_ndb_default.inc mysql-test/include/restart_mysqld.inc mysql-test/include/wait_for_ndb_to_binlog.inc mysql-test/mysql-test-run.pl mysql-test/r/join_outer.result mysql-test/suite/ndb/my.cnf mysql-test/suite/ndb/r/ndb_add_partition.result mysql-test/suite/ndb/r/ndb_alter_table_online.result mysql-test/suite/ndb/r/ndb_alter_table_online2.result mysql-test/suite/ndb/r/ndb_basic.result mysql-test/suite/ndb/r/ndb_create_table.result mysql-test/suite/ndb/r/ndb_global_schema_lock.result mysql-test/suite/ndb/r/ndb_multi.result mysql-test/suite/ndb/r/ndb_native_default_support.result mysql-test/suite/ndb/r/ndb_rename.result mysql-test/suite/ndb/r/ndb_restore_compat_downward.result mysql-test/suite/ndb/r/ndb_restore_misc.result mysql-test/suite/ndb/t/disabled.def mysql-test/suite/ndb/t/ndb_add_partition.test mysql-test/suite/ndb/t/ndb_addnode.test mysql-test/suite/ndb/t/ndb_alter_table_backup.test mysql-test/suite/ndb/t/ndb_alter_table_online.test mysql-test/suite/ndb/t/ndb_alter_table_online2.test mysql-test/suite/ndb/t/ndb_basic.test mysql-test/suite/ndb/t/ndb_create_table.test mysql-test/suite/ndb/t/ndb_dd_restore_compat.test mysql-test/suite/ndb/t/ndb_global_schema_lock.test mysql-test/suite/ndb/t/ndb_multi.test mysql-test/suite/ndb/t/ndb_native_default_support.test mysql-test/suite/ndb/t/ndb_rename.test mysql-test/suite/ndb/t/ndb_restore_compat_downward.test mysql-test/suite/ndb/t/ndb_restore_compat_endianness.test mysql-test/suite/ndb/t/ndb_restore_misc.test mysql-test/suite/ndb/t/ndb_restore_undolog.test mysql-test/suite/ndb/t/ndb_show_tables_result.inc mysql-test/suite/ndb_binlog/my.cnf mysql-test/suite/ndb_binlog/r/ndb_binlog_format.result mysql-test/suite/ndb_binlog/r/ndb_binlog_log_bin.result mysql-test/suite/ndb_binlog/r/ndb_binlog_multi.result mysql-test/suite/ndb_binlog/t/ndb_binlog_format.test mysql-test/suite/ndb_binlog/t/ndb_binlog_multi.test mysql-test/suite/ndb_binlog/t/ndb_binlog_restore.test mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.cnf mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.test mysql-test/suite/ndb_team/my.cnf mysql-test/suite/rpl_ndb/my.cnf mysql-test/suite/rpl_ndb/r/rpl_ndb_UUID.result mysql-test/suite/rpl_ndb/r/rpl_ndb_blob2.result mysql-test/suite/rpl_ndb/r/rpl_ndb_commit_afterflush.result mysql-test/suite/rpl_ndb/r/rpl_ndb_ddl.result mysql-test/suite/rpl_ndb/r/rpl_ndb_delete_nowhere.result mysql-test/suite/rpl_ndb/r/rpl_ndb_func003.result mysql-test/suite/rpl_ndb/r/rpl_ndb_insert_ignore.result mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_implicit_commit_binlog.result mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update2.result mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update3.result mysql-test/suite/rpl_ndb/r/rpl_ndb_relayrotate.result mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result mysql-test/suite/rpl_ndb/r/rpl_ndb_sp003.result mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result mysql-test/suite/rpl_ndb/r/rpl_ndb_trig004.result mysql-test/suite/rpl_ndb/r/rpl_ndb_typeconv_all.result mysql-test/suite/rpl_ndb/r/rpl_ndb_typeconv_lossy.result mysql-test/suite/rpl_ndb/r/rpl_ndb_typeconv_nonlossy.result mysql-test/suite/rpl_ndb/r/rpl_ndb_typeconv_strict.result mysql-test/suite/rpl_ndb/t/disabled.def mysql-test/suite/rpl_ndb/t/rpl_ndb_UUID.test mysql-test/suite/rpl_ndb/t/rpl_ndb_blob2.test mysql-test/suite/rpl_ndb/t/rpl_ndb_commit_afterflush.test mysql-test/suite/rpl_ndb/t/rpl_ndb_ddl.test mysql-test/suite/rpl_ndb/t/rpl_ndb_delete_nowhere.test mysql-test/suite/rpl_ndb/t/rpl_ndb_func003.test mysql-test/suite/rpl_ndb/t/rpl_ndb_insert_ignore.test mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_implicit_commit_binlog.test mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2.test mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update3.test mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate.test mysql-test/suite/rpl_ndb/t/rpl_ndb_row_001.test mysql-test/suite/rpl_ndb/t/rpl_ndb_row_implicit_commit_binlog.test mysql-test/suite/rpl_ndb/t/rpl_ndb_set_null.test mysql-test/suite/rpl_ndb/t/rpl_ndb_sp003.test mysql-test/suite/rpl_ndb/t/rpl_ndb_sp006.test mysql-test/suite/rpl_ndb/t/rpl_ndb_trig004.test mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_all.test mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_lossy.test mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_nonlossy.test mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_strict.test mysql-test/t/join_outer.test scripts/mysqld_safe.sh sql/ha_ndbcluster.cc sql/ha_ndbcluster.h sql/ha_ndbcluster_binlog.cc sql/ndb_global_schema_lock_guard.h sql/sql_db.cc sql/sql_parse.cc sql/sql_rename.cc sql/sql_table.cc sql/sql_truncate.cc storage/ndb/CMakeLists.txt storage/ndb/include/CMakeLists.txt storage/ndb/include/kernel/AttributeHeader.hpp storage/ndb/include/kernel/GlobalSignalNumbers.h storage/ndb/include/kernel/kernel_types.h storage/ndb/include/kernel/ndb_limits.h storage/ndb/include/kernel/signaldata/AccLock.hpp storage/ndb/include/kernel/signaldata/CreateTab.hpp storage/ndb/include/kernel/signaldata/CreateTable.hpp storage/ndb/include/kernel/signaldata/DictTabInfo.hpp storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp storage/ndb/include/kernel/signaldata/FailRep.hpp storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp storage/ndb/include/kernel/signaldata/LqhKey.hpp storage/ndb/include/kernel/signaldata/NextScan.hpp storage/ndb/include/kernel/signaldata/PackedSignal.hpp storage/ndb/include/kernel/signaldata/PrepDropTab.hpp storage/ndb/include/kernel/signaldata/QueryTree.hpp storage/ndb/include/kernel/signaldata/SetLogLevelOrd.hpp storage/ndb/include/kernel/signaldata/SignalData.hpp storage/ndb/include/kernel/signaldata/TcContinueB.hpp storage/ndb/include/kernel/signaldata/TcKeyReq.hpp storage/ndb/include/kernel/signaldata/TupKey.hpp storage/ndb/include/kernel/trigger_definitions.h storage/ndb/include/mgmapi/mgmapi_config_parameters.h storage/ndb/include/mgmapi/ndb_logevent.h storage/ndb/include/ndb_config.h.in storage/ndb/include/ndb_version.h.in storage/ndb/include/ndbapi/Ndb.hpp storage/ndb/include/ndbapi/NdbDictionary.hpp storage/ndb/include/ndbapi/NdbInterpretedCode.hpp storage/ndb/include/ndbapi/NdbOperation.hpp storage/ndb/include/ndbapi/NdbReceiver.hpp storage/ndb/include/ndbapi/NdbTransaction.hpp storage/ndb/include/ndbapi/ndbapi_limits.h storage/ndb/include/portlib/ndb_socket_posix.h storage/ndb/include/portlib/ndb_socket_win32.h storage/ndb/include/transporter/TransporterRegistry.hpp storage/ndb/include/util/HashMap.hpp storage/ndb/include/util/UtilBuffer.hpp storage/ndb/include/util/Vector.hpp storage/ndb/ndb_configure.cmake storage/ndb/ndb_configure.m4 storage/ndb/src/common/debugger/EventLogger.cpp storage/ndb/src/common/debugger/signaldata/AccLock.cpp storage/ndb/src/common/debugger/signaldata/CMakeLists.txt storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp storage/ndb/src/common/debugger/signaldata/LqhKey.cpp storage/ndb/src/common/debugger/signaldata/Makefile.am storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp storage/ndb/src/common/debugger/signaldata/SignalNames.cpp storage/ndb/src/common/debugger/signaldata/TcKeyReq.cpp storage/ndb/src/common/portlib/CMakeLists.txt storage/ndb/src/common/portlib/Makefile.am storage/ndb/src/common/portlib/NdbCondition.c storage/ndb/src/common/portlib/NdbMutex.c storage/ndb/src/common/portlib/NdbTCP.cpp storage/ndb/src/common/transporter/TCP_Transporter.cpp storage/ndb/src/common/transporter/TransporterRegistry.cpp storage/ndb/src/common/util/CMakeLists.txt storage/ndb/src/common/util/File.cpp storage/ndb/src/common/util/Makefile.am storage/ndb/src/common/util/ndb_opts.c storage/ndb/src/common/util/socket_io.cpp storage/ndb/src/common/util/version.cpp storage/ndb/src/kernel/blocks/CMakeLists.txt storage/ndb/src/kernel/blocks/ERROR_codes.txt storage/ndb/src/kernel/blocks/LocalProxy.cpp storage/ndb/src/kernel/blocks/Makefile.am storage/ndb/src/kernel/blocks/backup/Backup.cpp storage/ndb/src/kernel/blocks/backup/read.cpp storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp storage/ndb/src/kernel/blocks/dblqh/DblqhProxy.cpp storage/ndb/src/kernel/blocks/dbspj/Dbspj.hpp storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp storage/ndb/src/kernel/blocks/dbtux/DbtuxBuild.cpp storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp storage/ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp storage/ndb/src/kernel/blocks/lgman.cpp storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp storage/ndb/src/kernel/blocks/ndbfs/AsyncIoThread.hpp storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp storage/ndb/src/kernel/blocks/ndbfs/PosixAsyncFile.cpp storage/ndb/src/kernel/blocks/ndbfs/PosixAsyncFile.hpp storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp storage/ndb/src/kernel/blocks/pgman.cpp storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp storage/ndb/src/kernel/blocks/qmgr/timer.hpp storage/ndb/src/kernel/blocks/tsman.cpp storage/ndb/src/kernel/vm/Configuration.cpp storage/ndb/src/kernel/vm/Configuration.hpp storage/ndb/src/kernel/vm/LongSignal.cpp storage/ndb/src/kernel/vm/LongSignalImpl.hpp storage/ndb/src/kernel/vm/NdbinfoTables.cpp storage/ndb/src/kernel/vm/SimulatedBlock.cpp storage/ndb/src/kernel/vm/SimulatedBlock.hpp storage/ndb/src/kernel/vm/mt-asm.h storage/ndb/src/kernel/vm/mt.cpp storage/ndb/src/kernel/vm/mt.hpp storage/ndb/src/mgmsrv/ConfigInfo.cpp storage/ndb/src/mgmsrv/MgmtSrvr.cpp storage/ndb/src/mgmsrv/MgmtSrvr.hpp storage/ndb/src/mgmsrv/Services.cpp storage/ndb/src/ndbapi/API.hpp storage/ndb/src/ndbapi/CMakeLists.txt storage/ndb/src/ndbapi/DictCache.cpp storage/ndb/src/ndbapi/Makefile.am storage/ndb/src/ndbapi/Ndb.cpp storage/ndb/src/ndbapi/NdbApiSignal.cpp storage/ndb/src/ndbapi/NdbDictionary.cpp storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp storage/ndb/src/ndbapi/NdbImpl.hpp storage/ndb/src/ndbapi/NdbOperation.cpp storage/ndb/src/ndbapi/NdbOperationDefine.cpp storage/ndb/src/ndbapi/NdbOperationExec.cpp storage/ndb/src/ndbapi/NdbOperationSearch.cpp storage/ndb/src/ndbapi/NdbReceiver.cpp storage/ndb/src/ndbapi/NdbScanOperation.cpp storage/ndb/src/ndbapi/NdbTransaction.cpp storage/ndb/src/ndbapi/NdbTransactionScan.cpp storage/ndb/src/ndbapi/Ndberr.cpp storage/ndb/src/ndbapi/Ndbif.cpp storage/ndb/src/ndbapi/Ndbinit.cpp storage/ndb/src/ndbapi/Ndblist.cpp storage/ndb/src/ndbapi/ObjectMap.cpp storage/ndb/src/ndbapi/ObjectMap.hpp storage/ndb/src/ndbapi/ndb_cluster_connection.cpp storage/ndb/src/ndbapi/ndberror.c storage/ndb/src/ndbapi/ndberror_check.cpp storage/ndb/test/include/HugoCalculator.hpp storage/ndb/test/include/NDBT_Tables.hpp storage/ndb/test/ndbapi/CMakeLists.txt storage/ndb/test/ndbapi/Makefile.am storage/ndb/test/ndbapi/bank/Bank.cpp storage/ndb/test/ndbapi/testBasic.cpp storage/ndb/test/ndbapi/testDict.cpp storage/ndb/test/ndbapi/testIndex.cpp storage/ndb/test/ndbapi/testInterpreter.cpp storage/ndb/test/ndbapi/testLcp.cpp storage/ndb/test/ndbapi/testNodeRestart.cpp storage/ndb/test/ndbapi/testReadPerf.cpp storage/ndb/test/ndbapi/testRestartGci.cpp storage/ndb/test/ndbapi/testSRBank.cpp storage/ndb/test/ndbapi/testScan.cpp storage/ndb/test/ndbapi/testScanPerf.cpp storage/ndb/test/ndbapi/testTimeout.cpp storage/ndb/test/ndbapi/test_event.cpp storage/ndb/test/run-test/Makefile.am storage/ndb/test/run-test/daily-basic-tests.txt storage/ndb/test/src/CMakeLists.txt storage/ndb/test/src/HugoCalculator.cpp storage/ndb/test/src/HugoOperations.cpp storage/ndb/test/src/Makefile.am storage/ndb/test/src/NDBT_Table.cpp storage/ndb/test/src/NDBT_Tables.cpp storage/ndb/test/tools/CMakeLists.txt storage/ndb/test/tools/Makefile.am storage/ndb/test/tools/hugoLoad.cpp storage/ndb/test/tools/verify_index.cpp storage/ndb/tools/ndb_test_platform.cpp storage/ndb/tools/ndbinfo_sql.cpp storage/ndb/tools/restore/Restore.cpp storage/ndb/tools/restore/Restore.hpp storage/ndb/tools/restore/consumer_restore.cpp storage/ndb/tools/select_all.cpp mysql-test/suite/ndb_rpl/t/ndb_rpl_xxx_innodb.inc mysql-test/suite/ndb_rpl/t/ndb_conflict_info.inc mysql-test/suite/ndb_rpl/ndb_master-slave.inc mysql-test/suite/ndb_rpl/r/ndb_rpl_2innodb.result mysql-test/suite/ndb_rpl/r/ndb_rpl_2myisam.result mysql-test/suite/ndb_rpl/r/ndb_rpl_2ndb.result mysql-test/suite/ndb_rpl/r/ndb_rpl_2other.result mysql-test/suite/ndb_rpl/r/ndb_rpl_add_column.result mysql-test/suite/ndb_rpl/r/ndb_rpl_apply_status.result mysql-test/suite/ndb_rpl/r/ndb_rpl_auto_inc.result mysql-test/suite/ndb_rpl/r/ndb_rpl_basic.result mysql-test/suite/ndb_rpl/r/ndb_rpl_binlog_format_errors.result mysql-test/suite/ndb_rpl/r/ndb_rpl_bitfield.result mysql-test/suite/ndb_rpl/r/ndb_rpl_blob.result mysql-test/suite/ndb_rpl/r/ndb_rpl_break_3_chain.result mysql-test/suite/ndb_rpl/r/ndb_rpl_bug22045.result mysql-test/suite/ndb_rpl/r/ndb_rpl_check_for_mixed.result mysql-test/suite/ndb_rpl/r/ndb_rpl_circular.result mysql-test/suite/ndb_rpl/r/ndb_rpl_circular_simplex.result mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict.result mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_max.result mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_max_delete_win.result mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_old.result mysql-test/suite/ndb_rpl/r/ndb_rpl_dd_advance.result mysql-test/suite/ndb_rpl/r/ndb_rpl_dd_basic.result mysql-test/suite/ndb_rpl/r/ndb_rpl_dd_partitions.result mysql-test/suite/ndb_rpl/r/ndb_rpl_do_db.result mysql-test/suite/ndb_rpl/r/ndb_rpl_do_table.result mysql-test/suite/ndb_rpl/r/ndb_rpl_empty_epoch.result mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_slave.result mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_master.result mysql-test/suite/ndb_rpl/r/ndb_rpl_gap_event.result mysql-test/suite/ndb_rpl/r/ndb_rpl_idempotent.result mysql-test/suite/ndb_rpl/r/ndb_rpl_ignore_db.result mysql-test/suite/ndb_rpl/r/ndb_rpl_innodb2ndb.result mysql-test/suite/ndb_rpl/r/ndb_rpl_innodb_trans.result mysql-test/suite/ndb_rpl/r/ndb_rpl_logging.result mysql-test/suite/ndb_rpl/r/ndb_rpl_mix_eng_trans.result mysql-test/suite/ndb_rpl/r/ndb_rpl_mix_innodb.result mysql-test/suite/ndb_rpl/r/ndb_rpl_mixed_tables.result mysql-test/suite/ndb_rpl/r/ndb_rpl_multi.result mysql-test/suite/ndb_rpl/r/ndb_rpl_myisam2ndb.result mysql-test/suite/ndb_rpl/r/ndb_rpl_rep_error.result mysql-test/suite/ndb_rpl/r/ndb_rpl_rep_ignore.result mysql-test/suite/ndb_rpl/r/ndb_rpl_skip_gap_event.result mysql-test/suite/ndb_rpl/r/ndb_rpl_slave_lsu.result mysql-test/suite/ndb_rpl/r/ndb_rpl_slave_lsu_anyval.result mysql-test/suite/ndb_rpl/r/ndb_rpl_slave_restart.result mysql-test/suite/ndb_rpl/r/ndb_rpl_stm_innodb.result mysql-test/suite/ndb_rpl/r/ndb_rpl_sync.result mysql-test/suite/rpl_ndb/r/rpl_ndb_row_basic.result mysql-test/suite/ndb_rpl/r/rpl_truncate_7ndb.result mysql-test/suite/ndb_rpl/r/rpl_truncate_7ndb_2.result mysql-test/suite/ndb_rpl/t/ndb_rpl_2innodb.test mysql-test/suite/ndb_rpl/t/ndb_rpl_2myisam.test mysql-test/suite/ndb_rpl/t/ndb_rpl_2ndb.test mysql-test/suite/ndb_rpl/t/ndb_rpl_2other.test mysql-test/suite/ndb_rpl/t/ndb_rpl_add_column.test mysql-test/suite/ndb_rpl/t/ndb_rpl_apply_status.test mysql-test/suite/ndb_rpl/t/ndb_rpl_auto_inc.test mysql-test/suite/ndb_rpl/t/ndb_rpl_bank.test mysql-test/suite/ndb_rpl/t/ndb_rpl_basic.test mysql-test/suite/ndb_rpl/t/ndb_rpl_binlog_format_errors.test mysql-test/suite/ndb_rpl/t/ndb_rpl_bitfield.test mysql-test/suite/ndb_rpl/t/ndb_rpl_blob.test mysql-test/suite/ndb_rpl/t/ndb_rpl_break_3_chain.cnf mysql-test/suite/ndb_rpl/t/ndb_rpl_break_3_chain.test mysql-test/suite/ndb_rpl/t/ndb_rpl_bug22045.test mysql-test/suite/ndb_rpl/t/ndb_rpl_check_for_mixed.test mysql-test/suite/ndb_rpl/t/ndb_rpl_circular.test mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_2ch.cnf mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_2ch.test mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_simplex.test mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict.test mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_1.inc mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_max.test mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_max_delete_win.test mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_old.test mysql-test/suite/ndb_rpl/t/ndb_rpl_ctype_ucs2_def-master.opt mysql-test/suite/ndb_rpl/t/ndb_rpl_ctype_ucs2_def.test mysql-test/suite/ndb_rpl/t/ndb_rpl_dd_advance.test mysql-test/suite/ndb_rpl/t/ndb_rpl_dd_basic.test mysql-test/suite/ndb_rpl/t/ndb_rpl_dd_partitions.test mysql-test/suite/ndb_rpl/t/ndb_rpl_do_db.test mysql-test/suite/ndb_rpl/t/ndb_rpl_do_table.test mysql-test/suite/ndb_rpl/t/ndb_rpl_empty_epoch.test mysql-test/suite/rpl_ndb/t/rpl_ndb_extra_col_slave.test mysql-test/suite/rpl_ndb/t/rpl_ndb_extra_col_master.test mysql-test/suite/ndb_rpl/t/ndb_rpl_gap_event.test mysql-test/suite/ndb_rpl/t/ndb_rpl_idempotent.test mysql-test/suite/ndb_rpl/t/ndb_rpl_ignore_db.test mysql-test/suite/ndb_rpl/t/ndb_rpl_innodb2ndb.test mysql-test/suite/ndb_rpl/t/ndb_rpl_innodb_trans.test mysql-test/suite/ndb_rpl/t/ndb_rpl_load.test mysql-test/suite/ndb_rpl/t/ndb_rpl_logging.test mysql-test/suite/ndb_rpl/t/ndb_rpl_mix_eng_trans.test mysql-test/suite/ndb_rpl/t/ndb_rpl_mix_innodb.test mysql-test/suite/ndb_rpl/t/ndb_rpl_mixed_tables.test mysql-test/suite/ndb_rpl/t/ndb_rpl_multi.test mysql-test/suite/ndb_rpl/t/ndb_rpl_multi_binlog_update.cnf mysql-test/suite/ndb_rpl/t/ndb_rpl_multi_binlog_update.inc mysql-test/suite/ndb_rpl/t/ndb_rpl_myisam2ndb.test mysql-test/suite/ndb_rpl/t/ndb_rpl_relayrotate-slave.opt mysql-test/suite/ndb_rpl/t/ndb_rpl_rep_error.test mysql-test/suite/ndb_rpl/t/ndb_rpl_rep_ignore.test mysql-test/suite/ndb_rpl/t/ndb_rpl_skip_gap_event.test mysql-test/suite/ndb_rpl/t/ndb_rpl_slave_lsu.cnf mysql-test/suite/ndb_rpl/t/ndb_rpl_slave_lsu.test mysql-test/suite/ndb_rpl/t/ndb_rpl_slave_lsu_anyval.cnf mysql-test/suite/ndb_rpl/t/ndb_rpl_slave_lsu_anyval.test mysql-test/suite/ndb_rpl/t/ndb_rpl_slave_restart.test mysql-test/suite/ndb_rpl/t/ndb_rpl_stm_innodb.test mysql-test/suite/ndb_rpl/t/ndb_rpl_sync.test mysql-test/suite/ndb_rpl/t/wait_schema_logging.inc mysql-test/suite/ndb_rpl/t/ndb_rpl_ndbapi_multi.test mysql-test/suite/rpl_ndb/t/rpl_ndb_row_basic.test mysql-test/suite/ndb_rpl/t/rpl_truncate_7ndb.test mysql-test/suite/ndb_rpl/t/rpl_truncate_7ndb_2.test storage/ndb/include/util/ndbzio.h storage/ndb/src/common/util/ndbzio.c === modified file 'sql/ha_ndbcluster.cc' --- a/sql/ha_ndbcluster.cc 2011-05-20 11:50:50 +0000 +++ b/sql/ha_ndbcluster.cc 2011-06-08 11:35:35 +0000 @@ -6301,8 +6301,8 @@ ha_ndbcluster::flush_bulk_insert(bool al be rolled back */ THD *thd= table->in_use; - thd->transaction.all.modified_non_trans_table= - thd->transaction.stmt.modified_non_trans_table= TRUE; + thd->transaction.all.mark_modified_non_trans_table(); + thd->transaction.stmt.mark_modified_non_trans_table(); if (execute_commit(m_thd_ndb, trans, m_thd_ndb->m_force_send, m_ignore_no_key) != 0) { @@ -11116,14 +11116,11 @@ ha_ndbcluster::records_in_range(uint inx else { // Has an equality range on a leading part of 'key_length': - // - Null indicator, and HA_KEY_BLOB_LENGTH bytes in - // 'extra_length' are removed from key_fraction calculations. // - Assume reduced selectivity for non-unique indexes // by decreasing 'eq_fraction' by 20% // - Assume equal selectivity for all eq_parts in key. - double eq_fraction = (double)(eq_bound_len) / - (key_length - key_info->extra_length); + double eq_fraction = (double)(eq_bound_len) / key_length; if (idx_type == ORDERED_INDEX) // Non-unique index -> less selectivity eq_fraction/= 1.20; if (eq_fraction >= 1.0) // Exact match -> 1 row === modified file 'sql/ndb_local_connection.cc' --- a/sql/ndb_local_connection.cc 2011-03-28 09:28:45 +0000 +++ b/sql/ndb_local_connection.cc 2011-06-08 11:35:35 +0000 @@ -143,9 +143,8 @@ Ndb_local_connection::execute_query_iso( THD_TRANS save_thd_transaction_all= m_thd->transaction.all; THD_TRANS save_thd_transaction_stmt= m_thd->transaction.stmt; - /* Set modified_non_trans_table to false(check if actually needed) */ - assert(m_thd->transaction.stmt.modified_non_trans_table == FALSE); - m_thd->transaction.stmt.modified_non_trans_table= FALSE; + /* Check modified_non_trans_table is false(check if actually needed) */ + assert(!m_thd->transaction.stmt.has_modified_non_trans_table()); #if 0 /* No bundle (reason: useless for push emails).