diff options
| author | unknown <kaa@polly.local> | 2007-03-16 17:33:22 +0300 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2007-03-16 17:33:22 +0300 |
| commit | bb9cd2d705ffe1df5315685c27cd9d4794e7ac93 (patch) | |
| tree | f25875e1d3225a894fce519677abefbc9529f72e /sql/slave.cc | |
| parent | ade93118651b970a377df52b65e01b4003dd9428 (diff) | |
| parent | f7aa1930f4b2a3e0c7a5ded6010c9bffabd7b181 (diff) | |
| download | mariadb-git-bb9cd2d705ffe1df5315685c27cd9d4794e7ac93.tar.gz | |
Merge polly.local:/tmp/maint/bug23775/my50-bug23775
into polly.local:/tmp/maint/bug23775/my51-bug23775
sql/slave.cc:
Manual merge.
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index c21aec49e88..022fcb10881 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -25,6 +25,7 @@ #include <thr_alarm.h> #include <my_dir.h> #include <sql_common.h> +#include <errmsg.h> #ifdef HAVE_REPLICATION @@ -2071,7 +2072,7 @@ after reconnect"); if (event_len == packet_error) { uint mysql_error_number= mysql_errno(mysql); - if (mysql_error_number == ER_NET_PACKET_TOO_LARGE) + if (mysql_error_number == CR_NET_PACKET_TOO_LARGE) { sql_print_error("\ Log entry on master is longer than max_allowed_packet (%ld) on \ |