diff options
| author | unknown <tim@threads.polyesthetic.msg> | 2001-05-14 20:42:20 -0400 |
|---|---|---|
| committer | unknown <tim@threads.polyesthetic.msg> | 2001-05-14 20:42:20 -0400 |
| commit | c23dbe674d9cba45aa3ce0b87e50f83f3d2e9d52 (patch) | |
| tree | 893ca18a1d834d6af287a20ffa537724680a18c3 | |
| parent | b597e35e5e17a6356c01aaf40bce5c8e39594c13 (diff) | |
| parent | 97bd164a6adc07e132d2429d6421c9a694e39981 (diff) | |
| download | mariadb-git-c23dbe674d9cba45aa3ce0b87e50f83f3d2e9d52.tar.gz | |
Merge work.mysql.com:/home/bk/mysql
into threads.polyesthetic.msg:/usr/local/src/my/3
| -rw-r--r-- | innobase/row/row0undo.c | 1 | ||||
| -rw-r--r-- | sql/stacktrace.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/innobase/row/row0undo.c b/innobase/row/row0undo.c index 6dc032f7e13..10ac3af6de9 100644 --- a/innobase/row/row0undo.c +++ b/innobase/row/row0undo.c @@ -171,7 +171,6 @@ row_undo_search_clust_to_pcur( /* printf("--------------------undoing a previous version\n"); */ - trx_undo_rec_release(node->trx, node->undo_no); ret = FALSE; } else { 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) |