diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/client_settings.h | 2 | ||||
| -rw-r--r-- | sql/net_serv.cc | 6 | ||||
| -rw-r--r-- | sql/sql_client.cc | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/sql/client_settings.h b/sql/client_settings.h index b357e52ec9d..75500574c99 100644 --- a/sql/client_settings.h +++ b/sql/client_settings.h @@ -32,3 +32,5 @@ #undef HAVE_SMEM #undef _CUSTOMCONFIG_ +#define mysql_server_init(a,b,c) FALSE + diff --git a/sql/net_serv.cc b/sql/net_serv.cc index 7944a528b83..a0f7a779894 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -54,6 +54,12 @@ #ifdef EMBEDDED_LIBRARY +#undef MYSQL_SERVER + +#ifndef MYSQL_CLIENT +#define MYSQL_CLIENT +#endif + #undef net_flush extern "C" { diff --git a/sql/sql_client.cc b/sql/sql_client.cc index 1ae9a23a924..9f3063cde2d 100644 --- a/sql/sql_client.cc +++ b/sql/sql_client.cc @@ -38,8 +38,3 @@ void my_net_local_init(NET *net) } } -extern "C" { -void mysql_once_init(void) -{ -} -} |