diff options
| author | monty@hundin.mysql.fi <> | 2002-08-21 22:04:22 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-08-21 22:04:22 +0300 |
| commit | 03b0179af9f3492c4682dbc85542529215010a7c (patch) | |
| tree | 75f29bea26c7fd21a45f22fd906c7a1545aaee91 /sql/mysqld.cc | |
| parent | a5edb200421018ee967045903b2802c2d5c1bd75 (diff) | |
| download | mariadb-git-03b0179af9f3492c4682dbc85542529215010a7c.tar.gz | |
Use our version of RWLOCKS on UNIXWARE 7
More DBUG info for replication
Better error messages from replication
Fixed bug in replication code when connecting to 'localhost' (time was not released properly)
Block ALARM signal on Linux for signal handler thread (Fixes problem with running mysqld with --debug)
Removed warning when setting an AUTO_INCREMENT field to NULL
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index d086dda3e9f..986263bbb6b 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -787,9 +787,12 @@ static pthread_handler_decl(kill_server_thread,arg __attribute__((unused))) static sig_handler print_signal_warning(int sig) { - if (global_system_variables.log_warnings) - sql_print_error("Warning: Got signal %d from thread %d", - sig,my_thread_id()); + if (!DBUG_IN_USE) + { + if (global_system_variables.log_warnings) + sql_print_error("Warning: Got signal %d from thread %d", + sig,my_thread_id()); + } #ifdef DONT_REMEMBER_SIGNAL sigset(sig,print_signal_warning); /* int. thread system calls */ #endif @@ -1555,6 +1558,7 @@ static void *signal_hand(void *arg __attribute__((unused))) (void) pthread_cond_signal(&COND_thread_count); (void) pthread_mutex_unlock(&LOCK_thread_count); + (void) pthread_sigmask(SIG_BLOCK,&set,NULL); for (;;) { int error; // Used when debugging @@ -1608,7 +1612,7 @@ static void *signal_hand(void *arg __attribute__((unused))) #endif default: #ifdef EXTRA_DEBUG - sql_print_error("Warning: Got signal: %d, error: %d",sig,error); /* purecov: tested */ + sql_print_error("Warning: Got signal: %d error: %d",sig,error); /* purecov: tested */ #endif break; /* purecov: tested */ } |