Commit 45fc78fe authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

Merge work:/home/bk/mysql 

into mysql.sashanet.com:/home/sasha/src/bk/mysql
parents eac8cbf6 a37c82a5

sql/stacktrace.c

+2 −2
Original line number Diff line number Diff line
@@ -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)