diff options
| author | Magnus Blåudd <magnus.blaudd@sun.com> | 2009-06-05 13:11:55 +0200 |
|---|---|---|
| committer | Magnus Blåudd <magnus.blaudd@sun.com> | 2009-06-05 13:11:55 +0200 |
| commit | 465d21a32795425a1d12a9cb874a2e573bf85788 (patch) | |
| tree | 5a0e93a5ec3b94ee2dcfc66f801ba44551689111 /sql/mysql_priv.h | |
| parent | 79650ae64133a3eba5f2e10575de56aa4b555226 (diff) | |
| download | mariadb-git-465d21a32795425a1d12a9cb874a2e573bf85788.tar.gz | |
Bug#45326 Linker failure for libmysqld with VC++ 2008
- Rename the functions in mysqld that conflict with the one in the
external interface defined by mysql.h
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index ba9bee6e054..10db8d3bb51 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1408,14 +1408,14 @@ enum enum_schema_tables get_schema_table_idx(ST_SCHEMA_TABLE *schema_table); /* sql_prepare.cc */ -void mysql_stmt_prepare(THD *thd, const char *packet, uint packet_length); -void mysql_stmt_execute(THD *thd, char *packet, uint packet_length); -void mysql_stmt_close(THD *thd, char *packet); +void mysqld_stmt_prepare(THD *thd, const char *packet, uint packet_length); +void mysqld_stmt_execute(THD *thd, char *packet, uint packet_length); +void mysqld_stmt_close(THD *thd, char *packet); void mysql_sql_stmt_prepare(THD *thd); void mysql_sql_stmt_execute(THD *thd); void mysql_sql_stmt_close(THD *thd); -void mysql_stmt_fetch(THD *thd, char *packet, uint packet_length); -void mysql_stmt_reset(THD *thd, char *packet); +void mysqld_stmt_fetch(THD *thd, char *packet, uint packet_length); +void mysqld_stmt_reset(THD *thd, char *packet); void mysql_stmt_get_longdata(THD *thd, char *pos, ulong packet_length); void reinit_stmt_before_use(THD *thd, LEX *lex); |