Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my50-bug22860

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my51-bug22860


BitKeeper/etc/collapsed:
  auto-union
sql/mysqld.cc:
  Auto merged

BitKeeper/etc/collapsed

@@ -17,3 +17,5 @@
 452a92d0-31-8wSzSfZi165fcGcXPA
 454a7ef8gdvE_ddMlJyghvOAkKPNOQ
 454f8960jsVT_kMKJtZ9OCgXoba0xQ
+4554a95d7txO1DuO9G3nAizI3SkFAA
+4554b3722d71SbPiI2Gx-RhbZjmuIQ

sql/mysqld.cc

@@ -340,7 +340,7 @@ bool opt_error_log= IF_WIN(1,0);
 bool opt_disable_networking=0, opt_skip_show_db=0;
 my_bool opt_character_set_client_handshake= 1;
 bool server_id_supplied = 0;
-bool opt_endinfo,using_udf_functions;
+bool opt_endinfo, using_udf_functions;
 my_bool locked_in_memory;
 bool opt_using_transactions, using_update_log;
 bool volatile abort_loop;
@@ -2149,13 +2149,24 @@ later when used with nscd), disable LDAP in your nsswitch.conf, or use a\n\
 mysqld that is not statically linked.\n");
 #endif
 
- if (test_flags & TEST_CORE_ON_SIGNAL)
- {
-   fprintf(stderr, "Writing a core file\n");
-   fflush(stderr);
-   write_core(sig);
- }
- exit(1);
+  if (locked_in_memory)
+  {
+    fprintf(stderr, "\n\
+The \"--memlock\" argument, which was enabled, uses system calls that are\n\
+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\
+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