Merge work:/home/bk/mysql

into mysql.sashanet.com:/home/sasha/src/bk/mysql

Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
45fc78fe · sasha@mysql.sashanet.com · eac8cbf6 · a37c82a5 · 45fc78fe
Commit 45fc78fe authored May 14, 2001 by sasha@mysql.sashanet.com
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/stacktrace.c sql/stacktrace.c +2 -2

No files found.
--- a/sql/stacktrace.c
+++ b/sql/stacktrace.c
@@ -43,7 +43,7 @@ void safe_print_str(const char* name, const char* val, int max_len)
 }

 #ifdef HAVE_LINUXTHREADS
-#define SIGRETURN_FRAME_COUNT  1
+#define SIGRETURN_FRAME_COUNT  2

 #if defined(__alpha__) && defined(__GNUC__)
 /*
@@ -111,7 +111,7 @@ terribly wrong...\n");
  }
 #endif
 #if defined(__alpha__) && defined(__GNUC__) 
-  __asm __volatile__ ("mov $15,%0"
+  __asm __volatile__ ("mov $30,%0"
 		      :"=r"(fp)
 		      :"r"(fp));
  if (!fp)