bk commit into 5.0 tree (tsmith:1.2230)

[tim]

Below is the list of changes that have just been committed into a local
5.0 repository of tsmith. When tsmith does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-07 00:54:48+02:00, tsmith@stripped +2 -0
  Force conflict to avoid bk automerge behavior; will be undone during merge.

  sql/stacktrace.c@stripped, 2006-09-07 00:54:23+02:00, tsmith@stripped +1 -0
    Force conflict to avoid bk automerge behavior; will be undone during merge.

  sql/stacktrace.h@stripped, 2006-09-07 00:54:23+02:00, tsmith@stripped +1 -1
    Force conflict to avoid bk automerge behavior; will be undone during merge.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tsmith
# Host:	maint1.mysql.com
# Root:	/data/localhome/tsmith/bk/bfx/my50-bfx

--- 1.16/sql/stacktrace.c	2006-09-07 00:53:21 +02:00
+++ 1.17/sql/stacktrace.c	2006-09-07 00:53:21 +02:00
@@ -44,6 +44,7 @@ void safe_print_str(const char* name, co
 }
 
 #ifdef TARGET_OS_LINUX
+/* Force merge conflict, to avoid bk automerge */
 #define SIGRETURN_FRAME_COUNT  2
 
 #if defined(__alpha__) && defined(__GNUC__)

--- 1.3/sql/stacktrace.h	2006-09-07 00:53:21 +02:00
+++ 1.4/sql/stacktrace.h	2006-09-07 00:53:21 +02:00
@@ -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