diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-08-09 17:22:00 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-08-09 17:22:00 +0200 |
| commit | d11829654c4ef5c3d0f997ca61a50d4bd196db8a (patch) | |
| tree | e48a5775e961b17600bf9c1c189243deb5515ba7 /sql/sql_repl.cc | |
| parent | e022b6ef07529d83e8c1cbd5e3d374fc5cc75721 (diff) | |
| parent | 704898bf3200af4da42c1bf9251a7da5533db73f (diff) | |
| download | mariadb-git-d11829654c4ef5c3d0f997ca61a50d4bd196db8a.tar.gz | |
merge with MySQL 5.5.27
manually checked every change, reverted incorrect or stupid changes.
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index fafa7a4389e..751c0d6ada5 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -653,7 +653,8 @@ void mysql_binlog_send(THD* thd, char* log_ident, my_off_t pos, heartbeat_ts= &heartbeat_buf; set_timespec_nsec(*heartbeat_ts, 0); } - sql_print_information("Start binlog_dump to slave_server(%d), pos(%s, %lu)", + if (global_system_variables.log_warnings > 1) + sql_print_information("Start binlog_dump to slave_server(%d), pos(%s, %lu)", thd->server_id, log_ident, (ulong)pos); if (RUN_HOOK(binlog_transmit, transmit_start, (thd, flags, log_ident, pos))) { @@ -765,7 +766,7 @@ impossible position"; this larger than the corresponding packet (query) sent from client to master. */ - thd->variables.max_allowed_packet+= MAX_LOG_EVENT_HEADER; + thd->variables.max_allowed_packet= MAX_MAX_ALLOWED_PACKET; /* We can set log_lock now, it does not move (it's a member of |