diff options
| author | Sujatha Sivakumar <sujatha.sivakumar@oracle.com> | 2016-05-13 16:42:45 +0530 |
|---|---|---|
| committer | Prashant Tekriwal <prashant.tekriwal@oracle.com> | 2016-05-16 11:34:20 +0200 |
| commit | ef3f09f0c9e62ea1bf86b33b5d97e954b3ae34fe (patch) | |
| tree | e5e133ed139581968188e0800606ed0c9867f311 /mysys/errors.c | |
| parent | 9d72fb4af0d87f6a69a3ccb9202b4029acf2bd56 (diff) | |
| download | mariadb-git-ef3f09f0c9e62ea1bf86b33b5d97e954b3ae34fe.tar.gz | |
Bug#23251517: SEMISYNC REPLICATION HANGINGmysql-5.5.50
Revert following bug fix:
Bug#20685029: SLAVE IO THREAD SHOULD STOP WHEN DISK IS
FULL
Bug#21753696: MAKE SHOW SLAVE STATUS NON BLOCKING IF IO
THREAD WAITS FOR DISK SPACE
This fix results in a deadlock between slave IO thread
and SQL thread.
(cherry picked from commit e3fea6c6dbb36c6ab21c4ab777224560e9608b53)
Diffstat (limited to 'mysys/errors.c')
| -rw-r--r-- | mysys/errors.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/mysys/errors.c b/mysys/errors.c index b6064460535..a6e2e300a1f 100644 --- a/mysys/errors.c +++ b/mysys/errors.c @@ -15,7 +15,7 @@ #include "mysys_priv.h" #include "mysys_err.h" -#include "m_string.h" + #ifndef SHARED_LIBRARY const char *globerrs[GLOBERRS]= @@ -109,7 +109,6 @@ void init_glob_errs() */ void wait_for_free_space(const char *filename, int errors) { - size_t time_to_sleep= MY_WAIT_FOR_USER_TO_FIX_PANIC; if (!(errors % MY_WAIT_GIVE_USER_A_MESSAGE)) { my_printf_warning(EE(EE_DISK_FULL), @@ -120,15 +119,10 @@ void wait_for_free_space(const char *filename, int errors) } DBUG_EXECUTE_IF("simulate_no_free_space_error", { - time_to_sleep= 1; - }); - DBUG_EXECUTE_IF("simulate_io_thd_wait_for_disk_space", - { - time_to_sleep= 1; + (void) sleep(1); + return; }); - - (void) sleep(time_to_sleep); - DEBUG_SYNC_C("disk_full_reached"); + (void) sleep(MY_WAIT_FOR_USER_TO_FIX_PANIC); } const char **get_global_errmsgs() |