diff options
| -rw-r--r-- | mysys/my_getopt.c | 2 | ||||
| -rw-r--r-- | storage/myisam/sort.c | 1 | ||||
| -rw-r--r-- | tests/mysql_client_test.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c index 56b6d55a92a..02a8b20a72f 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -486,7 +486,7 @@ int handle_options(int *argc, char ***argv, "unsupported by option '--%s'", my_progname, optp->name); if (!option_is_loose) - return EXIT_ARGUMENT_INVALID; + DBUG_RETURN(EXIT_ARGUMENT_INVALID); continue; } else diff --git a/storage/myisam/sort.c b/storage/myisam/sort.c index c24d0e24a11..604910e5099 100644 --- a/storage/myisam/sort.c +++ b/storage/myisam/sort.c @@ -529,6 +529,7 @@ ok: mysql_cond_signal(&sort_param->sort_info->cond); mysql_mutex_unlock(&sort_param->sort_info->mutex); DBUG_PRINT("exit", ("======== ending thread ========")); + DBUG_LEAVE; } my_thread_end(); return NULL; diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 98f42ff8c26..a1a52e832dd 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -17175,7 +17175,7 @@ static void test_bug28386() if (! opt_silent) printf("Skipping the test since logging to tables is not enabled\n"); /* Log output is not to tables */ - return; + DBUG_VOID_RETURN; } mysql_free_result(result); |