mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
merge with 4.0 to get windows fixes
VC++Files/client/mysqlclient.dsp: Auto merged VC++Files/innobase/innobase.dsp: Auto merged include/mysql.h: Auto merged include/mysql_com.h: Auto merged innobase/include/log0log.h: Auto merged innobase/include/log0log.ic: Auto merged innobase/include/mtr0mtr.h: Auto merged innobase/log/log0log.c: Auto merged innobase/log/log0recv.c: Auto merged innobase/que/que0que.c: Auto merged libmysql/libmysql.c: Auto merged libmysql_r/Makefile.am: Auto merged sql/log_event.cc: Auto merged sql/mysqld.cc: Auto merged tools/mysqlmanager.c: Auto merged
This commit is contained in:
@ -183,6 +183,14 @@ void STDCALL mysql_server_end()
|
||||
mysql_client_init= org_my_init_done= 0;
|
||||
}
|
||||
|
||||
static MYSQL_PARAMETERS mysql_internal_parameters=
|
||||
{&max_allowed_packet, &net_buffer_length};
|
||||
|
||||
MYSQL_PARAMETERS *STDCALL mysql_get_parameters()
|
||||
{
|
||||
return &mysql_internal_parameters;
|
||||
}
|
||||
|
||||
my_bool STDCALL mysql_thread_init()
|
||||
{
|
||||
#ifdef THREAD
|
||||
|
Reference in New Issue
Block a user