Commit c23dbe67 authored by unknown's avatar unknown

Merge work.mysql.com:/home/bk/mysql

into threads.polyesthetic.msg:/usr/local/src/my/3

parents b597e35e 97bd164a
......@@ -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 {
......
......@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment