diff options
| author | unknown <kaa@polly.local> | 2006-10-20 14:34:13 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2006-10-20 14:34:13 +0400 |
| commit | 4ab871720c67af692d75ff2b93a26eb2bb92365d (patch) | |
| tree | 1c704a074cb503df20e87f503ead888097ffc311 /sql | |
| parent | 6c4f74eddd161aead927dcd8769a587c6f507c56 (diff) | |
| parent | 2987771441639b57ca4119d1000e3e6535029f0e (diff) | |
| download | mariadb-git-4ab871720c67af692d75ff2b93a26eb2bb92365d.tar.gz | |
Merge polly.local:/tmp/maint/bug23256/mysql-5.0-maint
into polly.local:/tmp/maint/bug23256/mysql-5.1-maint
sql/stacktrace.c:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/stacktrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/stacktrace.c b/sql/stacktrace.c index a2fe2ab88f1..77e7707592d 100644 --- a/sql/stacktrace.c +++ b/sql/stacktrace.c @@ -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; } |