WL#3072 Maria recovery.

* Thanks to Serg's tip, we fix here the compilation issue of
REDO_REPAIR_TABLE's execution, by defining versions of
_ma_killed_ptr() and _ma_check_print_info|warning|error()
in maria_read_log.c (we move those of maria_chk.c into an include
file and include it in maria_chk.c and maria_read_log.c).
Execution of such record looks like working from my tests (it only
happens in maria_read_log; recovery-from-mysqld skips DDLs and
REPAIR is considered DDL here as it bypasses logging): tested
ALTER TABLE ENABLE KEYS and then remove table, apply log: that
did a repair.
* Recent changes broke maria_read_log a bit: -a became default
and -o caused error; fixing this.


storage/maria/Makefile.am:
  addind new file
storage/maria/ma_recovery.c:
  enable execution of REDO_REPAIR_TABLE by maria_read_log now that
  it compiles. Now reason to keep only T_QUICK from testflag.
storage/maria/maria_chk.c:
  moving these functions to ma_check_standalone.h for reusability
storage/maria/maria_def.h:
  comment
storage/maria/maria_read_log.c:
  ma_check_standalone.h needs my_progname_short.
  Fixing bug where "maria_read_log" would default to -a and
  "maria_read_log -o" would throw an error. Implemented behaviour is:
  - no options: usage()
  - -a : applys, applys UNDOs by default unless --disable-undo
  - -o : only prints
storage/maria/ma_check_standalone.h:
  All standalone programs which need to use functions from ma_check.c
  (like maria_repair()) must define their version of _ma_killed_ptr()
  and _ma_check_print_info|warning|error(). Indeed, linking with ma_check.o
  brings in the dependencies of ma_check.o which are definitions of the above
  functions; if the program does not define them then the ones of
  ha_maria.o are used i.e. ha_maria.o is linked into the program, and this
  brings dependencies of ha_maria.o on mysqld.o into the program's linking
  which thus fails, as the program is not linked with mysqld.o.
  We put in this file the functions which maria_chk.c uses, so that
  they can be reused by maria_read_log (when it replays REDO_REPAIR_TABLE)
  as they are good enough (they just print to stdout/stderr like
  maria_read_log already does).

storage/maria/Makefile.am

@@ -62,7 +62,7 @@ noinst_HEADERS =	maria_def.h ma_rt_index.h ma_rt_key.h ma_rt_mbr.h \
 			ma_control_file.h ha_maria.h ma_blockrec.h \
 			ma_loghandler.h ma_loghandler_lsn.h ma_pagecache.h \
 			ma_checkpoint.h ma_recovery.h ma_commit.h \
-			trnman_public.h
+			trnman_public.h ma_check_standalone.h
 ma_test1_DEPENDENCIES=	$(LIBRARIES)
 ma_test1_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libmaria.a \
                         $(top_builddir)/storage/myisam/libmyisam.a \

storage/maria/ma_check_standalone.h

+/* Copyright (C) 2007 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+/*
+  All standalone programs which need to use functions from ma_check.c
+  (like maria_repair()) must define their version of _ma_killed_ptr()
+  and _ma_check_print_info|warning|error(). Indeed, linking with ma_check.o
+  brings in the dependencies of ma_check.o which are definitions of the above
+  functions; if the program does not define them then the ones of
+  ha_maria.o are used i.e. ha_maria.o is linked into the program, and this
+  brings dependencies of ha_maria.o on mysqld.o into the program's linking
+  which thus fails, as the program is not linked with mysqld.o.
+  This file contains the versions of these functions used by maria_chk and
+  maria_read_log.
+*/
+
+/*
+  Check if check/repair operation was killed by a signal
+*/
+
+static int not_killed= 0;
+
+volatile int *_ma_killed_ptr(HA_CHECK *param __attribute__((unused)))
+{
+  return &not_killed;			/* always NULL */
+}
+
+	/* print warnings and errors */
+	/* VARARGS */
+
+void _ma_check_print_info(HA_CHECK *param __attribute__((unused)),
+			 const char *fmt,...)
+{
+  va_list args;
+  DBUG_ENTER("_ma_check_print_info");
+  DBUG_PRINT("enter", ("format: %s", fmt));
+
+  va_start(args,fmt);
+  VOID(vfprintf(stdout, fmt, args));
+  VOID(fputc('\n',stdout));
+  va_end(args);
+  DBUG_VOID_RETURN;
+}
+
+/* VARARGS */
+
+void _ma_check_print_warning(HA_CHECK *param, const char *fmt,...)
+{
+  va_list args;
+  DBUG_ENTER("_ma_check_print_warning");
+  DBUG_PRINT("enter", ("format: %s", fmt));
+
+  fflush(stdout);
+  if (!param->warning_printed && !param->error_printed)
+  {
+    if (param->testflag & T_SILENT)
+      fprintf(stderr,"%s: MARIA file %s\n",my_progname_short,
+	      param->isam_file_name);
+    param->out_flag|= O_DATA_LOST;
+  }
+  param->warning_printed=1;
+  va_start(args,fmt);
+  fprintf(stderr,"%s: warning: ",my_progname_short);
+  VOID(vfprintf(stderr, fmt, args));
+  VOID(fputc('\n',stderr));
+  fflush(stderr);
+  va_end(args);
+  DBUG_VOID_RETURN;
+}
+
+/* VARARGS */
+
+void _ma_check_print_error(HA_CHECK *param, const char *fmt,...)
+{
+  va_list args;
+  DBUG_ENTER("_ma_check_print_error");
+  DBUG_PRINT("enter", ("format: %s", fmt));
+
+  fflush(stdout);
+  if (!param->warning_printed && !param->error_printed)
+  {
+    if (param->testflag & T_SILENT)
+      fprintf(stderr,"%s: MARIA file %s\n",my_progname_short,param->isam_file_name);
+    param->out_flag|= O_DATA_LOST;
+  }
+  param->error_printed|=1;
+  va_start(args,fmt);
+  fprintf(stderr,"%s: error: ",my_progname_short);
+  VOID(vfprintf(stderr, fmt, args));
+  VOID(fputc('\n',stderr));
+  fflush(stderr);
+  va_end(args);
+  DBUG_VOID_RETURN;
+}

