diff options
| author | unknown <hf@genie.(none)> | 2002-10-18 15:55:21 +0500 |
|---|---|---|
| committer | unknown <hf@genie.(none)> | 2002-10-18 15:55:21 +0500 |
| commit | a62ee2202f86c47f6a8d6d05948e181d73d56ba1 (patch) | |
| tree | e1ac6531db331ae24b2dcfca9ab05c0a35f3fc92 /client | |
| parent | 4ae5fd0b892748925b3899131adc2c192453f693 (diff) | |
| parent | 4c4c31db7b34082901fb976371914f9d5e8c952f (diff) | |
| download | mariadb-git-a62ee2202f86c47f6a8d6d05948e181d73d56ba1.tar.gz | |
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into genie.(none):/home/hf/work/mysql-4.1
BitKeeper/etc/logging_ok:
auto-union
include/mysql.h:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/net_pkg.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 036130f2d80..230770ed099 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -314,6 +314,10 @@ int mysql_rpl_parse_enabled(MYSQL* mysql __attribute__((unused))) { return 1; } my_bool mysql_rpl_probe(MYSQL *mysql __attribute__((unused))) { return 1; } #endif +#ifdef EMBEDDED_LIBRARY +#define mysql_send_query mysql_real_query +#endif + #define MAX_SERVER_ARGS 20 static int embedded_server_arg_count=0; |