diff options
| author | tsmith@maint1.mysql.com <> | 2006-09-07 00:54:48 +0200 |
|---|---|---|
| committer | tsmith@maint1.mysql.com <> | 2006-09-07 00:54:48 +0200 |
| commit | 2480ec8e3ef17fd86bd39c83301a125a1d956eab (patch) | |
| tree | 55bfa203c5bc3adfdce591821409ad68f1a8eb8c | |
| parent | 46b3997c514fac4b991209d8679b12698bf5103f (diff) | |
| download | mariadb-git-2480ec8e3ef17fd86bd39c83301a125a1d956eab.tar.gz | |
Force conflict to avoid bk automerge behavior; will be undone during merge.
| -rw-r--r-- | sql/stacktrace.c | 1 | ||||
| -rw-r--r-- | sql/stacktrace.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sql/stacktrace.c b/sql/stacktrace.c index 838f547dc02..3660ac845fe 100644 --- a/sql/stacktrace.c +++ b/sql/stacktrace.c @@ -44,6 +44,7 @@ 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 d5d1e05ef0e..7676ee28a83 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__))) +#if defined(HAVE_STACKTRACE) || (defined (__i386__) || (defined(__alpha__) && defined(__GNUC__))) /* Force conflict to avoid bk automerge */ #undef HAVE_STACKTRACE #define HAVE_STACKTRACE |