storage/maria/ma_recovery.c

@@ -783,27 +783,17 @@ prototype_redo_exec_hook(REDO_REPAIR_TABLE)
     than the mapping, so we can repair.
   */
   tprint(tracef, "   repairing...\n");
-  /**
-     @todo RECOVERY BUG fix this:
-     the maria_chk_init() call causes a heap of linker errors in ha_maria.cc!
-  */
-#if 0
   HA_CHECK param;
   maria_chk_init(&param);
   param.isam_file_name= info->s->open_file_name;
   param.testflag= uint4korr(rec->header);
-  if (maria_repair(&param, info, info->s->open_file_name,
-                   param.testflag & T_QUICK))
+  if (maria_repair(&param, info, info->s->open_file_name, param.testflag))
     goto end;
   if (_ma_update_create_rename_lsn(info->s, rec->lsn, TRUE))
     goto end;
   error= 0;
 end:
   return error;
-#else
-  DBUG_ASSERT("fix this table repairing" == NULL);
-  return error;
-#endif
 }
 
 

storage/maria/maria_chk.c

@@ -1758,84 +1758,4 @@ static int sort_record_index(MARIA_SORT_PARAM *sort_param,MARIA_HA *info,
 } /* sort_record_index */
 
 
-
-/*
-  Check if maria_chk was killed by a signal
-  This is overloaded by other programs that want to be able to abort
-  sorting
-*/
-
-static int not_killed= 0;
-
-volatile int *_ma_killed_ptr(HA_CHECK *param __attribute__((unused)))
-{
-  return &not_killed;			/* always NULL */
-}
-
-	/* print warnings and errors */
-	/* VARARGS */
-
-void _ma_check_print_info(HA_CHECK *param __attribute__((unused)),
-			 const char *fmt,...)
-{
-  va_list args;
-  DBUG_ENTER("_ma_check_print_info");
-  DBUG_PRINT("enter", ("format: %s", fmt));
-
-  va_start(args,fmt);
-  VOID(vfprintf(stdout, fmt, args));
-  VOID(fputc('\n',stdout));
-  va_end(args);
-  DBUG_VOID_RETURN;
-}
-
-/* VARARGS */
-
-void _ma_check_print_warning(HA_CHECK *param, const char *fmt,...)
-{
-  va_list args;
-  DBUG_ENTER("_ma_check_print_warning");
-  DBUG_PRINT("enter", ("format: %s", fmt));
-
-  fflush(stdout);
-  if (!param->warning_printed && !param->error_printed)
-  {
-    if (param->testflag & T_SILENT)
-      fprintf(stderr,"%s: MARIA file %s\n",my_progname_short,
-	      param->isam_file_name);
-    param->out_flag|= O_DATA_LOST;
-  }
-  param->warning_printed=1;
-  va_start(args,fmt);
-  fprintf(stderr,"%s: warning: ",my_progname_short);
-  VOID(vfprintf(stderr, fmt, args));
-  VOID(fputc('\n',stderr));
-  fflush(stderr);
-  va_end(args);
-  DBUG_VOID_RETURN;
-}
-
-/* VARARGS */
-
-void _ma_check_print_error(HA_CHECK *param, const char *fmt,...)
-{
-  va_list args;
-  DBUG_ENTER("_ma_check_print_error");
-  DBUG_PRINT("enter", ("format: %s", fmt));
-
-  fflush(stdout);
-  if (!param->warning_printed && !param->error_printed)
-  {
-    if (param->testflag & T_SILENT)
-      fprintf(stderr,"%s: MARIA file %s\n",my_progname_short,param->isam_file_name);
-    param->out_flag|= O_DATA_LOST;
-  }
-  param->error_printed|=1;
-  va_start(args,fmt);
-  fprintf(stderr,"%s: error: ",my_progname_short);
-  VOID(vfprintf(stderr, fmt, args));
-  VOID(fputc('\n',stderr));
-  fflush(stderr);
-  va_end(args);
-  DBUG_VOID_RETURN;
-}
+#include "ma_check_standalone.h"

