bk commit into 4.1 tree (tsmith:1.2539) BUG#21054

[tim]

Below is the list of changes that have just been committed into a local
4.1 repository of tsmith. When tsmith 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-09-07 00:11:43+02:00, tsmith@stripped +1 -0
  Bug #21054: myisam_stats_method ignored in my.cnf and cmdline
  Fix OPT_MYISAM_STATS_METHOD case, where the NULLS_EQUAL and NULLS_NOT_EQUAL methods were
mixed up

  sql/mysqld.cc@stripped, 2006-09-07 00:09:58+02:00, tsmith@stripped +2 -2
    Fix OPT_MYISAM_STATS_METHOD case, bug #21054

# 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:	tsmith
# Host:	maint1.mysql.com
# Root:	/data/localhome/tsmith/bk/bfx/my41-bfx

--- 1.613/sql/mysqld.cc	2006-09-07 00:10:24 +02:00
+++ 1.614/sql/mysqld.cc	2006-09-07 00:10:24 +02:00
@@ -6537,10 +6537,10 @@ get_one_option(int optid, const struct m
     }
     switch (method-1) {
     case 0: 
-      method_conv= MI_STATS_METHOD_NULLS_EQUAL;
+      method_conv= MI_STATS_METHOD_NULLS_NOT_EQUAL;
       break;
     case 1:
-      method_conv= MI_STATS_METHOD_NULLS_NOT_EQUAL;
+      method_conv= MI_STATS_METHOD_NULLS_EQUAL;
       break;
     case 2:
       method_conv= MI_STATS_METHOD_IGNORE_NULLS;