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/ut | |
| 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/ut')
| -rw-r--r-- | innobase/ut/ut0dbg.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/innobase/ut/ut0dbg.c b/innobase/ut/ut0dbg.c index c4d738ffb83..e810d8dead7 100644 --- a/innobase/ut/ut0dbg.c +++ b/innobase/ut/ut0dbg.c @@ -59,7 +59,21 @@ ut_dbg_assertion_failed( ut_dbg_stop_threads = TRUE; } -#ifndef __NETWARE__ +#ifdef __NETWARE__ +/***************************************************************** +Shut down MySQL/InnoDB after assertion failure. */ + +void +ut_dbg_panic(void) +/*==============*/ +{ + if (!panic_shutdown) { + panic_shutdown = TRUE; + innobase_shutdown_for_mysql(); + } + exit(1); +} +#else /* __NETWARE__ */ /***************************************************************** Stop a thread after assertion failure. */ |