Commit 47728f16 authored Sep 07, 2006 by unknown

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

parent 9e145670

sql/stacktrace.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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__)

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__)))
		#if defined(HAVE_STACKTRACE) \|\| (defined (__i386__) \|\| (defined(__alpha__) && defined(__GNUC__))) /* Force conflict to avoid bk automerge */
		#undef HAVE_STACKTRACE
		#define HAVE_STACKTRACE