storage/maria/maria_def.h

@@ -923,7 +923,10 @@ C_MODE_START
 int _ma_flush_table_files(MARIA_HA *info, uint flush_data_or_index,
                           enum flush_type flush_type_for_data,
                           enum flush_type flush_type_for_index);
-/* Functions needed by _ma_check (are overrided in MySQL) */
+/*
+  Functions needed by _ma_check (are overridden in MySQL/ha_maria.cc).
+  See ma_check_standalone.h .
+*/
 volatile int *_ma_killed_ptr(HA_CHECK *param);
 void _ma_check_print_error _VARARGS((HA_CHECK *param, const char *fmt, ...));
 void _ma_check_print_warning _VARARGS((HA_CHECK *param, const char *fmt, ...));

storage/maria/maria_read_log.c

@@ -31,12 +31,14 @@ const char *default_dbug_option= "d:t:i:o,/tmp/maria_read_log.trace";
 #endif /* DBUG_OFF */
 static my_bool opt_only_display, opt_apply, opt_apply_undo, opt_silent;
 static ulong opt_page_buffer_size;
+static const char *my_progname_short;
 
 int main(int argc, char **argv)
 {
   LSN lsn;
   char **default_argv;
   MY_INIT(argv[0]);
+  my_progname_short= my_progname+dirname_length(my_progname);
 
   load_defaults("my", load_default_groups, &argc, &argv);
   default_argv= argv;
@@ -103,12 +105,12 @@ int main(int argc, char **argv)
   if (maria_apply_log(lsn, opt_apply, opt_silent ? NULL : stdout,
                       opt_apply_undo, FALSE))
     goto err;
-  fprintf(stdout, "%s: SUCCESS\n", my_progname);
+  fprintf(stdout, "%s: SUCCESS\n", my_progname_short);
 
   goto end;
 err:
   /* don't touch anything more, in case we hit a bug */
-  fprintf(stderr, "%s: FAILED\n", my_progname);
+  fprintf(stderr, "%s: FAILED\n", my_progname_short);
   exit(1);
 end:
   maria_end();
@@ -119,6 +121,9 @@ int main(int argc, char **argv)
 }
 
 
+#include "ma_check_standalone.h"
+
+
 static struct my_option my_long_options[] =
 {
   {"apply", 'a',
@@ -155,7 +160,7 @@ static struct my_option my_long_options[] =
 static void print_version(void)
 {
   VOID(printf("%s Ver 1.1 for %s on %s\n",
-              my_progname, SYSTEM_TYPE, MACHINE_TYPE));
+              my_progname_short, SYSTEM_TYPE, MACHINE_TYPE));
   NETWARE_SET_SCREEN_MODE(1);
 }
 
@@ -169,7 +174,7 @@ static void usage(void)
 
   puts("Display and apply log records from a MARIA transaction log");
   puts("found in the current directory (for now)");
-  VOID(printf("\nUsage: %s OPTIONS\n", my_progname));
+  VOID(printf("\nUsage: %s OPTIONS\n", my_progname_short));
   puts("You need to use one of -o or -a");
   my_print_help(my_long_options);
   print_defaults("my", load_default_groups);
@@ -203,13 +208,11 @@ static void get_options(int *argc,char ***argv)
 {
   int ho_error;
 
-  my_progname= argv[0][0];
-
   if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option)))
     exit(ho_error);
 
-  if (opt_apply_undo)
-    opt_apply= 1;
+  if (!opt_apply)
+    opt_apply_undo= FALSE;
 
   if ((opt_only_display + opt_apply) != 1)
   {