database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fix for #2126 (mysql_server_init call shouldn't be needed)

Browse Source 
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


include/errmsg.h:
  this error won't happen
include/mysql.h:
  declarations removed
libmysql/client_settings.h:
  declaration of init_embedded_server/end_embedded_server added
libmysql/errmsg.c:
  this error won't happen
libmysql/libmysql.c:
  mysql_once_init -> mysql_server_init transformations
libmysqld/embedded_priv.h:
  declaration deleted
libmysqld/lib_sql.cc:
  mysql_server_init -> init_embedded_server
  mysql_server_end  -> end_embedded_server
libmysqld/libmysqld.c:
  check for server_inited not needed now
sql-common/client.c:
  mysql_server_init now called from mysql_init
sql/client_settings.h:
  fake mysql_server_init for server code
sql/net_serv.cc:
  we need MYSQL_CLIENT defined in embedded server
sql/sql_client.cc:
  not needed now
This commit is contained in:
unknown
2003-12-18 15:51:22 +04:00
parent 69cee79246
commit 886307f282
12 changed files with 33 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/mysql.h
View File

@ -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 */