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

Local merge

Browse Source
This commit is contained in:
Marc Alff
2011-03-10 09:43:55 +01:00
parent 8602f2d77d d7a4372fbe
commit 275110544b
86 changed files with 1557 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
sql/mysqld.cc
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -1273,11 +1273,14 @@ static void __cdecl kill_server(int sig_ptr)
/*
Send event to smem_event_connect_request for aborting
*/
if (!SetEvent(smem_event_connect_request))
{
DBUG_PRINT("error",
("Got error: %ld from SetEvent of smem_event_connect_request",
GetLastError()));
if (opt_enable_shared_memory)
{
if (!SetEvent(smem_event_connect_request))
{
DBUG_PRINT("error",
("Got error: %ld from SetEvent of smem_event_connect_request",
GetLastError()));
}
}
#endif
@ -4228,11 +4231,14 @@ int mysqld_main(int argc, char **argv)
to be able to read defaults files and parse options.
*/
my_progname= argv[0];
if (my_basic_init())
#ifndef _WIN32
// For windows, my_init() is called from the win specific mysqld_main
if (my_init()) // init my_sys library & pthreads
{
fprintf(stderr, "my_basic_init() failed.");
fprintf(stderr, "my_init() failed.");
return 1;
}
#endif
orig_argc= argc;
orig_argv= argv;
@ -4331,11 +4337,10 @@ int mysqld_main(int argc, char **argv)
recreate objects which were initialised early,
so that they are instrumented as well.
*/
my_thread_basic_global_reinit();
my_thread_global_reinit();
}
#endif /* HAVE_PSI_INTERFACE */
my_init(); // init my_sys library & pthreads
init_error_log_mutex();
/* Set signal used to kill MySQL */
@ -4756,6 +4761,12 @@ int mysqld_main(int argc, char **argv)
/* Must be initialized early for comparison of service name */
system_charset_info= &my_charset_utf8_general_ci;
if (my_init())
{
fprintf(stderr, "my_init() failed.");
return 1;
}
if (Service.GetOS()) /* true NT family */
{
char file_path[FN_REFLEN];