diff options
| author | unknown <hf@deer.(none)> | 2003-07-14 16:41:58 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2003-07-14 16:41:58 +0500 |
| commit | 3fad02abadd7afc2fafb906a3649d16e953cf4d1 (patch) | |
| tree | 47aa245dbe934b5af04e6b6945258c3ba48c4adb /client/mysqltest.c | |
| parent | b38f212f92e8d06cdb1e8dcf5f2717eea0e578ca (diff) | |
| parent | bed83967829fddd08fcd7ccaf6d0bd0b4e14b651 (diff) | |
| download | mariadb-git-3fad02abadd7afc2fafb906a3649d16e953cf4d1.tar.gz | |
Including client code into libmysqld
Merging
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/protocol.cc:
Auto merged
sql/net_serv.cc:
#ifndef was removed
Diffstat (limited to 'client/mysqltest.c')
| -rw-r--r-- | client/mysqltest.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 18dd7a26f2d..26e72560eff 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -328,7 +328,7 @@ static void get_replace_column(struct st_query *q); static void free_replace_column(); /* Disable functions that only exist in MySQL 4.0 */ -#if MYSQL_VERSION_ID < 40000 || defined(EMBEDDED_LIBRARY) +#if MYSQL_VERSION_ID < 40000 void mysql_enable_rpl_parse(MYSQL* mysql __attribute__((unused))) {} void mysql_disable_rpl_parse(MYSQL* mysql __attribute__((unused))) {} int mysql_rpl_parse_enabled(MYSQL* mysql __attribute__((unused))) { return 1; } |