diff options
| author | unknown <kaa@polly.local> | 2006-10-20 14:32:31 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2006-10-20 14:32:31 +0400 |
| commit | 2987771441639b57ca4119d1000e3e6535029f0e (patch) | |
| tree | f39da3f61479cda3fc3375ec5f05ae41c0693e88 /sql/stacktrace.c | |
| parent | 665d169243f6641d0f1a3c33d6dde6c64973ae44 (diff) | |
| parent | dd18eb1bfc8dc9839dda8b2e0ff3df0555a079b2 (diff) | |
| download | mariadb-git-2987771441639b57ca4119d1000e3e6535029f0e.tar.gz | |
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
Diffstat (limited to 'sql/stacktrace.c')
| -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; } |