diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-29 15:29:02 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-29 15:29:02 +0300 |
| commit | 191821f7df312a8d0f723cc937ef6a6e2388b0d6 (patch) | |
| tree | 1d7713309f9f9673c98c7d4b139b8d8a2c300c4c /sql/slave.cc | |
| parent | 78d0d74eb72ac4e8f763511d9d20dda020dd8673 (diff) | |
| parent | 55e78ebf4136ed7bf78b45963f53e503201a59bb (diff) | |
| download | mariadb-git-191821f7df312a8d0f723cc937ef6a6e2388b0d6.tar.gz | |
Merge 10.9 into 10.10
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 327948bf0a5..d5f31e50c79 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -5155,8 +5155,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; } /* @@ -5864,8 +5863,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; } |