WL#1895 - Print message to error log in case of detected MyISAM corruption

Changed my_error() to print error messages, which come from
arbitrary registered ranges of error messages. Messages can
be unregistered (and should be at end of the program).
Added registration of handler error messages.
Added a new mi_print_error() macro and a new 
mi_report_error() function, which supply error
messages with a table name.
Added calls to mi_print_error() or mi_report_error()
at all places in MyISAM, where table corruption is detected.


extra/comp_err.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added prints for ER_ERROR_FIRST and ER_ERROR_LAST.
  Removed print for ER_ERROR_MESSAGES.
include/errmsg.h:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added declaration for a new function.
  Added first and last error number defines.
include/my_base.h:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added first and last error number defines.
include/my_sys.h:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Removed obsolete defines.
  Removed a global variable, which held pointers to the error message arrays.
  Added declarations for new functions.
include/mysys_err.h:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Removed an obsolete define.
  Changed two defines to use the new defines.
  Added first and last error number defines.
libmysql/errmsg.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Replaced global array initialization by proper registration
  and unregistration of client error messages.
libmysql/libmysql.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added a call for unregistration of client error messages.
myisam/mi_delete.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
  Added a debugging call to pretend MyISAM corruption in case a special
  debug string is set.
  Added a debugging call to test undefined error numbers in case a special
  debug string is set.
myisam/mi_extra.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
myisam/mi_info.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added the error logging function.
myisam/mi_key.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
myisam/mi_keycache.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
myisam/mi_locking.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
myisam/mi_open.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
  Added a debugging call to pretend MyISAM corruption in case a special
  debug string is set.
myisam/mi_page.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
myisam/mi_range.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
myisam/mi_rkey.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
myisam/mi_search.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
myisam/mi_update.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
  Added a debugging call to pretend MyISAM corruption in case a special
  debug string is set.
myisam/mi_write.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
  Added a debugging call to pretend MyISAM corruption in case a special
  debug string is set.
myisam/myisamdef.h:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added the declaration of the new error logging function
  and a new macro.
mysql-test/r/merge.result:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Changed test results. These come from the changed error reporting
  in openfrm().
mysql-test/r/repair.result:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Changed test results. These come from the changed error reporting
  in openfrm().
mysql-test/t/merge.test:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Changederror numbers. These come from the changed error reporting
  in openfrm().
mysys/errors.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Dropped the assignment of the global errors to the
  dropped global pointer array.
mysys/my_error.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Changed my_error() from using a static array of pointers to
  error message arrays to using a linked list of structures
  with pointers to array message arrays.
  Added functions for registering and unregistering error 
  message arrays to the chain.
sql/derror.cc:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Changed reading of mysqld error messages to using the new
  registering and unregistering functions.
sql/handler.cc:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added initialization and deinitialization of handler error messages.
  Included more handler error messages in the mapping to
  mysqld error messages.
sql/mysqld.cc:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Changed deinitialization of error messages to proper
  unregistration.
sql/table.cc:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Changed error reporting in openfrm() so that error messages from
  handler::ha_open() are reported by handler::print_error(). This
  changed messages from "Can't open 't1.MYI' (errno: 130)" to
  "Incorrect file format 't1'" for example.
sql/unireg.h:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Changed two defines to use the new defines.

5 files changed, 160 insertions, 22 deletions

diff --git a/sql/derror.cc b/sql/derror.cc
index 09f43d20044..4690e76d0e3 100644
--- a/sql/derror.cc
+++ b/sql/derror.cc
@@ -24,15 +24,43 @@ static bool read_texts(const char *file_name,const char ***point,
 		       uint error_messages);
 static void init_myfunc_errs(void);
 
-	/* Read messages from errorfile */
+/*
+  Read messages from errorfile.
+
+  SYNOPSIS
+    init_errmessage()
+
+  DESCRIPTION
+    This function can be called multiple times to reload the messages.
+
+  RETURN
+    FALSE       OK
+    TRUE        Error
+*/
 
 bool init_errmessage(void)
 {
+  const char **errmsgs;
   DBUG_ENTER("init_errmessage");
 
-  if (read_texts(ERRMSG_FILE,&my_errmsg[ERRMAPP],ER_ERROR_MESSAGES))
+  /*
+    Get a pointer to the old error messages pointer array.
+    read_texts() tries to free it.
+  */
+  errmsgs= my_error_unregister(ER_ERROR_FIRST, ER_ERROR_LAST);
+
+  /* Read messages from file. */
+  if (read_texts(ERRMSG_FILE, &errmsgs, ER_ERROR_LAST - ER_ERROR_FIRST + 1))
     DBUG_RETURN(TRUE);
-  errmesg=my_errmsg[ERRMAPP];		/* Init global variabel */
+
+  /* Register messages for use with my_error(). */
+  if (my_error_register(errmsgs, ER_ERROR_FIRST, ER_ERROR_LAST))
+  {
+    x_free((gptr) errmsgs);
+    DBUG_RETURN(TRUE);
+  }
+
+  errmesg= errmsgs;		        /* Init global variabel */
   init_myfunc_errs();			/* Init myfunc messages */
   DBUG_RETURN(FALSE);
 }
