diff options
| author | sasha@mysql.sashanet.com <> | 2002-01-19 22:46:25 -0700 |
|---|---|---|
| committer | sasha@mysql.sashanet.com <> | 2002-01-19 22:46:25 -0700 |
| commit | 684f13ef4c20cc1843c615ee17a8013f65617442 (patch) | |
| tree | 254bb1b067e503a819145fff488d83709bf9c798 /sql/stacktrace.c | |
| parent | d7ad2cbe5b55d422affe8d180d0cc8dab1c518e1 (diff) | |
| parent | 56129ce634088b51dd60381711519c9125e8df72 (diff) | |
| download | mariadb-git-684f13ef4c20cc1843c615ee17a8013f65617442.tar.gz | |
Ugly merge! But I am not done yet - there are a number of things I need to fix
before I can push
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 17e65462144..d86d65f567e 100644 --- a/sql/stacktrace.c +++ b/sql/stacktrace.c @@ -123,7 +123,7 @@ terribly wrong...\n"); } #endif /* __alpha__ */ - if (!stack_bottom) + if (!stack_bottom || (gptr) stack_bottom > (gptr) &fp) { ulong tmp= min(0x10000,thread_stack); /* Assume that the stack starts at the previous even 65K */ |