summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2021-02-27 19:42:43 +0200
committerMonty <monty@mariadb.org>2021-03-01 22:09:05 +0200
commit43a0a8139727314f89fc0f0f0d2ba80ffa33b221 (patch)
tree6f11b7e3e2ef3f6d3cc4ac787fe968b00f69f506
parenta18b39e3f49f4916792b72abd7f0fc153a7454fa (diff)
downloadmariadb-git-43a0a8139727314f89fc0f0f0d2ba80ffa33b221.tar.gz
Fixed printing of wring filname "maria_open" in maria.maria-recovery2.test
eprintf() was missing a va_start(), which caused wrong filename to be printed when printing recovery trace. Added also missing new line when printing "Table is crashed" to trace file
-rw-r--r--storage/maria/ma_recovery.c1
-rw-r--r--storage/maria/ma_recovery_util.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/storage/maria/ma_recovery.c b/storage/maria/ma_recovery.c
index 5c3dae2708d..6cc5b423720 100644
--- a/storage/maria/ma_recovery.c
+++ b/storage/maria/ma_recovery.c
@@ -1447,6 +1447,7 @@ static int new_table(uint16 sid, const char *name, LSN lsn_of_file_id)
}
if (maria_is_crashed(info))
{
+ tprint(tracef, "\n");
eprint(tracef, "Table '%s' is crashed, skipping it. Please repair it with"
" aria_chk -r", share->open_file_name.str);
recovery_found_crashed_tables++;
diff --git a/storage/maria/ma_recovery_util.c b/storage/maria/ma_recovery_util.c
index 3bbda614991..fe43d812600 100644
--- a/storage/maria/ma_recovery_util.c
+++ b/storage/maria/ma_recovery_util.c
@@ -98,6 +98,7 @@ void eprint(FILE *trace_file __attribute__ ((unused)),
fputc('\n', trace_file);
if (trace_file != stderr)
{
+ va_start(args, format);
my_printv_error(HA_ERR_INITIALIZATION, format, MYF(0), args);
}
va_end(args);