diff options
| author | pem@mysql.com <> | 2003-12-01 16:14:40 +0100 |
|---|---|---|
| committer | pem@mysql.com <> | 2003-12-01 16:14:40 +0100 |
| commit | 6e717133c5e43d45f720dff9feb5e9ff58867876 (patch) | |
| tree | 024f2d18e3cf9f65db53f9f8c2d5413859781e16 /sql/protocol.h | |
| parent | 82270288de9244ff2b1ae5a58d66add2a13d6e70 (diff) | |
| parent | f266cdabab538eeb87682af70d5e76652ee6387b (diff) | |
| download | mariadb-git-6e717133c5e43d45f720dff9feb5e9ff58867876.tar.gz | |
Merge 4.1 to 5.0
Diffstat (limited to 'sql/protocol.h')
| -rw-r--r-- | sql/protocol.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sql/protocol.h b/sql/protocol.h index 6aa9b6414ae..d2ec08c3cf4 100644 --- a/sql/protocol.h +++ b/sql/protocol.h @@ -44,9 +44,9 @@ protected: #endif public: Protocol() {} - Protocol(THD *thd) { init(thd); } + Protocol(THD *thd_arg) { init(thd_arg); } virtual ~Protocol() {} - void init(THD* thd); + void init(THD* thd_arg); virtual bool send_fields(List<Item> *list, uint flag); bool send_records_num(List<Item> *list, ulonglong records); bool store(I_List<i_string> *str_list); @@ -93,7 +93,7 @@ class Protocol_simple :public Protocol { public: Protocol_simple() {} - Protocol_simple(THD *thd) :Protocol(thd) {} + Protocol_simple(THD *thd_arg) :Protocol(thd_arg) {} virtual void prepare_for_resend(); virtual bool store_null(); virtual bool store_tiny(longlong from); @@ -118,7 +118,7 @@ private: uint bit_fields; public: Protocol_prep() {} - Protocol_prep(THD *thd) :Protocol(thd) {} + Protocol_prep(THD *thd_arg) :Protocol(thd_arg) {} virtual bool prepare_for_send(List<Item> *item_list); virtual void prepare_for_resend(); #ifdef EMBEDDED_LIBRARY @@ -151,7 +151,7 @@ public: ulong row_count; Protocol_cursor() {} - Protocol_cursor(THD *thd, MEM_ROOT *ini_alloc) :Protocol_simple(thd), alloc(ini_alloc) {} + Protocol_cursor(THD *thd_arg, MEM_ROOT *ini_alloc) :Protocol_simple(thd_arg), alloc(ini_alloc) {} bool prepare_for_send(List<Item> *item_list) { row_count= 0; @@ -171,7 +171,6 @@ void send_ok(THD *thd, ha_rows affected_rows=0L, ulonglong id=0L, const char *info=0); void send_eof(THD *thd, bool no_flush=0); bool send_old_password_request(THD *thd); -char *net_store_length(char *packet,ulonglong length); char *net_store_length(char *packet,uint length); char *net_store_data(char *to,const char *from, uint length); char *net_store_data(char *to,int32 from); |