From: Chad MILLER
Date: November 10 2006 9:36pm
Subject: bk commit into 4.1 tree (cmiller:1.2544) BUG#22860
List-Archive: http://lists.mysql.com/commits/15171
X-Bug: 22860
Message-Id: <20061110213611.2C72D83047@zippy>

Below is the list of changes that have just been committed into a local
4.1 repository of cmiller. When cmiller does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-10 16:36:08-05:00, cmiller@stripped +2 -0
  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.

  BitKeeper/etc/collapsed@stripped, 2006-11-10 16:12:19-05:00, cmiller@stripped +2 -0

  sql/mysqld.cc@stripped, 2006-11-10 16:36:07-05:00, cmiller@stripped +19 -8
    On a crash when --memlock was active, emit advice about the insta-
    bility of that parameter.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/bug22860/my41-bug22860

--- 1.619/sql/mysqld.cc	2006-11-10 16:36:11 -05:00
+++ 1.620/sql/mysqld.cc	2006-11-10 16:36:11 -05:00
@@ -2015,6 +2015,17 @@ later when used with nscd), disable LDAP
 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");

--- 1.3/BitKeeper/etc/collapsed	2006-11-10 16:36:11 -05:00
+++ 1.4/BitKeeper/etc/collapsed	2006-11-10 16:36:11 -05:00
@@ -1,3 +1,5 @@
 452a92d0-31-8wSzSfZi165fcGcXPA
 454a7ef8gdvE_ddMlJyghvOAkKPNOQ
 454f8960jsVT_kMKJtZ9OCgXoba0xQ
+4554a95d7txO1DuO9G3nAizI3SkFAA
+4554b3722d71SbPiI2Gx-RhbZjmuIQ