Commit e7cee5b5 authored by unknown's avatar unknown
Browse files

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

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
parents 09a65b47 93e1030d

BitKeeper/etc/collapsed

+2 −0
Original line number Diff line number Diff line 
452a92d0-31-8wSzSfZi165fcGcXPA

454a7ef8gdvE_ddMlJyghvOAkKPNOQ

454f8960jsVT_kMKJtZ9OCgXoba0xQ

4554a95d7txO1DuO9G3nAizI3SkFAA

4554b3722d71SbPiI2Gx-RhbZjmuIQ

sql/mysqld.cc

+19 −8
Original line number Diff line number Diff line
@@ -2015,6 +2015,17 @@ later when used with nscd), disable LDAP in your nsswitch.conf, or use a\n\ 
mysqld that is not statically linked.\n");

#endif



  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");