Commit bd8309cc authored by unknown's avatar unknown
Browse files

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

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


sql/mysqld.cc:
  Manual merge
sql/stacktrace.c:
  Manual merge; undo trivial change to avoid automerge.
sql/stacktrace.h:
  Manual merge; undo trivial change which avoided automerge
parents 47728f16 7a77b3d8

sql/mysqld.cc

+2 −2
Original line number Diff line number Diff line
@@ -7041,10 +7041,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;

sql/stacktrace.c

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ void safe_print_str(const char* name, const char* val, int max_len) 
}



#ifdef TARGET_OS_LINUX

/* Force merge conflict, to avoid bk automerge */

#define SIGRETURN_FRAME_COUNT  2



#if defined(__alpha__) && defined(__GNUC__)

sql/stacktrace.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ extern "C" { 
#endif



#ifdef TARGET_OS_LINUX

#if defined(HAVE_STACKTRACE) || (defined (__i386__) || (defined(__alpha__) && defined(__GNUC__))) /* Force conflict to avoid bk automerge */

#if defined(HAVE_STACKTRACE) || (defined (__i386__) || (defined(__alpha__) && defined(__GNUC__)))

#undef HAVE_STACKTRACE

#define HAVE_STACKTRACE