bk commit into 4.1 tree (cmiller:1.2544) BUG#22860

[Chad MILLER]

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 11:31:25-05:00, cmiller@stripped +1 -0
  Bug #22860: Option --memlock should be revisited
  
  Support says that memlock doesn't work on OSes other than Solaris.  If 
  "memlock" command-line parameter is specified on an OS that doesn't
  reliably support it, then unset it and warn that it's unsupported.

  sql/mysqld.cc@stripped, 2006-11-10 11:31:23-05:00, cmiller@stripped +10 -0
    Unset and warn about attempts to use memlock on unsupported OSes.

# 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 11:31:27 -05:00
+++ 1.620/sql/mysqld.cc	2006-11-10 11:31:27 -05:00
@@ -6694,6 +6694,16 @@ static void get_options(int argc,char **
       !opt_slow_log)
     sql_print_warning("options --log-slow-admin-statements and
--log-queries-not-using-indexes have no effect if --log-slow-queries is not set");
 
+#if (defined(sun) || defined(__sun))
+  /* whitelist of OSes that support memlock.  (Bug#22860) */
+#else
+  if (locked_in_memory)
+  {
+    sql_print_warning("this operating system does not support reliable memlock;
disabling");
+    locked_in_memory= 0;
+  }
+#endif
+
   /*
     Check that the default storage engine is actually available.
   */