database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

merge with MySQL 5.5.27

Browse Source 
manually checked every change, reverted incorrect or stupid changes.
This commit is contained in:
Sergei Golubchik
2012-08-09 17:22:00 +02:00
parent e022b6ef07 704898bf32
commit d11829654c
122 changed files with 2869 additions and 1727 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_repl.cc
View File

@ -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