diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-06-23 09:47:18 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-06-25 13:28:09 +0200 |
| commit | 46fc864b90228e007e13fbd166674309d51bf955 (patch) | |
| tree | c36654819914b9662db193a642feea71cc6a396e /sql/net_serv.cc | |
| parent | 88aaf590ac9fa8c8030a5831cebd867a7f35478f (diff) | |
| download | mariadb-git-46fc864b90228e007e13fbd166674309d51bf955.tar.gz | |
MDEV-16478: mysql_real_connect() from libmariadbd.so always crash
Returned accidentally removed undefinition of MYSQL_SERVER in net_serv.cc inside embedded server
(embedded server uses real_net_read/write only as a client)
Prevented attempt to clean up embedded server if it was not initialized
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 0d3aa12465d..576ef5009b5 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -47,6 +47,12 @@ #include "probes_mysql.h" #include "proxy_protocol.h" +#ifdef EMBEDDED_LIBRARY +#undef MYSQL_SERVER +#undef MYSQL_CLIENT +#define MYSQL_CLIENT +#endif /*EMBEDDED_LIBRARY */ + /* to reduce the number of ifdef's in the code */ |