diff options
| author | unknown <tsmith@maint1.mysql.com> | 2006-09-07 00:59:08 +0200 |
|---|---|---|
| committer | unknown <tsmith@maint1.mysql.com> | 2006-09-07 00:59:08 +0200 |
| commit | bd8309cce6793352cebcf54459fa301eaab0b3b8 (patch) | |
| tree | 3e8cc0b52bb7298bca927aed736ac920e15fd6ae | |
| parent | 47728f1609cb2b7a698286bac5f88f3376104e62 (diff) | |
| parent | 7a77b3d80fe711fa4e9123a8a7be782bcef1d8db (diff) | |
| download | mariadb-git-bd8309cce6793352cebcf54459fa301eaab0b3b8.tar.gz | |
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
| -rw-r--r-- | sql/mysqld.cc | 4 | ||||
| -rw-r--r-- | sql/stacktrace.c | 1 | ||||
| -rw-r--r-- | sql/stacktrace.h | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 786a1ea4f4c..fc5cba4b5ec 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -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; diff --git a/sql/stacktrace.c b/sql/stacktrace.c index 3660ac845fe..838f547dc02 100644 --- a/sql/stacktrace.c +++ b/sql/stacktrace.c @@ -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__) diff --git a/sql/stacktrace.h b/sql/stacktrace.h index 7676ee28a83..d5d1e05ef0e 100644 --- a/sql/stacktrace.h +++ b/sql/stacktrace.h @@ -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 |