diff options
| author | unknown <marko@hundin.mysql.fi> | 2005-06-16 15:00:25 +0300 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2005-06-16 15:00:25 +0300 |
| commit | 76a11195b8f6af78ca7c90d5fea0ed751cdb3751 (patch) | |
| tree | 2c2e2969ba88a4478ffb323400ad650e02f1a6be /innobase/include/ut0dbg.h | |
| parent | 5fed4f3a5026b6fa1b6da28d463b9f43839041a0 (diff) | |
| download | mariadb-git-76a11195b8f6af78ca7c90d5fea0ed751cdb3751.tar.gz | |
InnoDB: Fix ut0dbg compilation errors on NetWare
innobase/dict/dict0boot.c:
Remove dummy code to work around bug in the pgcc compiler.
innobase/include/ut0dbg.h:
UT_DBG_PANIC: Avoid exit(), as lexyy.c re-#defines exit().
Move the code to the function ut_dbg_panic() instead.
innobase/ut/ut0dbg.c:
[__NETWARE__] Add function ut_dbg_panic()
Diffstat (limited to 'innobase/include/ut0dbg.h')
| -rw-r--r-- | innobase/include/ut0dbg.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/innobase/include/ut0dbg.h b/innobase/include/ut0dbg.h index 7e614343f5b..bc3f852626a 100644 --- a/innobase/include/ut0dbg.h +++ b/innobase/include/ut0dbg.h @@ -36,12 +36,8 @@ ut_dbg_assertion_failed( On NetWare, have a graceful exit rather than a segfault to avoid abends. */ extern ibool panic_shutdown; /* Abort the execution. */ -# define UT_DBG_PANIC \ - if (!panic_shutdown){ \ - panic_shutdown = TRUE; \ - innobase_shutdown_for_mysql(); \ - } \ - exit(1) +void ut_dbg_panic(void); +# define UT_DBG_PANIC ut_dbg_panic() /* Stop threads in ut_a(). */ # define UT_DBG_STOP while (0) /* We do not do this on NetWare */ #else /* __NETWARE__ */ |