summaryrefslogtreecommitdiff
path: root/sql/protocol.h
diff options
context:
space:
mode:
Diffstat (limited to 'sql/protocol.h')
-rw-r--r--sql/protocol.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/protocol.h b/sql/protocol.h
index 17c8f0d321d..41885ec9f1f 100644
--- a/sql/protocol.h
+++ b/sql/protocol.h
@@ -30,7 +30,7 @@ class Protocol
protected:
THD *thd;
String *packet;
- String convert;
+ String *convert;
uint field_pos;
#ifndef DEBUG_OFF
enum enum_field_types *field_types;
@@ -42,6 +42,8 @@ protected:
MYSQL_FIELD *next_mysql_field;
MEM_ROOT *alloc;
#endif
+ bool store_string_aux(const char *from, uint length,
+ CHARSET_INFO *fromcs, CHARSET_INFO *tocs);
public:
Protocol() {}
Protocol(THD *thd_arg) { init(thd_arg); }