diff options
| author | unknown <hf@deer.mysql.r18.ru> | 2002-12-17 19:33:25 +0400 |
|---|---|---|
| committer | unknown <hf@deer.mysql.r18.ru> | 2002-12-17 19:33:25 +0400 |
| commit | 44d684d13ff261ff8acd9b40f6abde54c78efbfb (patch) | |
| tree | 314906891e628c9c38154fc9618195971f885a7c /sql/protocol.h | |
| parent | 8db300257b8e457f63a61d27c16ffeb4e23127b1 (diff) | |
| download | mariadb-git-44d684d13ff261ff8acd9b40f6abde54c78efbfb.tar.gz | |
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
Diffstat (limited to 'sql/protocol.h')
| -rw-r--r-- | sql/protocol.h | 9 |
1 files changed, 9 insertions, 0 deletions
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> *item_list) { return 0;} virtual void prepare_for_resend()=0; |