bk commit into 5.0 tree (tomas:1.2359)

[tomas]

Below is the list of changes that have just been committed into a local
5.0 repository of tomas. When tomas 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
  1.2359 07/01/05 15:33:39 tomas@poseidon. +3 -0
  remove unused errorcode
  corrected previous patch removing  "if (signal)", which should acually be "if (signum)"

  ndb/src/ndbapi/ndberror.c
    1.54 07/01/05 15:33:32 tomas@poseidon. +0 -1
    remove unused errorcode

  ndb/src/kernel/blocks/dbtc/Dbtc.hpp
    1.38 07/01/05 15:33:32 tomas@poseidon. +0 -1
    remove unused errorcode

  ndb/src/common/debugger/EventLogger.cpp
    1.30 07/01/05 15:33:32 tomas@poseidon. +2 -1
    corrected previous patch removing  "if (signal)", which should acually be "if (signum)"

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.
# Root:	/home/tomas/mysql-5.0-ndb

--- 1.29/ndb/src/common/debugger/EventLogger.cpp	2006-12-23 20:04:12 +01:00
+++ 1.30/ndb/src/common/debugger/EventLogger.cpp	2007-01-05 15:33:32 +01:00
@@ -115,7 +115,8 @@
   int sphase        = theData[4];
   int extra         = theData[5];
   getRestartAction(theData[1],action_str);
-  reason_str.appfmt(" Initiated by signal %d.", signum);
+  if (signum)
+    reason_str.appfmt(" Initiated by signal %d.", signum);
   if (error)
   {
     ndbd_exit_classification cl;

--- 1.37/ndb/src/kernel/blocks/dbtc/Dbtc.hpp	2006-12-23 20:04:15 +01:00
+++ 1.38/ndb/src/kernel/blocks/dbtc/Dbtc.hpp	2007-01-05 15:33:32 +01:00
@@ -138,7 +138,6 @@
 
 #define ZNOT_FOUND 626
 #define ZALREADYEXIST 630
-#define ZINCONSISTENTHASHINDEX 892
 #define ZNOTUNIQUE 893
 
 #define ZINVALID_KEY 290

--- 1.53/ndb/src/ndbapi/ndberror.c	2006-12-23 20:04:18 +01:00
+++ 1.54/ndb/src/ndbapi/ndberror.c	2007-01-05 15:33:32 +01:00
@@ -208,7 +208,6 @@
   /**
    * Internal errors
    */
-  { 892,  IE, "Inconsistent hash index. The index needs to be dropped and recreated" },
   { 896,  IE, "Tuple corrupted - wrong checksum or column data in invalid format" },
   { 901,  IE, "Inconsistent ordered index. The index needs to be dropped and recreated" },
   { 202,  IE, "202" },