Force conflict to avoid bk automerge behavior; will be undone during merge.

2480ec8e · tsmith@maint1.mysql.com · 46b3997c · 2480ec8e · 2480ec8e
Commit 2480ec8e authored Sep 07, 2006 by tsmith@maint1.mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sql/stacktrace.c sql/stacktrace.c +1 -0

sql/stacktrace.h sql/stacktrace.h +1 -1

No files found.
--- 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__)

--- 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