diff options
| author | unknown <knielsen@knielsen-hq.org> | 2011-12-14 12:02:03 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2011-12-14 12:02:03 +0100 |
| commit | 79479ee97571e8023b0269ffddbf525d54955273 (patch) | |
| tree | 6297405507fee3aa01617a4f8462cc413d880452 /sql/log_event.cc | |
| parent | 8404b44a845e8a827bf1986fe4450673782bfdae (diff) | |
| download | mariadb-git-79479ee97571e8023b0269ffddbf525d54955273.tar.gz | |
After-merge fixes for 5.5 merge.
Fix typo causing too low timeout value for wait_for_slave_param.inc.
Fix binlog checksums following 5.5 merge.
Make sure the rpl suite can run with --mysqld=--binlog-checksum=CRC32
Fix a number of problems in the code when checksums are enabled.
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index dddd24bc299..38af12cab9f 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -8575,14 +8575,16 @@ void Rows_log_event::print_helper(FILE *file, #ifndef MYSQL_CLIENT Annotate_rows_log_event::Annotate_rows_log_event(THD *thd, - uint16 cache_type_arg) - : Log_event(thd, 0, true), + bool using_trans, + bool direct) + : Log_event(thd, 0, using_trans), m_save_thd_query_txt(0), m_save_thd_query_len(0) { m_query_txt= thd->query(); m_query_len= thd->query_length(); - cache_type= cache_type_arg; + if (direct) + cache_type= Log_event::EVENT_NO_CACHE; } #endif |