From 9d2da263d58eff3c1b569ea265e3d4832968fc61 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 20 Jan 2003 18:47:25 +0400 Subject: SCRUM embedded-related changes include/mysql_com.h: net_flush emptification libmysqld/lib_sql.cc: Some Protocol:: methods implemented sql/convert.cc: changes to use convert in embedded library sql/field.cc: set_key_image changed sql/item.cc: obsolete functions removed sql/item.h: embedded-related changes in Protocol class sql/log.cc: there's no ports in embedded library sql/mysqld.cc: some debug stuff sql/protocol.cc: embedded-related changes sql/protocol.h: embedded-related changes sql/sql_cache.cc: comment added sql/sql_class.cc: no need to do special embedded select_send::send_row sql/sql_class.h: embedded-related changes sql/sql_parse.cc: comments added debugging stuff deleted sql/sql_show.cc: non-protocol sending removed --- sql/protocol.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'sql/protocol.h') 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 *list, uint flag); + bool send_records_num(List *list, ulonglong records); bool store(I_List *str_list); bool store(const char *from); String *storage_packet() { return packet; } -- cgit v1.2.1