mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
into threads.polyesthetic.msg:/usr/local/src/my/3
This commit is contained in:
unknown 2001-05-14 20:42:20 -04:00
commit c23dbe674d
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
innobase/row/row0undo.c
View file

@ -171,7 +171,6 @@ row_undo_search_clust_to_pcur(
/* printf("--------------------undoing a previous version\n"); /* printf("--------------------undoing a previous version\n");
*/ */
trx_undo_rec_release(node->trx, node->undo_no);
ret = FALSE; ret = FALSE;
} else { } else {

4
sql/stacktrace.c
View file

@ -43,7 +43,7 @@ void safe_print_str(const char* name, const char* val, int max_len)
} }
#ifdef HAVE_LINUXTHREADS #ifdef HAVE_LINUXTHREADS
#define SIGRETURN_FRAME_COUNT 1 #define SIGRETURN_FRAME_COUNT 2
#if defined(__alpha__) && defined(__GNUC__) #if defined(__alpha__) && defined(__GNUC__)
/* /*
@ -111,7 +111,7 @@ terribly wrong...\n");
} }
#endif #endif
#if defined(__alpha__) && defined(__GNUC__) #if defined(__alpha__) && defined(__GNUC__)
__asm __volatile__ ("mov $15,%0" __asm __volatile__ ("mov $30,%0"
:"=r"(fp) :"=r"(fp)
:"r"(fp)); :"r"(fp));
if (!fp) if (!fp)