Commit b597aaf9 authored by unknown's avatar unknown

Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my50-bfx

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


sql/mysqld.cc:
  Auto merged
sql/stacktrace.c:
  Auto merged
sql/stacktrace.h:
  Auto merged
parents 979d9c8f bd8309cc
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment