From 44d684d13ff261ff8acd9b40f6abde54c78efbfb Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 17 Dec 2002 19:33:25 +0400 Subject: Merging&testing libmysqld/lib_sql.cc: Protocol::send_fields added sql/ha_berkeley.cc: set_nfields calls added sql/ha_myisam.cc: set_nfield call added sql/mysql_priv.h: embedded_send_row header changed sql/protocol.cc: Protocol::write edited for embedded case sql/protocol.h: n_fields member added sql/sql_table.cc: sen_nfields added --- sql/protocol.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'sql/protocol.h') diff --git a/sql/protocol.h b/sql/protocol.h index b3ab0a2b31d..cc20e158243 100644 --- a/sql/protocol.h +++ b/sql/protocol.h @@ -33,6 +33,9 @@ protected: #ifndef DEBUG_OFF enum enum_field_types *field_types; #endif +#ifdef EMBEDDED_LIBRARY + uint n_fields; +#endif public: CONVERT *convert; @@ -52,6 +55,12 @@ public: { return store_longlong((longlong) from, 0); } inline bool store(ulonglong from) { return store_longlong((longlong) from, 1); } + +#ifdef EMBEDDED_LIBRARY + inline void set_nfields(uint fields_count) { n_fields= fields_count; } +#else + inline void set_nfields(uint fields_count) {} +#endif virtual bool prepare_for_send(List *item_list) { return 0;} virtual void prepare_for_resend()=0; -- cgit v1.2.1