diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2012-03-06 13:47:57 +0100 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2012-03-06 13:47:57 +0100 |
| commit | 84c6c75979e990601c1cc88481fe339e12709d54 (patch) | |
| tree | 6183377281b4be8088dffc147181b93469c25289 /sql/signal_handler.cc | |
| parent | 4c74d96f51fe67d4ad29e4e430a905559859e35e (diff) | |
| parent | c657f00458a3c3fb8a35e974c453ed62b903ec9b (diff) | |
| download | mariadb-git-84c6c75979e990601c1cc88481fe339e12709d54.tar.gz | |
Merge 5.1 => 5.5
storage/innobase/include/sync0rw.ic:
Prerequisite for compiling with gcc4 on solaris: ignore result from
os_compare_and_swap_ulint
storage/myisam/mi_dynrec.c:
Prerequisite for compiling with gcc4 on solaris: cast to void*
Diffstat (limited to 'sql/signal_handler.cc')
| -rw-r--r-- | sql/signal_handler.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/signal_handler.cc b/sql/signal_handler.cc index 27fcf741e2a..2cffd4c43e6 100644 --- a/sql/signal_handler.cc +++ b/sql/signal_handler.cc @@ -131,6 +131,7 @@ extern "C" sig_handler handle_fatal_signal(int sig) "Hope that's ok; if not, decrease some variables in the equation.\n\n"); #if defined(HAVE_LINUXTHREADS) +#define UNSAFE_DEFAULT_LINUX_THREADS 200 if (sizeof(char*) == 4 && thread_count > UNSAFE_DEFAULT_LINUX_THREADS) { my_safe_printf_stderr( |