diff options
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 50 |
1 files changed, 33 insertions, 17 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index cb5b2c5cbbd..81c0d0c1304 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -1089,12 +1089,22 @@ my_bool Log_event::need_checksum() and Stop event) provides their checksum alg preference through Log_event::checksum_alg. */ - ret= ((checksum_alg != BINLOG_CHECKSUM_ALG_UNDEF) ? - (checksum_alg != BINLOG_CHECKSUM_ALG_OFF) : - ((binlog_checksum_options != BINLOG_CHECKSUM_ALG_OFF) && - (cache_type == Log_event::EVENT_NO_CACHE)) ? - MY_TEST(binlog_checksum_options) : FALSE); - + if (checksum_alg != BINLOG_CHECKSUM_ALG_UNDEF) + ret= (checksum_alg != BINLOG_CHECKSUM_ALG_OFF); + else + { + if (binlog_checksum_options != BINLOG_CHECKSUM_ALG_OFF && + cache_type == Log_event::EVENT_NO_CACHE) + { + checksum_alg= binlog_checksum_options; + ret= MY_TEST(binlog_checksum_options); + } + else + { + ret= FALSE; + checksum_alg= (uint8) BINLOG_CHECKSUM_ALG_OFF; + } + } /* FD calls the methods before data_written has been calculated. The following invariant claims if the current is not the first @@ -1105,10 +1115,6 @@ my_bool Log_event::need_checksum() DBUG_ASSERT(get_type_code() != FORMAT_DESCRIPTION_EVENT || ret || data_written == 0); - if (checksum_alg == BINLOG_CHECKSUM_ALG_UNDEF) - checksum_alg= ret ? // calculated value stored - (uint8) binlog_checksum_options : (uint8) BINLOG_CHECKSUM_ALG_OFF; - DBUG_ASSERT(!ret || ((checksum_alg == binlog_checksum_options || /* @@ -1148,17 +1154,19 @@ bool Log_event::wrapper_my_b_safe_write(IO_CACHE* file, const uchar* buf, ulong bool Log_event::write_footer(IO_CACHE* file) { + DBUG_ENTER("write_footer"); /* footer contains the checksum-algorithm descriptor followed by the checksum value */ if (need_checksum()) { + DBUG_PRINT("info", ("Writing checksum")); uchar buf[BINLOG_CHECKSUM_LEN]; int4store(buf, crc); - return (my_b_safe_write(file, (uchar*) buf, sizeof(buf))); + DBUG_RETURN(my_b_safe_write(file, (uchar*) buf, sizeof(buf))); } - return 0; + DBUG_RETURN(0); } /* @@ -1180,7 +1188,7 @@ bool Log_event::write_header(IO_CACHE* file, ulong event_data_length) if (need_checksum()) { - crc= my_checksum(0L, NULL, 0); + crc= 0; data_written += BINLOG_CHECKSUM_LEN; } @@ -3072,6 +3080,7 @@ Query_log_event::Query_log_event() query_arg - array of char representing the query query_length - size of the `query_arg' array using_trans - there is a modified transactional table + direct - Don't cache statement suppress_use - suppress the generation of 'USE' statements errcode - the error code of the query @@ -3199,10 +3208,17 @@ Query_log_event::Query_log_event(THD* thd_arg, const char* query_arg, break; case SQLCOM_CREATE_TABLE: + /* + If we are using CREATE ... SELECT or if we are a slave + executing BEGIN...COMMIT (generated by CREATE...SELECT) we + have to use the transactional cache to ensure we don't + calculate any checksum for the CREATE part. + */ trx_cache= (lex->select_lex.item_list.elements && - thd->is_current_stmt_binlog_format_row()); + thd->is_current_stmt_binlog_format_row()) || + (thd->variables.option_bits & OPTION_GTID_BEGIN); use_cache= (lex->tmp_table() && - thd->in_multi_stmt_transaction_mode()) || trx_cache; + thd->in_multi_stmt_transaction_mode()) || trx_cache; break; case SQLCOM_SET_OPTION: if (lex->autocommit) @@ -3233,8 +3249,8 @@ Query_log_event::Query_log_event(THD* thd_arg, const char* query_arg, else cache_type= Log_event::EVENT_STMT_CACHE; DBUG_ASSERT(cache_type != Log_event::EVENT_INVALID_CACHE); - DBUG_PRINT("info",("Query_log_event has flags2: %lu sql_mode: %llu", - (ulong) flags2, sql_mode)); + DBUG_PRINT("info",("Query_log_event has flags2: %lu sql_mode: %llu cache_tye: %d", + (ulong) flags2, sql_mode, cache_type)); } #endif /* MYSQL_CLIENT */ |