diff options
| author | hf@deer.(none) <> | 2003-12-18 15:51:22 +0400 |
|---|---|---|
| committer | hf@deer.(none) <> | 2003-12-18 15:51:22 +0400 |
| commit | 42799cc584c29f513cf3d3f957addd1c44f704d0 (patch) | |
| tree | 2785059bf0f530b8d1cff70378904178e52fb05e /libmysql/client_settings.h | |
| parent | 2b53eef5f00364464652847065a81a32571cc73f (diff) | |
| download | mariadb-git-42799cc584c29f513cf3d3f957addd1c44f704d0.tar.gz | |
Fix for #2126 (mysql_server_init call shouldn't be needed)
now mysql_server_init is called from mysql_init with fake parameters
mysql_once_init code included to mysql_server_init.
embedded-specific initialization is in init_embedded_server function
Diffstat (limited to 'libmysql/client_settings.h')
| -rw-r--r-- | libmysql/client_settings.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/libmysql/client_settings.h b/libmysql/client_settings.h index 3798eaa3544..b1a85f567f9 100644 --- a/libmysql/client_settings.h +++ b/libmysql/client_settings.h @@ -58,3 +58,14 @@ int cli_stmt_execute(MYSQL_STMT *stmt); MYSQL_DATA * cli_read_binary_rows(MYSQL_STMT *stmt); int cli_unbuffered_fetch(MYSQL *mysql, char **row); const char * cli_read_statistic(MYSQL *mysql); + +#ifdef EMBEDDED_LIBRARY +int init_embedded_server(int argc, char **argv, char **groups); +void end_embedded_server(); + +#else +/* Prevent warnings of unused parameters */ +#define init_embedded_server(a,b,c) ((void)a, (void)b, (void)c, 0) +#define end_embedded_server() +#endif /*EMBEDDED_LIBRARY*/ + |