MDEV-12276 Missing DBUG_RETURN or DBUG_VOID_RETURN macro in function "do_exec"

Author: vuvova

client/mysqltest.cc

@@ -1038,7 +1038,7 @@ void do_eval(DYNAMIC_STRING *query_eval, const char *query,
 if (!(v= var_get(p, &p, 0, 0)))
  {
  report_or_die( "Bad variable in eval");
- return;
+ DBUG_VOID_RETURN;
  }
 dynstr_append_mem(query_eval, v->str_val, v->str_val_len);
  }
@@ -1753,7 +1753,7 @@ static int run_command(char* cmd,
  if (!(res_file= popen(cmd, "r")))
  {
  report_or_die("popen(\"%s\", \"r\") failed", cmd);
- return -1;
+ DBUG_RETURN(-1);
  }
 
  while (fgets(buf, sizeof(buf), res_file))
@@ -2661,7 +2661,7 @@ void var_query_set(VAR *var, const char *query, const char** query_end)
  report_or_die("Query '%s' didn't return a result set", ds_query.str);
  dynstr_free(&ds_query);
  eval_expr(var, "", 0);
- return;
+ DBUG_VOID_RETURN;
  }
  dynstr_free(&ds_query);
 
@@ -2852,7 +2852,7 @@ void var_set_query_get_value(struct st_command *command, VAR *var)
  dynstr_free(&ds_query);
  dynstr_free(&ds_col);
  eval_expr(var, "", 0);
- return;
+ DBUG_VOID_RETURN;
  }
 
  {
@@ -2877,7 +2877,7 @@ void var_set_query_get_value(struct st_command *command, VAR *var)
  ds_col.str, ds_query.str);
  dynstr_free(&ds_query);
  dynstr_free(&ds_col);
- return;
+ DBUG_VOID_RETURN;
  }
  DBUG_PRINT("info", ("Found column %d with name '%s'",
  i, fields[i].name));
@@ -3323,7 +3323,7 @@ void do_exec(struct st_command *command)
  if (!*cmd)
  {
  report_or_die("Missing argument in exec");
- return;
+ DBUG_VOID_RETURN;
  }
  command->last_argument= command->end;
 
@@ -3357,7 +3357,7 @@ void do_exec(struct st_command *command)
  dynstr_free(&ds_cmd);
  if (command->abort_on_error)
  report_or_die("popen(\"%s\", \"r\") failed", command->first_argument);
- return;
+ DBUG_VOID_RETURN;
  }
 
  ds_result= &ds_res;
@@ -3415,7 +3415,7 @@ void do_exec(struct st_command *command)
  ds_cmd.str, error, status, errno,
  ds_res.str);
  dynstr_free(&ds_cmd);
- return;
+ DBUG_VOID_RETURN;
  }
 
  DBUG_PRINT("info",
@@ -3547,7 +3547,7 @@ void do_system(struct st_command *command)
  if (strlen(command->first_argument) == 0)
  {
  report_or_die("Missing arguments to system, nothing to do!");
- return;
+ DBUG_VOID_RETURN;
  }
 
  init_dynamic_string(&ds_cmd, 0, command->query_len + 64, 256);
@@ -4540,7 +4540,7 @@ void do_perl(struct st_command *command)
  if (command->abort_on_error)
  die("popen(\"%s\", \"r\") failed", buf);
  dynstr_free(&ds_delimiter);
- return;
+ DBUG_VOID_RETURN;
  }
 
  while (fgets(buf, sizeof(buf), res_file))