@@ -148,20 +176,20 @@ static void init_myfunc_errs()
   init_glob_errs();			/* Initiate english errors */
   if (!(specialflag & SPECIAL_ENGLISH))
   {
-    globerrs[EE_FILENOTFOUND % ERRMOD]	= ER(ER_FILE_NOT_FOUND);
-    globerrs[EE_CANTCREATEFILE % ERRMOD]= ER(ER_CANT_CREATE_FILE);
-    globerrs[EE_READ % ERRMOD]		= ER(ER_ERROR_ON_READ);
-    globerrs[EE_WRITE % ERRMOD]		= ER(ER_ERROR_ON_WRITE);
-    globerrs[EE_BADCLOSE % ERRMOD]	= ER(ER_ERROR_ON_CLOSE);
-    globerrs[EE_OUTOFMEMORY % ERRMOD]	= ER(ER_OUTOFMEMORY);
-    globerrs[EE_DELETE % ERRMOD]	= ER(ER_CANT_DELETE_FILE);
-    globerrs[EE_LINK % ERRMOD]		= ER(ER_ERROR_ON_RENAME);
-    globerrs[EE_EOFERR % ERRMOD]	= ER(ER_UNEXPECTED_EOF);
-    globerrs[EE_CANTLOCK % ERRMOD]	= ER(ER_CANT_LOCK);
-    globerrs[EE_DIR % ERRMOD]		= ER(ER_CANT_READ_DIR);
-    globerrs[EE_STAT % ERRMOD]		= ER(ER_CANT_GET_STAT);
-    globerrs[EE_GETWD % ERRMOD]		= ER(ER_CANT_GET_WD);
-    globerrs[EE_SETWD % ERRMOD]		= ER(ER_CANT_SET_WD);
-    globerrs[EE_DISK_FULL % ERRMOD]	= ER(ER_DISK_FULL);
+    EE(EE_FILENOTFOUND)   = ER(ER_FILE_NOT_FOUND);
+    EE(EE_CANTCREATEFILE) = ER(ER_CANT_CREATE_FILE);
+    EE(EE_READ)           = ER(ER_ERROR_ON_READ);
+    EE(EE_WRITE)          = ER(ER_ERROR_ON_WRITE);
+    EE(EE_BADCLOSE)       = ER(ER_ERROR_ON_CLOSE);
+    EE(EE_OUTOFMEMORY)    = ER(ER_OUTOFMEMORY);
+    EE(EE_DELETE)         = ER(ER_CANT_DELETE_FILE);
+    EE(EE_LINK)           = ER(ER_ERROR_ON_RENAME);
+    EE(EE_EOFERR)         = ER(ER_UNEXPECTED_EOF);
+    EE(EE_CANTLOCK)       = ER(ER_CANT_LOCK);
+    EE(EE_DIR)            = ER(ER_CANT_READ_DIR);
+    EE(EE_STAT)           = ER(ER_CANT_GET_STAT);
+    EE(EE_GETWD)          = ER(ER_CANT_GET_WD);
+    EE(EE_SETWD)          = ER(ER_CANT_SET_WD);
+    EE(EE_DISK_FULL)      = ER(ER_DISK_FULL);
   }
 }
diff --git a/sql/handler.cc b/sql/handler.cc
index e43f2c2e888..ed17034907c 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -244,9 +244,99 @@ bool ha_caching_allowed(THD* thd, char* table_key,
   return 1;
 }
 
