1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

Ugly merge! But I am not done yet - there are a number of things I need to fix

before I can push
This commit is contained in:
sasha@mysql.sashanet.com
2002-01-19 22:46:25 -07:00
39 changed files with 2998 additions and 1568 deletions

View File

@ -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 */