diff options
author | hf@deer.mysql.r18.ru <> | 2003-01-20 18:47:25 +0400 |
---|---|---|
committer | hf@deer.mysql.r18.ru <> | 2003-01-20 18:47:25 +0400 |
commit | 1f6b6156773ae42f45cb2552cecbf52ef6964e23 (patch) | |
tree | 63d38e511b0b14f39e8fefc5eab11abc8e583d5d /sql/protocol.h | |
parent | 96089e2b3a013c83e812672284bf10a34ba9d11c (diff) | |
download | mariadb-git-1f6b6156773ae42f45cb2552cecbf52ef6964e23.tar.gz |
SCRUM
embedded-related changes
Diffstat (limited to 'sql/protocol.h')
-rw-r--r-- | sql/protocol.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/protocol.h b/sql/protocol.h index cf41e404c93..f57652af670 100644 --- a/sql/protocol.h +++ b/sql/protocol.h @@ -23,7 +23,9 @@ class CONVERT; class i_string; class THD; - +#ifdef EMBEDDED_LIBRARY +typedef struct st_mysql_field MYSQL_FIELD; +#endif class Protocol { protected: @@ -35,11 +37,12 @@ protected: #endif uint field_count; bool net_store_data(const char *from, uint length); + bool convert_str(const char *from, uint length); #ifdef EMBEDDED_LIBRARY char **next_field; + MYSQL_FIELD *next_mysql_field; MEM_ROOT *alloc; #endif - public: CONVERT *convert; @@ -47,6 +50,7 @@ public: Protocol(THD *thd) { init(thd); } void init(THD* thd); 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); bool store(const char *from); String *storage_packet() { return packet; } |