diff options
author | hf@deer.(none) <> | 2003-12-18 15:51:22 +0400 |
---|---|---|
committer | hf@deer.(none) <> | 2003-12-18 15:51:22 +0400 |
commit | 42799cc584c29f513cf3d3f957addd1c44f704d0 (patch) | |
tree | 2785059bf0f530b8d1cff70378904178e52fb05e /sql/net_serv.cc | |
parent | 2b53eef5f00364464652847065a81a32571cc73f (diff) | |
download | mariadb-git-42799cc584c29f513cf3d3f957addd1c44f704d0.tar.gz |
Fix for #2126 (mysql_server_init call shouldn't be needed)
now mysql_server_init is called from mysql_init with fake parameters
mysql_once_init code included to mysql_server_init.
embedded-specific initialization is in init_embedded_server function
Diffstat (limited to 'sql/net_serv.cc')
-rw-r--r-- | sql/net_serv.cc | 6 |
1 files changed, 6 insertions, 0 deletions
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" { |