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, 26 insertions, 30 deletions

diff --git a/sql/log_event.h b/sql/log_event.h
index e0ebe4150bb..7ba203e7f30 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -268,11 +268,11 @@ public:
 			    pthread_mutex_t* log_lock);
   void set_log_pos(MYSQL_LOG* log);
   static void init_show_field_list(List<Item>* field_list);
-#ifndef EMBEDDED_LIBRARY
+#ifdef HAVE_REPLICATION
   int net_send(Protocol *protocol, const char* log_name, my_off_t pos);
   virtual void pack_info(Protocol *protocol);
   virtual int exec_event(struct st_relay_log_info* rli);
-#endif /* EMBEDDED_LIBRARY */
+#endif /* HAVE_REPLICATION */
   virtual const char* get_db()
   {
     return thd ? thd->db : 0;
@@ -357,10 +357,10 @@ public:
   Query_log_event(THD* thd_arg, const char* query_arg, ulong query_length,
 		  bool using_trans);
   const char* get_db() { return db; }
-#ifndef EMBEDDED_LIBRARY
+#ifdef HAVE_REPLICATION
   void pack_info(Protocol* protocol);
   int exec_event(struct st_relay_log_info* rli);
-#endif /* EMBEDDED_LIBRARY */
+#endif /* HAVE_REPLICATION */
 #else
   void print(FILE* file, bool short_form = 0, char* last_db = 0);
 #endif
@@ -387,7 +387,7 @@ public:
   }
 };
 
-#ifndef EMBEDDED_LIBRARY
+#ifdef HAVE_REPLICATION
 
 /*****************************************************************************
 
@@ -409,10 +409,8 @@ public:
 
 #ifndef MYSQL_CLIENT  
   Slave_log_event(THD* thd_arg, struct st_relay_log_info* rli);
-#ifndef EMBEDDED_LIBRARY
   void pack_info(Protocol* protocol);
   int exec_event(struct st_relay_log_info* rli);
-#endif /* EMBEDDED_LIBRARY */
 #else
   void print(FILE* file, bool short_form = 0, char* last_db = 0);
 #endif  
@@ -425,7 +423,7 @@ public:
   int write_data(IO_CACHE* file );
 };
 
-#endif /* EMBEDDED_LIBRARY */
+#endif /* HAVE_REPLICATION */
 
 
 /*****************************************************************************
@@ -464,14 +462,14 @@ public:
 		 bool using_trans);
   void set_fields(List<Item> &fields_arg);
   const char* get_db() { return db; }
-#ifndef EMBEDDED_LIBRARY
+#ifdef HAVE_REPLICATION
   void pack_info(Protocol* protocol);
   int exec_event(struct st_relay_log_info* rli)
   {
     return exec_event(thd->slave_net,rli);
   }
   int exec_event(NET* net, struct st_relay_log_info* rli);
-#endif /* EMBEDDED_LIBRARY */
+#endif /* HAVE_REPLICATION */
 #else
   void print(FILE* file, bool short_form = 0, char* last_db = 0);
 #endif
@@ -518,10 +516,10 @@ public:
     created = (uint32) when;
     memcpy(server_version, ::server_version, ST_SERVER_VER_LEN);
   }
-#ifndef EMBEDDED_LIBRARY
+#ifdef HAVE_REPLICATION
   void pack_info(Protocol* protocol);
   int exec_event(struct st_relay_log_info* rli);
-#endif /* EMBEDDED_LIBRARY */
+#endif /* HAVE_REPLICATION */
 #else
   void print(FILE* file, bool short_form = 0, char* last_db = 0);
 #endif  
@@ -555,10 +553,10 @@ public:
   Intvar_log_event(THD* thd_arg,uchar type_arg, ulonglong val_arg)
     :Log_event(),val(val_arg),type(type_arg)
   {}
-#ifndef EMBEDDED_LIBRARY
+#ifdef HAVE_REPLICATION
   void pack_info(Protocol* protocol);
   int exec_event(struct st_relay_log_info* rli);
-#endif /* EMBEDDED_LIBRARY */
+#endif /* HAVE_REPLICATION */
 #else
   void print(FILE* file, bool short_form = 0, char* last_db = 0);
 #endif  
@@ -589,10 +587,10 @@ class Rand_log_event: public Log_event
   Rand_log_event(THD* thd_arg, ulonglong seed1_arg, ulonglong seed2_arg)
     :Log_event(thd_arg,0,0),seed1(seed1_arg),seed2(seed2_arg)
   {}
