1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

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
This commit is contained in:
unknown
2002-12-17 19:33:25 +04:00
parent 8db300257b
commit 44d684d13f
7 changed files with 95 additions and 16 deletions

View File

@@ -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;