+
+/*
+  Register handler error messages for use with my_error().
+
+  SYNOPSIS
+    ha_init_errors()
+
+  RETURN
+    0           OK
+    != 0        Error
+*/
+
+static int ha_init_errors(void)
+{
+#define SETMSG(nr, msg) errmsgs[(nr) - HA_ERR_FIRST]= (msg)
+  const char    **errmsgs;
+
+  /* Allocate a pointer array for the error message strings. */
+  /* Zerofill it to avoid uninitialized gaps. */
+  if (! (errmsgs= (const char**) my_malloc(HA_ERR_ERRORS * sizeof(char*),
+                                           MYF(MY_WME | MY_ZEROFILL))))
+    return 1;
+
+  /* Set the dedicated error messages. */
+  SETMSG(HA_ERR_KEY_NOT_FOUND,          ER(ER_KEY_NOT_FOUND));
+  SETMSG(HA_ERR_FOUND_DUPP_KEY,         ER(ER_DUP_KEY));
+  SETMSG(HA_ERR_RECORD_CHANGED,         "Update wich is recoverable");
+  SETMSG(HA_ERR_WRONG_INDEX,            "Wrong index given to function");
+  SETMSG(HA_ERR_CRASHED,                ER(ER_NOT_KEYFILE));
+  SETMSG(HA_ERR_WRONG_IN_RECORD,        ER(ER_CRASHED_ON_USAGE));
+  SETMSG(HA_ERR_OUT_OF_MEM,             "Table handler out of memory");
+  SETMSG(HA_ERR_NOT_A_TABLE,            "Incorrect file format '%.64s'");
+  SETMSG(HA_ERR_WRONG_COMMAND,          "Command not supported");
+  SETMSG(HA_ERR_OLD_FILE,               ER(ER_OLD_KEYFILE));
+  SETMSG(HA_ERR_NO_ACTIVE_RECORD,       "No record read in update");
+  SETMSG(HA_ERR_RECORD_DELETED,         "Intern record deleted");
+  SETMSG(HA_ERR_RECORD_FILE_FULL,       ER(ER_RECORD_FILE_FULL));
+  SETMSG(HA_ERR_INDEX_FILE_FULL,        "No more room in index file '%.64s'");
+  SETMSG(HA_ERR_END_OF_FILE,            "End in next/prev/first/last");
+  SETMSG(HA_ERR_UNSUPPORTED,            ER(ER_ILLEGAL_HA));
+  SETMSG(HA_ERR_TO_BIG_ROW,             "Too big row");
+  SETMSG(HA_WRONG_CREATE_OPTION,        "Wrong create option");
+  SETMSG(HA_ERR_FOUND_DUPP_UNIQUE,      ER(ER_DUP_UNIQUE));
+  SETMSG(HA_ERR_UNKNOWN_CHARSET,        "Can't open charset");
+  SETMSG(HA_ERR_WRONG_MRG_TABLE_DEF,    ER(ER_WRONG_MRG_TABLE));
+  SETMSG(HA_ERR_CRASHED_ON_REPAIR,      ER(ER_CRASHED_ON_REPAIR));
+  SETMSG(HA_ERR_CRASHED_ON_USAGE,       ER(ER_CRASHED_ON_USAGE));
+  SETMSG(HA_ERR_LOCK_WAIT_TIMEOUT,      ER(ER_LOCK_WAIT_TIMEOUT));
+  SETMSG(HA_ERR_LOCK_TABLE_FULL,        ER(ER_LOCK_TABLE_FULL));
+  SETMSG(HA_ERR_READ_ONLY_TRANSACTION,  ER(ER_READ_ONLY_TRANSACTION));
+  SETMSG(HA_ERR_LOCK_DEADLOCK,          ER(ER_LOCK_DEADLOCK));
+  SETMSG(HA_ERR_CANNOT_ADD_FOREIGN,     ER(ER_CANNOT_ADD_FOREIGN));
+  SETMSG(HA_ERR_NO_REFERENCED_ROW,      ER(ER_NO_REFERENCED_ROW));
+  SETMSG(HA_ERR_ROW_IS_REFERENCED,      ER(ER_ROW_IS_REFERENCED));
+  SETMSG(HA_ERR_NO_SAVEPOINT,           "No savepoint with that name");
+  SETMSG(HA_ERR_NON_UNIQUE_BLOCK_SIZE,  "Non unique key block size");
+  SETMSG(HA_ERR_NO_SUCH_TABLE,          "No such table: '%.64s'");
+  SETMSG(HA_ERR_TABLE_EXIST,            ER(ER_TABLE_EXISTS_ERROR));
+  SETMSG(HA_ERR_NO_CONNECTION,          "Could not connect to storage engine");
+
+  /* Register the error messages for use with my_error(). */
+  return my_error_register(errmsgs, HA_ERR_FIRST, HA_ERR_LAST);
+}
+
+
+/*
+  Unregister handler error messages.
+
+  SYNOPSIS
+    ha_finish_errors()
+
+  RETURN
+    0           OK
+    != 0        Error
+*/
+
+static int ha_finish_errors(void)
+{
+  const char    **errmsgs;
+
+  /* Allocate a pointer array for the error message strings. */
+  if (! (errmsgs= my_error_unregister(HA_ERR_FIRST, HA_ERR_LAST)))
+    return 1;
+  my_free((gptr) errmsgs, MYF(0));
+  return 0;
+}
+
+
 int ha_init()
 {
   int error= 0;
+  if (ha_init_errors())
+    return 1;
 #ifdef HAVE_BERKELEY_DB
   if (have_berkeley_db == SHOW_OPTION_YES)
   {
@@ -314,6 +404,8 @@ int ha_panic(enum ha_panic_function flag)
   if (have_ndbcluster == SHOW_OPTION_YES)
     error|=ndbcluster_end();
 #endif
+  if (ha_finish_errors())
+    error= 1;
   return error;
 } /* ha_panic */
 
@@ -1241,9 +1333,15 @@ void handler::print_error(int error, myf errflag)
   case HA_ERR_CRASHED:
     textno=ER_NOT_KEYFILE;
     break;
+  case HA_ERR_WRONG_IN_RECORD:
+    textno= ER_CRASHED_ON_USAGE;
+    break;
   case HA_ERR_CRASHED_ON_USAGE:
     textno=ER_CRASHED_ON_USAGE;
     break;
+  case HA_ERR_NOT_A_TABLE:
+    textno= error;
+    break;
   case HA_ERR_CRASHED_ON_REPAIR:
     textno=ER_CRASHED_ON_REPAIR;
     break;
@@ -1262,6 +1360,9 @@ void handler::print_error(int error, myf errflag)
   case HA_ERR_RECORD_FILE_FULL:
     textno=ER_RECORD_FILE_FULL;
     break;
+  case HA_ERR_INDEX_FILE_FULL:
+    textno= errno;
+    break;
   case HA_ERR_LOCK_WAIT_TIMEOUT:
     textno=ER_LOCK_WAIT_TIMEOUT;
     break;
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 8eec97efd81..8d3c99bc146 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -1005,7 +1005,9 @@ void clean_up(bool print_message)
   if (!opt_bootstrap)
     (void) my_delete(pidfile_name,MYF(0));	// This may not always exist
 #endif
-  x_free((gptr) my_errmsg[ERRMAPP]);	/* Free messages */
+  finish_client_errs();
+  const char **errmsgs= my_error_unregister(ER_ERROR_FIRST, ER_ERROR_LAST);
+  x_free((gptr) errmsgs);	/* Free messages */
   DBUG_PRINT("quit", ("Error messages freed"));
   /* Tell main we are ready */
   (void) pthread_mutex_lock(&LOCK_thread_count);
diff --git a/sql/table.cc b/sql/table.cc
index c18a2557337..3cf6bbded58 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -76,6 +76,7 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat,
   my_string record;
   const char **int_array;
   bool	 use_hash, null_field_first;
+  bool   error_reported= FALSE;
   File	 file;
   Field  **field_ptr,*reg_field;
   KEY	 *keyinfo;
@@ -788,6 +789,11 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat,
 	error= 1;
 	my_errno= ENOENT;
       }