-#ifndef EMBEDDED_LIBRARY
+#ifdef HAVE_REPLICATION
   void pack_info(Protocol* protocol);
   int exec_event(struct st_relay_log_info* rli);
-#endif /* EMBEDDED_LIBRARY */
+#endif /* HAVE_REPLICATION */
 #else
   void print(FILE* file, bool short_form = 0, char* last_db = 0);
 #endif
@@ -611,7 +609,7 @@ class Rand_log_event: public Log_event
   Stop Log Event class
 
  ****************************************************************************/
-#ifndef EMBEDDED_LIBRARY
+#ifdef HAVE_REPLICATION
 
 class Stop_log_event: public Log_event
 {
@@ -619,9 +617,7 @@ public:
 #ifndef MYSQL_CLIENT
   Stop_log_event() :Log_event()
   {}
-#ifndef EMBEDDED_LIBRARY
   int exec_event(struct st_relay_log_info* rli);
-#endif /* EMBEDDED_LIBRARY */
 #else
   void print(FILE* file, bool short_form = 0, char* last_db = 0);
 #endif  
@@ -634,7 +630,7 @@ public:
   bool is_valid() { return 1; }
 };
 
-#endif /* EMBEDDED_LIBRARY */
+#endif /* HAVE_REPLICATION */
 
 
 /*****************************************************************************
@@ -659,10 +655,10 @@ public:
     pos(pos_arg),ident_len(ident_len_arg ? ident_len_arg :
 			   (uint) strlen(new_log_ident_arg)), alloced(0)
   {}
-#ifndef EMBEDDED_LIBRARY
+#ifdef HAVE_REPLICATION
   void pack_info(Protocol* protocol);
   int exec_event(struct st_relay_log_info* rli);
-#endif /* EMBEDDED_LIBRARY */
+#endif /* HAVE_REPLICATION */
 #else
   void print(FILE* file, bool short_form = 0, char* last_db = 0);
 #endif
@@ -708,10 +704,10 @@ public:
 			enum enum_duplicates handle_dup,
 			char* block_arg, uint block_len_arg,
 			bool using_trans);
-#ifndef EMBEDDED_LIBRARY
+#ifdef HAVE_REPLICATION
   void pack_info(Protocol* protocol);
   int exec_event(struct st_relay_log_info* rli);
-#endif /* EMBEDDED_LIBRARY */
+#endif /* HAVE_REPLICATION */
 #else
   void print(FILE* file, bool short_form = 0, char* last_db = 0);
 #endif  
@@ -760,10 +756,10 @@ public:
 #ifndef MYSQL_CLIENT
   Append_block_log_event(THD* thd, char* block_arg,
 			 uint block_len_arg, bool using_trans);
-#ifndef EMBEDDED_LIBRARY
+#ifdef HAVE_REPLICATION
   int exec_event(struct st_relay_log_info* rli);
   void pack_info(Protocol* protocol);
-#endif /* EMBEDDED_LIBRARY */
+#endif /* HAVE_REPLICATION */
 #else
   void print(FILE* file, bool short_form = 0, char* last_db = 0);
 #endif
@@ -788,10 +784,10 @@ public:
   
 #ifndef MYSQL_CLIENT
   Delete_file_log_event(THD* thd, bool using_trans);
-#ifndef EMBEDDED_LIBRARY
+#ifdef HAVE_REPLICATION
   void pack_info(Protocol* protocol);
   int exec_event(struct st_relay_log_info* rli);
-#endif /* EMBEDDED_LIBRARY */
+#endif /* HAVE_REPLICATION */
 #else
   void print(FILE* file, bool short_form = 0, char* last_db = 0);
 #endif  
@@ -816,10 +812,10 @@ public:
   
 #ifndef MYSQL_CLIENT
   Execute_load_log_event(THD* thd, bool using_trans);
-#ifndef EMBEDDED_LIBRARY
+#ifdef HAVE_REPLICATION
   void pack_info(Protocol* protocol);
   int exec_event(struct st_relay_log_info* rli);
-#endif /* EMBEDDED_LIBRARY */
+#endif /* HAVE_REPLICATION */
 #else
   void print(FILE* file, bool short_form = 0, char* last_db = 0);
 #endif