diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-02-23 13:50:45 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-02-23 13:50:45 +0100 |
| commit | b87ed568b4485ed376710aadd10733c707822889 (patch) | |
| tree | 480a5ef5ac1e95c159970c90a878aefbd766e833 /sql/mysql_priv.h | |
| parent | 1224b64deb24bdd43e00380985afe241726b6d84 (diff) | |
| parent | e451c5023d3b264be1694f1fe85a71756eed4bb5 (diff) | |
| download | mariadb-git-b87ed568b4485ed376710aadd10733c707822889.tar.gz | |
merge, CMake bugfixes, remove sp-error from experimental
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 818475e85d8..a006d2a07ff 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -2534,14 +2534,14 @@ inline bool is_user_table(TABLE * table) #ifndef EMBEDDED_LIBRARY 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 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 +bool check_stack_overrun(THD *thd, long margin, uchar *dummy); + /* This must match the path length limit in the ER_NOT_RW_DIR error msg. */ #define ER_NOT_RW_DIR_PATHSIZE 200 bool is_usable_directory(THD *thd, const char *varname, |