diff options
| author | pem@mysql.com <> | 2004-05-26 17:04:45 +0200 |
|---|---|---|
| committer | pem@mysql.com <> | 2004-05-26 17:04:45 +0200 |
| commit | 71eddc362e7d22b9922bad9d093819592208726b (patch) | |
| tree | e4e5bb1f8b9718ec195b357c050b3dc3254b447d /sql/protocol.h | |
| parent | 350d8a215bb83518519a2c7c1bc218170bb6b8a9 (diff) | |
| parent | 94c0611e6b1f7a1ee93facc31a2f2876cf664e7a (diff) | |
| download | mariadb-git-71eddc362e7d22b9922bad9d093819592208726b.tar.gz | |
Merging 4.1 to 5.0.
Diffstat (limited to 'sql/protocol.h')
| -rw-r--r-- | sql/protocol.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/protocol.h b/sql/protocol.h index 52b78a749b3..25efecab712 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); } |