diff options
| author | Sven Sandberg <sven.sandberg@oracle.com> | 2010-07-26 11:56:30 +0200 |
|---|---|---|
| committer | Sven Sandberg <sven.sandberg@oracle.com> | 2010-07-26 11:56:30 +0200 |
| commit | 93324cbf0ef3beb99955924a1a5e55f9c270e06c (patch) | |
| tree | 8491c8a158529c132349b66508e29f067d36703b /sql/sql_repl.cc | |
| parent | e497d6e6e1a45ffdd235e965c54ba8354bb18b83 (diff) | |
| parent | cf5e69c9042614459b9098548be0b33cb4a4671d (diff) | |
| download | mariadb-git-93324cbf0ef3beb99955924a1a5e55f9c270e06c.tar.gz | |
merged BUG#55322 to 5.1-bugteam
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index d7dd3eb63f2..cb5aac863c0 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -356,6 +356,7 @@ void mysql_binlog_send(THD* thd, char* log_ident, my_off_t pos, #ifndef DBUG_OFF int left_events = max_binlog_dump_events; #endif + int old_max_allowed_packet= thd->variables.max_allowed_packet; DBUG_ENTER("mysql_binlog_send"); DBUG_PRINT("enter",("log_ident: '%s' pos: %ld", log_ident, (long) pos)); @@ -761,6 +762,7 @@ end: pthread_mutex_lock(&LOCK_thread_count); thd->current_linfo = 0; pthread_mutex_unlock(&LOCK_thread_count); + thd->variables.max_allowed_packet= old_max_allowed_packet; DBUG_VOID_RETURN; err: @@ -778,6 +780,7 @@ err: pthread_mutex_unlock(&LOCK_thread_count); if (file >= 0) (void) my_close(file, MYF(MY_WME)); + thd->variables.max_allowed_packet= old_max_allowed_packet; my_message(my_errno, errmsg, MYF(0)); DBUG_VOID_RETURN; @@ -1418,6 +1421,7 @@ bool mysql_show_binlog_events(THD* thd) bool ret = TRUE; IO_CACHE log; File file = -1; + int old_max_allowed_packet= thd->variables.max_allowed_packet; DBUG_ENTER("mysql_show_binlog_events"); Log_event::init_show_field_list(&field_list); @@ -1556,6 +1560,7 @@ err: pthread_mutex_lock(&LOCK_thread_count); thd->current_linfo = 0; pthread_mutex_unlock(&LOCK_thread_count); + thd->variables.max_allowed_packet= old_max_allowed_packet; DBUG_RETURN(ret); } |