Commit 93e1030d authored by unknown's avatar unknown

Bug #22860: Option --memlock should be revisited

Support says that memlock doesn't work on OSes other than Solaris.  
Add a warning about --memlock to the crash monologue.


sql/mysqld.cc:
  On a crash when --memlock was active, emit advice about the insta-
  bility of that parameter.
parent 02e764bd
452a92d0-31-8wSzSfZi165fcGcXPA 452a92d0-31-8wSzSfZi165fcGcXPA
454a7ef8gdvE_ddMlJyghvOAkKPNOQ 454a7ef8gdvE_ddMlJyghvOAkKPNOQ
454f8960jsVT_kMKJtZ9OCgXoba0xQ 454f8960jsVT_kMKJtZ9OCgXoba0xQ
4554a95d7txO1DuO9G3nAizI3SkFAA
4554b3722d71SbPiI2Gx-RhbZjmuIQ
...@@ -274,7 +274,7 @@ bool opt_disable_networking=0, opt_skip_show_db=0; ...@@ -274,7 +274,7 @@ bool opt_disable_networking=0, opt_skip_show_db=0;
bool opt_character_set_client_handshake= 1; bool opt_character_set_client_handshake= 1;
bool lower_case_table_names_used= 0; bool lower_case_table_names_used= 0;
bool server_id_supplied = 0; bool server_id_supplied = 0;
bool opt_endinfo,using_udf_functions, locked_in_memory; bool opt_endinfo, using_udf_functions, locked_in_memory;
bool opt_using_transactions, using_update_log; bool opt_using_transactions, using_update_log;
bool volatile abort_loop, select_thread_in_use, signal_thread_in_use; bool volatile abort_loop, select_thread_in_use, signal_thread_in_use;
bool volatile ready_to_exit, shutdown_in_progress, grant_option; bool volatile ready_to_exit, shutdown_in_progress, grant_option;
...@@ -2015,13 +2015,24 @@ later when used with nscd), disable LDAP in your nsswitch.conf, or use a\n\ ...@@ -2015,13 +2015,24 @@ later when used with nscd), disable LDAP in your nsswitch.conf, or use a\n\
mysqld that is not statically linked.\n"); mysqld that is not statically linked.\n");
#endif #endif
if (test_flags & TEST_CORE_ON_SIGNAL) if (locked_in_memory)
{ {
fprintf(stderr, "Writing a core file\n"); fprintf(stderr, "\n\
fflush(stderr); The \"--memlock\" argument, which was enabled, uses system calls that are\n\
write_core(sig); unreliable and unstable on some operating systems and operating-system\n\
} versions (notably, some versions of Linux). This crash could be due to use\n\
exit(1); of those buggy OS calls. You should consider whether you really need the\n\
\"--memlock\" parameter and/or consult the OS distributer about \"mlockall\"\n\
bugs.\n");
}
if (test_flags & TEST_CORE_ON_SIGNAL)
{
fprintf(stderr, "Writing a core file\n");
fflush(stderr);
write_core(sig);
}
exit(1);
} }
#ifndef SA_RESETHAND #ifndef SA_RESETHAND
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment