summaryrefslogtreecommitdiff
path: root/sql/log_event.cc
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2016-08-19 15:46:27 +0000
committerVladislav Vaintroub <wlad@mariadb.com>2016-08-19 15:46:27 +0000
commit31a8cf54c8a7913338480a0571feaf32143b5f64 (patch)
tree8847835f515af17d6c090300b138c31e1226731e /sql/log_event.cc
parent7b89b9f5108c80f4f270da922d7e6c182a663719 (diff)
downloadmariadb-git-31a8cf54c8a7913338480a0571feaf32143b5f64.tar.gz
Revert "MDEV-9293 Connector/C integration"
This reverts commit 7b89b9f5108c80f4f270da922d7e6c182a663719.
Diffstat (limited to 'sql/log_event.cc')
-rw-r--r--sql/log_event.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc
index 49c8e2e6162..b1cf6a9024a 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -1354,7 +1354,7 @@ int Log_event::read_log_event(IO_CACHE* file, String* packet,
ulong data_len;
char buf[LOG_EVENT_MINIMAL_HEADER_LEN];
uchar ev_offset= packet->length();
-#if !defined(MYSQL_CLIENT)
+#ifndef max_allowed_packet
THD *thd=current_thd;
ulong max_allowed_packet= thd ? thd->slave_thread ? slave_max_allowed_packet
: thd->variables.max_allowed_packet