Commit 29877714 authored by unknown's avatar unknown
Browse files

Merge polly.local:/tmp/maint/bug23256/mysql-4.1-maint 

into  polly.local:/tmp/maint/bug23256/mysql-5.0-maint


sql/stacktrace.c:
  Auto merged
parents 665d1692 dd18eb1b

sql/stacktrace.c

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ terribly wrong...\n"); 


#if defined(__alpha__) && defined(__GNUC__)

    uchar** new_fp = find_prev_fp(pc, fp);

    if (frame_count == SIGRETURN_FRAME_COUNT - 1)

    if (frame_count == sigreturn_frame_count - 1)

    {

      new_fp += 90;

    }