diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-29 17:23:21 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-29 17:23:21 +0300 |
| commit | 2b61ff8f2221745f0a96855a0feb0825c426f993 (patch) | |
| tree | 380937271691f782d506ecd0fc349e53b8baccc0 /sql/slave.cc | |
| parent | 7bd225e12905c0adc9677a8e53a324c773fd3536 (diff) | |
| parent | 5e01255732f554bbf473347566439fd18c006756 (diff) | |
| download | mariadb-git-2b61ff8f2221745f0a96855a0feb0825c426f993.tar.gz | |
Merge 11.0 into 11.1
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 86180af8aed..d24e5ab50e4 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -5135,8 +5135,7 @@ err_during_init: DBUG_LEAVE; // Must match DBUG_ENTER() my_thread_end(); ERR_remove_state(0); - pthread_exit(0); - return 0; // Avoid compiler warnings + return nullptr; } /* @@ -5844,8 +5843,7 @@ err_during_init: DBUG_LEAVE; // Must match DBUG_ENTER() my_thread_end(); ERR_remove_state(0); - pthread_exit(0); - return 0; // Avoid compiler warnings + return nullptr; } |