bk commit into 5.1 tree (mats:1.2610)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-07 15:23:57+01:00, mats@stripped +1 -0
  Adding return value, which is not used, and wrapped debug function in
  DBUG_OFF #ifdefs to eliminate two warnings in replication tree.

  sql/log_event.cc@stripped, 2007-11-07 15:23:49+01:00, mats@stripped +2 -1
    Adding return value, which is not used, and wrapped debug function in
    DBUG_OFF #ifdefs to eliminate two warnings in replication tree.

diff -Nrup a/sql/log_event.cc b/sql/log_event.cc
--- a/sql/log_event.cc	2007-10-30 21:23:39 +01:00
+++ b/sql/log_event.cc	2007-11-07 15:23:49 +01:00
@@ -36,7 +36,7 @@
 
 #define FLAGSTR(V,F) ((V)&(F)?#F" ":"")
 
-#ifndef MYSQL_CLIENT
+#if !defined(MYSQL_CLIENT) && !defined(DBUG_OFF)
 static const char *HA_ERR(int i)
 {
   switch (i) {
@@ -90,6 +90,7 @@ static const char *HA_ERR(int i)
   case HA_ERR_LOGGING_IMPOSSIBLE: return "HA_ERR_LOGGING_IMPOSSIBLE";
   case HA_ERR_CORRUPT_EVENT: return "HA_ERR_CORRUPT_EVENT";
   }
+  return "<unknown error>";
 }
 #endif