diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-05-14 14:11:54 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-05-14 14:11:54 -0600 |
| commit | 97bd164a6adc07e132d2429d6421c9a694e39981 (patch) | |
| tree | ef3bd0b545b131f37f30a51f531d4e11d707508a | |
| parent | 07fb8dc937356bbf9ddab5dab1d38932fae1d679 (diff) | |
| parent | 7665a6f1370cf989e92a916d91995295cfec2b69 (diff) | |
| download | mariadb-git-97bd164a6adc07e132d2429d6421c9a694e39981.tar.gz | |
Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
| -rw-r--r-- | sql/stacktrace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/stacktrace.c b/sql/stacktrace.c index ba5bc9d2e85..ab1113f74cf 100644 --- 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) |