bk commit into 5.1 tree (Justin.He:1.2545)

[justin.he]

Below is the list of changes that have just been committed into a local
5.1 repository of justin.he. When justin.he 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-06-14 19:57:50+08:00, Justin.He@stripped +3 -0
  Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug27640-5.0-ndb
  into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug27640-5.1-new-ndb
  MERGE: 1.1810.2683.14

  storage/ndb/include/debugger/EventLogger.hpp@stripped, 2007-06-14 19:42:47+08:00,
Justin.He@stripped +0 -0
    Auto merged
    MERGE: 1.9.2.2

  storage/ndb/include/debugger/EventLogger.hpp@stripped, 2007-06-14 19:42:47+08:00,
Justin.He@stripped +0 -0
    Merge rename: ndb/include/debugger/EventLogger.hpp ->
storage/ndb/include/debugger/EventLogger.hpp

  storage/ndb/src/mgmclient/CommandInterpreter.cpp@stripped, 2007-06-14 19:57:31+08:00,
Justin.He@stripped +314 -89
    MERGE: 1.49.42.2

  storage/ndb/src/mgmclient/CommandInterpreter.cpp@stripped, 2007-06-14 19:42:47+08:00,
Justin.He@stripped +0 -0
    Merge rename: ndb/src/mgmclient/CommandInterpreter.cpp ->
storage/ndb/src/mgmclient/CommandInterpreter.cpp

  storage/ndb/src/mgmclient/Makefile.am@stripped, 2007-06-14 19:42:47+08:00,
Justin.He@stripped +0 -0
    Auto merged
    MERGE: 1.17.2.2

  storage/ndb/src/mgmclient/Makefile.am@stripped, 2007-06-14 19:42:47+08:00,
Justin.He@stripped +0 -0
    Merge rename: ndb/src/mgmclient/Makefile.am ->
storage/ndb/src/mgmclient/Makefile.am

# 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:	Justin.He
# Host:	dev3-240.dev.cn.tlan
# Root:	/home/justin.he/mysql/mysql-5.1/bug27640-5.1-new-ndb/RESYNC

--- 1.9.2.1/ndb/include/debugger/EventLogger.hpp	2007-06-14 19:58:00 +08:00
+++ 1.14/storage/ndb/include/debugger/EventLogger.hpp	2007-06-14 19:58:00 +08:00
@@ -18,7 +18,6 @@
 
 #include <logger/Logger.hpp>
 #include <logger/FileLogHandler.hpp>
-#include "GrepError.hpp"
 #include <kernel/kernel_types.h>
 #include <kernel/LogLevel.hpp>
 #include <kernel/signaldata/EventReport.hpp>
@@ -172,7 +171,6 @@
   Uint32 m_filterLevel;
 
   STATIC_CONST(MAX_TEXT_LENGTH = 256);
-  char m_text[MAX_TEXT_LENGTH];
 };
 
 extern void getRestartAction(Uint32 action, BaseString &str);

--- 1.17.2.1/ndb/src/mgmclient/Makefile.am	2007-06-14 19:58:00 +08:00
+++ 1.21/storage/ndb/src/mgmclient/Makefile.am	2007-06-14 19:58:00 +08:00
@@ -27,11 +27,11 @@
 
 ndb_mgm_SOURCES = main.cpp
 
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
 
-INCLUDES += -I$(top_srcdir)/ndb/include/mgmapi \
-            -I$(top_srcdir)/ndb/src/common/mgmcommon
+INCLUDES += -I$(top_srcdir)/storage/ndb/include/mgmapi \
+            -I$(top_srcdir)/storage/ndb/src/common/mgmcommon
 
 LDADD_LOC = $(noinst_LTLIBRARIES) \
 	    ../common/portlib/libportlib.la \
@@ -49,25 +49,25 @@
 windoze-dsp: ndb_mgm.dsp libndbmgmclient.dsp
 
 ndb_mgm.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-prg.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-prg.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(ndbtools_PROGRAMS)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_mgm_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
+               $(top_srcdir)/storage/ndb/config/win-prg.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(ndbtools_PROGRAMS)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_mgm_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
 
 libndbmgmclient.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(libndbmgmclient_la_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB
+               $(top_srcdir)/storage/ndb/config/win-lib.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libndbmgmclient_la_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB