diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-28 15:25:52 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-28 15:25:52 +0300 |
| commit | 0760ad3336521b85454b522390eb972a606def23 (patch) | |
| tree | de6d7b7bc9923884b8095e4e5aa7ba17c68da27d /sql/slave.cc | |
| parent | 216d99bb395c4fda43b4e3583672ef925103fae5 (diff) | |
| parent | 402f36dd652b57a48d2d3e18949f5d7a1450363d (diff) | |
| download | mariadb-git-0760ad3336521b85454b522390eb972a606def23.tar.gz | |
Merge 10.5 into 10.6
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 0312b487e17..64a35ff0119 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -5091,8 +5091,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; } /* @@ -5798,8 +5797,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; } |