summaryrefslogtreecommitdiff
path: root/sql/protocol.h
diff options
context:
space:
mode:
authorMichael Widenius <monty@mariadb.org>2015-10-22 17:00:58 +0300
committerMichael Widenius <monty@mariadb.org>2015-10-22 17:00:58 +0300
commitc3ebd7867de1302e5749dc098f5661bc96ff348a (patch)
treee2b9859df939bcd2b35e4e80ad725e86884df1f4 /sql/protocol.h
parent0bf2b1c13a810342d80626e9716acd73c3f00397 (diff)
downloadmariadb-git-c3ebd7867de1302e5749dc098f5661bc96ff348a.tar.gz
Remove THD argment from Log_event->net_send() and Protocol::pack_info() as
THD is already available in Protocol
Diffstat (limited to 'sql/protocol.h')
-rw-r--r--sql/protocol.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/protocol.h b/sql/protocol.h
index 329bb0f9c46..ea33c6bbb45 100644
--- a/sql/protocol.h
+++ b/sql/protocol.h
@@ -33,7 +33,6 @@ typedef struct st_mysql_rows MYSQL_ROWS;
class Protocol
{
protected:
- THD *thd;
String *packet;
/* Used by net_store_data() for charset conversions */
String *convert;
@@ -71,7 +70,7 @@ protected:
const char *sql_state);
public:
- Protocol() {}
+ THD *thd;
Protocol(THD *thd_arg) { init(thd_arg); }
virtual ~Protocol() {}
void init(THD* thd_arg);
@@ -151,7 +150,6 @@ public:
class Protocol_text :public Protocol
{
public:
- Protocol_text() {}
Protocol_text(THD *thd_arg) :Protocol(thd_arg) {}
virtual void prepare_for_resend();
virtual bool store_null();
@@ -183,7 +181,6 @@ class Protocol_binary :public Protocol
private:
uint bit_fields;
public:
- Protocol_binary() {}
Protocol_binary(THD *thd_arg) :Protocol(thd_arg) {}
virtual bool prepare_for_send(uint num_columns);
virtual void prepare_for_resend();