summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2014-06-18 12:12:43 +0400
committerSergey Vojtovich <svoj@mariadb.org>2014-06-18 12:12:43 +0400
commitb6c175aad494ba38d149367b7b890d36c9c09346 (patch)
tree063975094fa80e5d219db2d98030d39bb738f7c4
parent643738eec8f3e10132bb99c191bf49e1a37130f4 (diff)
downloadmariadb-git-b6c175aad494ba38d149367b7b890d36c9c09346.tar.gz
MDEV-6039 - WebScaleSQL patches
Preserve CLIENT_REMEMBER_OPTIONS flag for compressed connections Code cleanup: removed reference to CLIENT_REMEMBER_OPTIONS from server code. This flag is ignored in MariaDB.
-rw-r--r--sql/slave.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc
index f7d019a6c39..2160cfc3534 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -5804,7 +5804,7 @@ static int connect_to_master(THD* thd, MYSQL* mysql, Master_info* mi,
#ifndef DBUG_OFF
mi->events_till_disconnect = disconnect_slave_event_count;
#endif
- ulong client_flag= CLIENT_REMEMBER_OPTIONS;
+ ulong client_flag= 0;
if (opt_slave_compressed_protocol)
client_flag=CLIENT_COMPRESS; /* We will use compression */