diff options
| author | unknown <hf@genie.(none)> | 2002-11-07 12:20:08 +0400 |
|---|---|---|
| committer | unknown <hf@genie.(none)> | 2002-11-07 12:20:08 +0400 |
| commit | 36140ba7c5c44e62242fdadaa77da7fc555b400c (patch) | |
| tree | 36edaa6da720c34af8ee97ad2d903a40e055fef5 /client | |
| parent | ef5edca39360f1a84591b6004d7b2eecb39b5a35 (diff) | |
| parent | 328fdfa08668fce1884c452b163bab3f0e9cce90 (diff) | |
| download | mariadb-git-36140ba7c5c44e62242fdadaa77da7fc555b400c.tar.gz | |
Merged by hands
BitKeeper/etc/gone:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-skipkeys~207548ca813d5081:
'Auto converge rename'
libmysqld/lib_sql.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.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; |