diff options
| author | Sergey Petrunia <sergefp@mysql.com> | 2009-03-10 00:53:38 +0300 |
|---|---|---|
| committer | Sergey Petrunia <sergefp@mysql.com> | 2009-03-10 00:53:38 +0300 |
| commit | 632a33f8fcc05ad5abcd2012eeaab6099f44c385 (patch) | |
| tree | c6e78b5fd6719762236a52a031d80cdf02eae80b /sql/mysql_priv.h | |
| parent | cb6581d89459a4c45e9146a40e1f0119a2e8e325 (diff) | |
| parent | 1c4fc84c9e46122eb940605aa35dcf0a69d69724 (diff) | |
| download | mariadb-git-632a33f8fcc05ad5abcd2012eeaab6099f44c385.tar.gz | |
Merge
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 21741bc2eaf..3b8e65d532f 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -2417,7 +2417,8 @@ extern "C" void unireg_abort(int exit_code) __attribute__((noreturn)); void kill_delayed_threads(void); bool check_stack_overrun(THD *thd, long margin, uchar *dummy); #else -#define unireg_abort(exit_code) DBUG_RETURN(exit_code) +extern "C" void unireg_clear(int exit_code); +#define unireg_abort(exit_code) do { unireg_clear(exit_code); DBUG_RETURN(exit_code); } while(0) inline void kill_delayed_threads(void) {} #define check_stack_overrun(A, B, C) 0 #endif |