summaryrefslogtreecommitdiff
path: root/storage/maria/ma_recovery_util.c
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2010-07-30 10:45:27 +0300
committerMichael Widenius <monty@askmonty.org>2010-07-30 10:45:27 +0300
commitd2f8b7d04503478ab6b6998194a2070891f0c2bb (patch)
tree14754871eed2adea6fdfcc5c3971dabc3ac53093 /storage/maria/ma_recovery_util.c
parentcf86a5ae5284c744bc4cc727073387d0799da5c2 (diff)
downloadmariadb-git-d2f8b7d04503478ab6b6998194a2070891f0c2bb.tar.gz
Fix for LP#602604: RQG: ma_blockrec.c:6187: _ma_apply_redo_insert_row_head_or_tail: Assertion `0' failed on Maria engine recovery
More DBUG_PRINT (to simplify future debugging) Aria: Added STATE_IN_REPAIR, which is set on start of repair. This allows us to see if 'crashed' flag was set intentionally. Aria: Some trivial speedup optimization Aria: Better warning if table was marked crashed by unfinnished repair mysql-test/lib/v1/mysql-test-run.pl: Fix so one can run RQG mysql-test/suite/maria/r/maria-recovery2.result: Update for new error message. mysys/stacktrace.c: Fixed compiler warning storage/maria/ha_maria.cc: More DBUG_PRINT Added STATE_IN_REPAIR flag, which is set on start of repair. This allows us to see if 'crashed' flag was set intentionally. Don't log query for dropping temporary table. storage/maria/ha_maria.h: Added prototype for drop_table() storage/maria/ma_blockrec.c: More DBUG_PRINT Make read_long_data() inline for most cases. (Trivial speedup optimization) storage/maria/ma_check.c: Better warning if table was marked crashed by unfinnished repair storage/maria/ma_open.c: More DBUG_PRINT storage/maria/ma_recovery.c: Give warning if found crashed table. Changed warning for tables that can't be opened. storage/maria/ma_recovery_util.c: Write warnings to DBUG file storage/maria/maria_chk.c: Added STATE_IN_REPAIR flag, which is set on start of repair. This allows us to see if 'crashed' flag was set intentionally. storage/maria/maria_def.h: Added maria_mark_in_repair(x) storage/maria/maria_read_log.c: Added option: --character-sets-dir storage/maria/trnman.c: By default set min_read_from to max value. This allows us to remove TRN:s from rows during recovery to get more space. This fixes bug LP#602604: RQG: ma_blockrec.c:6187: _ma_apply_redo_insert_row_head_or_tail: Assertion `0' failed on Maria engine recovery
Diffstat (limited to 'storage/maria/ma_recovery_util.c')
-rw-r--r--storage/maria/ma_recovery_util.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/storage/maria/ma_recovery_util.c b/storage/maria/ma_recovery_util.c
index a45a990472e..19e61daf4ef 100644
--- a/storage/maria/ma_recovery_util.c
+++ b/storage/maria/ma_recovery_util.c
@@ -57,8 +57,16 @@ void tprint(FILE *trace_file __attribute__ ((unused)),
const char *format __attribute__ ((unused)), ...)
{
va_list args;
+#ifndef DBUG_OFF
+ {
+ char buff[1024];
+ va_start(args, format);
+ vsnprintf(buff, sizeof(buff)-1, format, args);
+ DBUG_PRINT("info", ("%s", buff));
+ va_end(args);
+ }
+#endif
va_start(args, format);
- DBUG_PRINT("info", ("%s", format));
if (trace_file != NULL)
{
if (procent_printed)