From: Frazer Clement Date: October 4 2011 2:31pm Subject: bzr push into mysql-trunk-cluster branch (frazer.clement:3382 to 3384) List-Archive: http://lists.mysql.com/commits/141324 Message-Id: <201110041431.p94EVGUh014259@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3384 Frazer Clement 2011-10-04 [merge] Merge 5.5-cluster -> trunk-cluster modified: mysql-test/r/mysqld--help-win.result sql/sql_acl.cc 3383 Frazer Clement 2011-10-04 [merge] Merge 5.5-cluster -> trunk-cluster modified: mysql-test/suite/sys_vars/r/all_vars.result 3382 Frazer Clement 2011-10-04 [merge] Merge 5.5-cluster -> trunk-cluster added: mysql-test/include/have_binlog_row_v2.inc mysql-test/r/have_binlog_row_v2.require modified: client/mysqlbinlog.cc mysql-test/extra/binlog_tests/binlog.test mysql-test/include/show_binlog_using_logname.inc mysql-test/r/ctype_cp932_binlog_stm.result mysql-test/r/flush2.result mysql-test/r/mysqld--help-notwin.result mysql-test/suite/binlog/r/binlog_row_binlog.result mysql-test/suite/binlog/r/binlog_stm_binlog.result mysql-test/suite/binlog/r/binlog_variables_log_bin.result mysql-test/suite/binlog/r/binlog_variables_log_bin_index.result mysql-test/suite/ndb_rpl/r/ndb_rpl_multi.result mysql-test/suite/ndb_rpl/r/ndb_rpl_slave_restart.result mysql-test/suite/ndb_rpl/t/ndb_rpl_gap_event.test mysql-test/suite/ndb_rpl/t/ndb_rpl_multi.test mysql-test/suite/ndb_rpl/t/ndb_rpl_skip_gap_event.test mysql-test/suite/ndb_rpl/t/ndb_rpl_slave_restart.test mysql-test/suite/rpl/t/rpl_extra_row_data.test mysql-test/suite/rpl/t/rpl_row_4_bytes-master.opt mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test mysql-test/t/ctype_cp932_binlog_stm.test sql/binlog.cc sql/ha_ndbcluster_binlog.cc sql/log_event.cc sql/log_event.h sql/log_event_old.h sql/mysqld.cc sql/mysqld.h sql/rpl_constants.h sql/rpl_injector.cc sql/rpl_injector.h sql/sql_binlog.cc sql/sql_class.cc sql/sql_class.h sql/sys_vars.cc === modified file 'mysql-test/r/mysqld--help-win.result' --- a/mysql-test/r/mysqld--help-win.result 2011-09-27 12:11:16 +0000 +++ b/mysql-test/r/mysqld--help-win.result 2011-10-04 14:29:24 +0000 @@ -250,6 +250,11 @@ The following options may be given as th ALWAYS use row-based binary logging, the security issues do not exist and the binary logging cannot break, so you can safely set this to TRUE + --log-bin-use-v1-row-events + If equal to 1 then version 1 row events are written to a + row based binary log. If equal to 0, then the latest + version of events are written. This option is useful + during some upgrades. --log-error[=name] Error log file --log-isam[=name] Log all MyISAM changes to file. --log-output=name Syntax: log-output=value[,value...], where "value" could @@ -894,6 +899,7 @@ lock-wait-timeout 31536000 log-bin (No default value) log-bin-index (No default value) log-bin-trust-function-creators FALSE +log-bin-use-v1-row-events FALSE log-error log-isam myisam.log log-output FILE === modified file 'mysql-test/suite/sys_vars/r/all_vars.result' --- a/mysql-test/suite/sys_vars/r/all_vars.result 2011-09-23 12:22:58 +0000 +++ b/mysql-test/suite/sys_vars/r/all_vars.result 2011-10-04 14:15:54 +0000 @@ -31,5 +31,7 @@ INNODB_STATS_TRANSIENT_SAMPLE_PAGES INNODB_STATS_TRANSIENT_SAMPLE_PAGES INNODB_SYNC_ARRAY_SIZE INNODB_SYNC_ARRAY_SIZE +LOG_BIN_USE_V1_ROW_EVENTS +LOG_BIN_USE_V1_ROW_EVENTS drop table t1; drop table t2; === modified file 'sql/sql_acl.cc' --- a/sql/sql_acl.cc 2011-09-27 12:11:16 +0000 +++ b/sql/sql_acl.cc 2011-10-04 14:29:24 +0000 @@ -1946,6 +1946,7 @@ bool change_password(THD *thd, const cha trans_rollback_stmt(thd); } assert(thd->transaction.stmt.is_empty()); + thd->clear_current_stmt_binlog_format_row(); } #endif @@ -1983,6 +1984,7 @@ end: DBUG_PRINT("info", ("%u: Aborting DDL transaction", __LINE__)); trans_rollback_stmt(thd); assert(thd->transaction.stmt.is_empty()); + thd->clear_current_stmt_binlog_format_row(); } #endif @@ -3875,6 +3877,7 @@ int mysql_table_grant(THD *thd, TABLE_LI trans_rollback_stmt(thd); } assert(thd->transaction.stmt.is_empty()); + thd->clear_current_stmt_binlog_format_row(); } #endif @@ -4279,6 +4282,7 @@ bool mysql_grant(THD *thd, const char *d trans_rollback_stmt(thd); } assert(thd->transaction.stmt.is_empty()); + thd->clear_current_stmt_binlog_format_row(); } #endif @@ -6775,9 +6779,11 @@ bool mysql_create_user(THD *thd, List transaction.stmt.is_empty()); + thd->clear_current_stmt_binlog_format_row(); } #endif + if (some_users_created) { result|= write_bin_log(thd, FALSE, @@ -6900,6 +6906,7 @@ bool mysql_drop_user(THD *thd, List transaction.stmt.is_empty()); + thd->clear_current_stmt_binlog_format_row(); } #endif @@ -7034,6 +7041,7 @@ bool mysql_rename_user(THD *thd, List transaction.stmt.is_empty()); + thd->clear_current_stmt_binlog_format_row(); } #endif @@ -7279,6 +7287,7 @@ bool mysql_revoke_all(THD *thd, List transaction.stmt.is_empty()); + thd->clear_current_stmt_binlog_format_row(); } #endif No bundle (reason: useless for push emails).