diff options
| author | unknown <serg@serg.mylan> | 2004-08-18 09:25:27 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-08-18 09:25:27 +0200 |
| commit | 8ddcba9d8a85fd8726c42a555e91a8dd52ba9cd3 (patch) | |
| tree | 4d0832111e4d208b7e698bef5fbc00a9a860158c /innobase/ut/ut0mem.c | |
| parent | fdc8712cb0231a622a53e38ba0d048aa9da4253a (diff) | |
| parent | 0c062ae60f9dbb21ce3702389f89e4441451d02b (diff) | |
| download | mariadb-git-8ddcba9d8a85fd8726c42a555e91a8dd52ba9cd3.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
Diffstat (limited to 'innobase/ut/ut0mem.c')
| -rw-r--r-- | innobase/ut/ut0mem.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/innobase/ut/ut0mem.c b/innobase/ut/ut0mem.c index 2cab36a9580..9b08b1e79aa 100644 --- a/innobase/ut/ut0mem.c +++ b/innobase/ut/ut0mem.c @@ -106,7 +106,13 @@ ut_malloc_low( /* Make an intentional seg fault so that we get a stack trace */ + /* Intentional segfault on NetWare causes an abend. Avoid this + by graceful exit handling in ut_a(). */ +#if (!defined __NETWARE__) if (*ut_mem_null_ptr) ut_mem_null_ptr = 0; +#else + ut_a(0); +#endif } if (set_to_zero) { |