Commit 5a529d36 authored by unknown's avatar unknown
Browse files

Merge mysqldev@production.mysql.com:my/mysql-5.0-release 

into  maint1.mysql.com:/data/localhome/tsmith/bk/bfx/50-rel


sql/mysqld.cc:
  Auto merged
sql/stacktrace.c:
  Auto merged
sql/stacktrace.h:
  Auto merged
parents b179cf8f bd8309cc

sql/mysqld.cc

+2 −2
Original line number Diff line number Diff line
@@ -7043,10 +7043,10 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
    }

    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;