SCRUM

embedded library trimming


include/my_global.h:
  HAVE_REPLICATION & HAVE_EXTERNAL_CLIENT macro definitions
libmysqld/lib_sql.cc:
  Protocol:: methods implementation for embedded case
sql/field.cc:
  geometry type methods implementations
sql/ha_berkeley.cc:
  set_nfields deletion
sql/ha_innodb.cc:
  macro changed
sql/ha_myisam.cc:
  set_nfields deletion
sql/ha_myisam.h:
  code #ifdef-ed
sql/item.cc:
  bugfix
sql/item_func.cc:
  macro changed
sql/item_strfunc.cc:
  superfluous code deleted
sql/log.cc:
  HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/log_event.cc:
  #ifdef constructions changed
sql/log_event.h:
  #ifdef-s changed
sql/mf_iocache.cc:
  HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/mini_client.cc:
  HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/mysql_priv.h:
  code removation
sql/mysqld.cc:
  HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/opt_range.cc:
  code trimming
sql/protocol.cc:
  net_store_data becomes a member of Protocol
sql/protocol.h:
  changes to make Protocol working in embedded library
sql/repl_failsafe.cc:
  HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/repl_failsafe.h:
  HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/set_var.cc:
  HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/slave.cc:
  HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/slave.h:
  HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/sql_parse.cc:
  code trimming
sql/sql_prepare.cc:
  comment added
sql/sql_repl.cc:
  HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/sql_repl.h:
  HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/sql_show.cc:
  mysql_list_processes to work in embedded library
sql/sql_table.cc:
  set_nfields deletion

1 files changed, 10 insertions, 10 deletions

diff --git a/sql/protocol.h b/sql/protocol.h
index cc20e158243..cf41e404c93 100644
--- a/sql/protocol.h
+++ b/sql/protocol.h
@@ -33,8 +33,11 @@ protected:
 #ifndef DEBUG_OFF
   enum enum_field_types *field_types;
 #endif
+  uint field_count;
+  bool net_store_data(const char *from, uint length);
 #ifdef EMBEDDED_LIBRARY
-  uint n_fields;
+  char **next_field;
+  MEM_ROOT *alloc;
 #endif
 
 public:
@@ -56,13 +59,11 @@ public:
   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 bool prepare_for_send(List<Item> *item_list) 
+  {
+    field_count=item_list->elements;
+    return 0;
+  }
   virtual void prepare_for_resend()=0;
 
   virtual bool store_null()=0;
@@ -106,7 +107,7 @@ public:
 class Protocol_prep :public Protocol
 {
 private:
-  uint field_count, bit_fields;
+  uint bit_fields;
 public:
   Protocol_prep() {}
   Protocol_prep(THD *thd) :Protocol(thd) {}
@@ -126,7 +127,6 @@ public:
   virtual bool store(Field *field);
 };
 
-
 void send_warning(THD *thd, uint sql_errno, const char *err=0);
 void net_printf(THD *thd,uint sql_errno, ...);
 void send_ok(THD *thd, ha_rows affected_rows=0L, ulonglong id=0L,