diff options
| author | unknown <pem@mysql.com> | 2003-12-18 17:51:43 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2003-12-18 17:51:43 +0100 |
| commit | fe6946ac93167d598f4f066aab425a9edbf015f5 (patch) | |
| tree | eaba5705584c698b769abc4d4a369b1b8d393264 /sql/net_serv.cc | |
| parent | 1ca25d0e02876cc48f176195840a8dbbc4b4b0e9 (diff) | |
| parent | fddddc2c23ec7494738e4e559a680a06166b31b8 (diff) | |
| download | mariadb-git-fe6946ac93167d598f4f066aab425a9edbf015f5.tar.gz | |
Merge
client/mysqltest.c:
Auto merged
include/mysqld_error.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/net_serv.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/udf_example.cc:
Auto merged
include/sql_state.h:
SCCS merged
sql/sql_yacc.yy:
SCCS merged
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 0120ad80c0a..5e5d4b14c89 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" { |