+      else
+      {
+        outparam->file->print_error(err, MYF(0));
+        error_reported= TRUE;
+      }
       goto err_not_open; /* purecov: inspected */
     }
   }
@@ -814,7 +820,8 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat,
  err_end:					/* Here when no file */
   delete crypted;
   *root_ptr= old_root;
-  frm_error(error,outparam,name,ME_ERROR+ME_WAITTANG);
+  if (! error_reported)
+    frm_error(error,outparam,name,ME_ERROR+ME_WAITTANG);
   delete outparam->file;
   outparam->file=0;				// For easier errorchecking
   outparam->db_stat=0;
diff --git a/sql/unireg.h b/sql/unireg.h
index 932bdf4dfc5..053ca393ad0 100644
--- a/sql/unireg.h
+++ b/sql/unireg.h
@@ -37,8 +37,8 @@
 #define SHAREDIR	"share/"
 #endif
 
-#define ER(X) errmesg[(X)-1000]
-#define ER_SAFE(X) (((X) >= 1000 && (X) < ER_ERROR_MESSAGES + 1000) ? ER(X) : "Invalid error code")
+#define ER(X) errmesg[(X) - ER_ERROR_FIRST]
+#define ER_SAFE(X) (((X) >= ER_ERROR_FIRST && (X) <= ER_ERROR_LAST) ? ER(X) : "Invalid error code")
 
 
 #define ERRMAPP 1				/* Errormap f|r my_error */