bk commit into 5.1 tree (tomas:1.2447)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 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.2447 07/03/07 20:42:18 tomas@stripped +2 -0
  remove compiler warning

  storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp
    1.11 07/03/07 20:42:10 tomas@stripped +2 -2
    remove compiler warning

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.141 07/03/07 20:42:09 tomas@stripped +3 -0
    remove compiler warning

# 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.mysql.com
# Root:	/home/tomas/mysql-5.1-telco-6.1_2

--- 1.140/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-02-22 21:36:22 +07:00
+++ 1.141/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-03-07 20:42:09 +07:00
@@ -18538,6 +18538,9 @@ Dblqh::match_and_print(Signal* signal, P
     case TcConnectionrec::WAIT_TUP:
       BaseString::snprintf(state, sizeof(state), "Running");
       break;
+    case TcConnectionrec::WAIT_TUP_COMMIT:
+      BaseString::snprintf(state, sizeof(state), "Committing");
+      break;
     case TcConnectionrec::PREPARED:
       BaseString::snprintf(state, sizeof(state), "Prepared");
       break;

--- 1.10/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp	2007-02-21 20:47:32 +07:00
+++ 1.11/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp	2007-03-07 20:42:10 +07:00
@@ -53,8 +53,8 @@ Uint32 startAtPageIndex = 0;
 Uint32 *redoLogPage;
 
 NDB_COMMAND(redoLogFileReader,  "redoLogFileReader", "redoLogFileReader", "Read a redo log file", 16384) { 
-  int wordIndex = 0;
-  int oldWordIndex = 0;
+  Uint32 wordIndex = 0;
+  Uint32 oldWordIndex = 0;
   Uint32 recordType = 1234567890;
 
   PageHeader *thePageHeader;