diff options
| -rw-r--r-- | include/mysql_com.h | 4 | ||||
| -rw-r--r-- | include/mysql_embed.h | 4 | ||||
| -rw-r--r-- | include/violite.h | 3 | ||||
| -rw-r--r-- | libmysql/libmysql.c | 4 | ||||
| -rw-r--r-- | libmysqld/libmysqld.c | 3 | ||||
| -rw-r--r-- | sql-common/client.c | 4 | ||||
| -rw-r--r-- | sql/net_serv.cc | 2 |
7 files changed, 4 insertions, 20 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index a89569c451e..ab6330dbe53 100644 --- a/include/mysql_com.h +++ b/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) diff --git a/include/mysql_embed.h b/include/mysql_embed.h index ba71b2e93ea..7a169d4133e 100644 --- a/include/mysql_embed.h +++ b/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 */ diff --git a/include/violite.h b/include/violite.h index eeb2cbd7185..9205f5b799a 100644 --- a/include/violite.h +++ b/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 { diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 1a5e91045ae..39cff002e45 100644 --- a/libmysql/libmysql.c +++ b/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__) diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c index 5b738f7f95b..6a71bb28150 100644 --- a/libmysqld/libmysqld.c +++ b/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 diff --git a/sql-common/client.c b/sql-common/client.c index 0ce693f90eb..f1e9f79c8e5 100644 --- a/sql-common/client.c +++ b/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*/ diff --git a/sql/net_serv.cc b/sql/net_serv.cc index 370c046c660..3f73825b2d8 100644 --- a/sql/net_serv.cc +++ b/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); |