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 12:14:26-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.  
  Remove it as a parameter altogether.

  BitKeeper/etc/collapsed@stripped, 2006-11-10 12:04:34-05:00, cmiller@stripped +1 -0

  sql/mysqld.cc@stripped, 2006-11-10 12:14:25-05:00, cmiller@stripped +4 -1
    Don't include memlock as a parameter for platforms that don't support
    it.  (Several claim to, but support says they're buggy.)

# 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 12:14:29 -05:00
+++ 1.620/sql/mysqld.cc	2006-11-10 12:14:29 -05:00
@@ -274,7 +274,7 @@ bool opt_disable_networking=0, opt_skip_
 bool opt_character_set_client_handshake= 1;
 bool lower_case_table_names_used= 0;
 bool server_id_supplied = 0;
-bool opt_endinfo,using_udf_functions, locked_in_memory;
+bool opt_endinfo, using_udf_functions, locked_in_memory= 0;
 bool opt_using_transactions, using_update_log;
 bool volatile abort_loop, select_thread_in_use, signal_thread_in_use;
 bool volatile ready_to_exit, shutdown_in_progress, grant_option;
@@ -4735,8 +4735,11 @@ master-ssl",
    (gptr*) &max_binlog_dump_events, (gptr*) &max_binlog_dump_events, 0,
    GET_INT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #endif /* HAVE_REPLICATION */
+#if (defined(sun) || defined(__sun))
+  /* whitelist of OSes that support memlock.  (Bug#22860) */
   {"memlock", OPT_MEMLOCK, "Lock mysqld in memory.", (gptr*) &locked_in_memory,
    (gptr*) &locked_in_memory, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+#endif
   {"merge", OPT_MERGE, "Enable Merge storage engine. Disable with \
 --skip-merge.",
    (gptr*) &opt_merge, (gptr*) &opt_merge, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0},

--- 1.3/BitKeeper/etc/collapsed	2006-11-10 12:14:29 -05:00
+++ 1.4/BitKeeper/etc/collapsed	2006-11-10 12:14:29 -05:00
@@ -1,3 +1,4 @@
 452a92d0-31-8wSzSfZi165fcGcXPA
 454a7ef8gdvE_ddMlJyghvOAkKPNOQ
 454f8960jsVT_kMKJtZ9OCgXoba0xQ
+4554a95d7txO1DuO9G3nAizI3SkFAA