SCRUM

Including client code into embedded library

Code trimming (fixes of comments etc)


include/mysql_com.h:
  Comment fixed
include/mysql_embed.h:
  comment fixed
include/violite.h:
  comment fixed
libmysql/libmysql.c:
  #undef should work anyway
libmysqld/libmysqld.c:
  comment fixed
sql-common/client.c:
  #undef should work anyway
sql/net_serv.cc:
  #undef should work anyway

include/mysql_com.h

@@ -234,9 +234,7 @@ void	net_end(NET *net);
 void	net_clear(NET *net);
 my_bool net_realloc(NET *net, unsigned long length);
 
-/*HFTODO - should remove it
- */
-#ifndef EMBEDDED_LIBRARY
+#ifndef EMBEDDED_LIBRARY /* To be removed by HF */
 my_bool	net_flush(NET *net);
 #else
 #define net_flush(A)

include/mysql_embed.h

@@ -19,9 +19,7 @@
 #ifdef EMBEDDED_LIBRARY
 
 /* Things we don't need in the embedded version of MySQL */
-/*HFTODO
-#undef HAVE_VIO - if we don't want client in embedded library
-*/
+/* TODO HF add #undef HAVE_VIO if we don't want client in embedded library */
 
 #undef HAVE_PSTACK				/* No stacktrace */
 #undef HAVE_DLOPEN				/* No udf functions */

include/violite.h

@@ -220,8 +220,7 @@ enum SSL_type
 };
 
 
-/* HFTODO - hide this if we don't want client in embedded server
- */
+/* HFTODO - hide this if we don't want client in embedded server */
 /* This structure is for every connection on both sides */
 struct st_vio
 {

libmysql/libmysql.c

@@ -61,12 +61,8 @@
 #include "client_settings.h"
 
 #ifdef EMBEDDED_LIBRARY
-#ifdef net_flush
 #undef net_flush
-#endif
-
 my_bool	net_flush(NET *net);
-
 #endif
 
 #if defined(MSDOS) || defined(__WIN__)

libmysqld/libmysqld.c

@@ -64,8 +64,7 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command,
 		     const char *header, ulong header_length,
 		     const char *arg, ulong arg_length, my_bool skip_check);
 
-/*FROM client.c
- */
+/* From client.c */
 void mysql_read_default_options(struct st_mysql_options *options,
 				const char *filename,const char *group);
 MYSQL * STDCALL 

sql-common/client.c

@@ -41,9 +41,7 @@
 
 #ifdef EMBEDDED_LIBRARY
 
-#ifdef MYSQL_SERVER
 #undef MYSQL_SERVER
-#endif
 
 #ifndef MYSQL_CLIENT
 #define MYSQL_CLIENT
@@ -51,9 +49,7 @@
 
 #define CLI_MYSQL_REAL_CONNECT cli_mysql_real_connect
 
-#ifdef net_flush
 #undef net_flush
-#endif
 my_bool	net_flush(NET *net);
 
 #else  /*EMBEDDED_LIBRARY*/

sql/net_serv.cc

@@ -51,9 +51,7 @@
 
 #ifdef EMBEDDED_LIBRARY
 
-#ifdef net_flush
 #undef net_flush
-#endif
 
 extern "C" {
 my_bool	net_flush(NET *net);