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 /include | |
| 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 'include')
| -rw-r--r-- | include/errmsg.h | 3 | ||||
| -rw-r--r-- | include/mysql.h | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/include/errmsg.h b/include/errmsg.h index 24326b1efef..8f3ddfa9796 100644 --- a/include/errmsg.h +++ b/include/errmsg.h @@ -86,5 +86,4 @@ extern const char *client_errors[]; /* Error messages */ #define CR_SHARED_MEMORY_CONNECT_SET_ERROR 2045 #define CR_CONN_UNKNOW_PROTOCOL 2046 #define CR_INVALID_CONN_HANDLE 2047 -#define CR_MYSQL_SERVER_INIT_MISSED 2048 -#define CR_SECURE_AUTH 2049 +#define CR_SECURE_AUTH 2048 diff --git a/include/mysql.h b/include/mysql.h index fd0330b35da..d1b467f9649 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -638,9 +638,6 @@ int STDCALL mysql_drop_db(MYSQL *mysql, const char *DB); (*(mysql)->methods->advanced_command)(mysql, command, \ NullS, 0, arg, length, skip_check) unsigned long net_safe_read(MYSQL* mysql); -void mysql_once_init(void); - -extern my_bool server_inited; #ifdef __NETWARE__ #pragma pack(pop) /* restore alignment */ |