bzr push into mysql-5.1 branch (stewart:2880 to 2882)

[Stewart Smith]

 2882 Stewart Smith	2008-10-06
      remove unneeded leftover debug prints in DBINFO
modified:
  storage/ndb/src/kernel/blocks/dbinfo/Dbinfo.cpp

 2881 Stewart Smith	2008-10-06
      Microsoft compiler gives strange warning of unused variable.
modified:
  storage/ndb/src/mgmapi/mgmapi_configuration.cpp

 2880 Stewart Smith	2008-10-06 [merge]
      merge main 6.4 into -win
added:
  storage/ndb/include/kernel/signaldata/DbinfoScan.hpp
  storage/ndb/include/ndbinfo.h
  storage/ndb/src/common/util/ndbinfo.c
  storage/ndb/src/common/util/test-ndbinfo.c
  storage/ndb/src/kernel/blocks/dbinfo/
  storage/ndb/src/kernel/blocks/dbinfo/Dbinfo.cpp
  storage/ndb/src/kernel/blocks/dbinfo/Dbinfo.hpp
  storage/ndb/src/kernel/blocks/dbinfo/DbinfoScan.txt
  storage/ndb/src/kernel/blocks/dbinfo/ndbinfo_helpers.cpp
  storage/ndb/src/kernel/blocks/dbinfo/ndbinfo_tableids.h
  storage/ndb/src/kernel/blocks/dbinfo/ndbinfo_tables.h
  storage/ndb/src/mgmsrv/mgm_ndbinfo.c
  storage/ndb/src/mgmsrv/mgm_ndbinfo_tables.h
modified:
  storage/ndb/include/Makefile.am
  storage/ndb/include/kernel/BlockNumbers.h
  storage/ndb/include/kernel/GlobalSignalNumbers.h
  storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp
  storage/ndb/include/kernel/signaldata/ReadNodesConf.hpp
  storage/ndb/include/logger/FileLogHandler.hpp
  storage/ndb/include/logger/LogHandler.hpp
  storage/ndb/include/logger/Logger.hpp
  storage/ndb/include/mgmapi/mgmapi.h
  storage/ndb/include/ndbapi/Ndb.hpp
  storage/ndb/src/common/debugger/BlockNames.cpp
  storage/ndb/src/common/logger/FileLogHandler.cpp
  storage/ndb/src/common/logger/Logger.cpp
  storage/ndb/src/common/util/Makefile.am
  storage/ndb/src/kernel/Makefile.am
  storage/ndb/src/kernel/SimBlockList.cpp
  storage/ndb/src/kernel/blocks/Makefile.am
  storage/ndb/src/kernel/blocks/backup/Backup.cpp
  storage/ndb/src/kernel/blocks/backup/Backup.hpp
  storage/ndb/src/kernel/blocks/backup/BackupInit.cpp
  storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
  storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp
  storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp
  storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
  storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
  storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
  storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
  storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp
  storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
  storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp
  storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp
  storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp
  storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp
  storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp
  storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
  storage/ndb/src/kernel/blocks/suma/Suma.cpp
  storage/ndb/src/kernel/blocks/suma/Suma.hpp
  storage/ndb/src/kernel/blocks/suma/SumaInit.cpp
  storage/ndb/src/kernel/blocks/trix/Trix.cpp
  storage/ndb/src/kernel/blocks/trix/Trix.hpp
  storage/ndb/src/kernel/vm/mt.cpp
  storage/ndb/src/mgmapi/mgmapi.cpp
  storage/ndb/src/mgmclient/CommandInterpreter.cpp
  storage/ndb/src/mgmsrv/MgmtSrvr.cpp
  storage/ndb/src/mgmsrv/MgmtSrvr.hpp
  storage/ndb/src/mgmsrv/Services.cpp
  storage/ndb/src/mgmsrv/Services.hpp
  storage/ndb/src/ndbapi/Ndb.cpp
  storage/ndb/src/ndbapi/NdbTransaction.cpp
  storage/ndb/test/ndbapi/testMgm.cpp

=== modified file 'storage/ndb/src/kernel/blocks/dbinfo/Dbinfo.cpp'
--- a/storage/ndb/src/kernel/blocks/dbinfo/Dbinfo.cpp	2008-10-05 07:14:37 +0000
+++ b/storage/ndb/src/kernel/blocks/dbinfo/Dbinfo.cpp	2008-10-06 07:17:40 +0000
@@ -297,7 +297,6 @@ void Dbinfo::execDBINFO_SCANREQ(Signal *
     {
       startTableId= req.cur_item >> 8;
       startColumnId= req.cur_item & 0xFF;
-      ndbout_c("CONTINUE: %u %u",startTableId, startColumnId);
     }
 
     struct ndbinfo_table *t;
@@ -347,7 +346,6 @@ void Dbinfo::execDBINFO_SCANREQ(Signal *
 
   default:
     jam();
-    ndbout_c("a");
 
     if(tableId > number_ndbinfo_tables)
     {
@@ -365,7 +363,6 @@ void Dbinfo::execDBINFO_SCANREQ(Signal *
 
     if(signal->getLength() == DbinfoScanReq::SignalLength)
     {
-      ndbout_c("b");
       /*
        * We've gotten a request from application, first
        * ScanReq signal. start from beginning
@@ -392,7 +389,6 @@ void Dbinfo::execDBINFO_SCANREQ(Signal *
     }
     else
     {
-      ndbout_c("c");
       /**
        * We have a cursor, so we need to continue scanning.
        */
@@ -414,7 +410,6 @@ void Dbinfo::execDBINFO_SCANREQ(Signal *
 
       oreq->cur_block= dbinfo_blocks[next_dbinfo_block];
 
-      ndbout_c("c1 %d",oreq->cur_block);
       sendSignal(numberToRef(oreq->cur_block,oreq->cur_node),
                  GSN_DBINFO_SCANREQ,
                  signal, signal->getLength(), JBB);

=== modified file 'storage/ndb/src/mgmapi/mgmapi_configuration.cpp'
--- a/storage/ndb/src/mgmapi/mgmapi_configuration.cpp	2007-04-13 09:33:08 +0000
+++ b/storage/ndb/src/mgmapi/mgmapi_configuration.cpp	2008-10-06 07:04:14 +0000
@@ -185,6 +185,7 @@ ndb_mgm_get_db_parameter_info(Uint32 par
   }
 
   ConfigInfo data;
+  (void)data;
   for (int i = 0; i < data.m_NoOfParams; i++) {
     if (paramId == data.m_ParamInfo[i]._paramId && strcmp("DB",
data.m_ParamInfo[i]._section) == 0) {
         size_t tmp = 0;