bzr push into mysql-5.1-telco-7.0 branch (magnus.blaudd:3199 to 3201)

[Magnus Blåudd]

 3201 Magnus Blåudd	2009-11-08
      ndbinfo - remove junk character

    modified:
      storage/ndb/tools/CMakeLists.txt
 3200 Magnus Blåudd	2009-11-08
      ndbinfo - compile NdbinfoTables.cpp directly instead of including it in another cpp file, thus making it included in the dist

    modified:
      storage/ndb/src/kernel/vm/CMakeLists.txt
      storage/ndb/src/kernel/vm/Makefile.am
      storage/ndb/src/kernel/vm/Ndbinfo.cpp
 3199 Magnus Blåudd	2009-11-08 [merge]
      Merge ndbinfo backport

    removed:
      storage/ndb/include/ndbinfo.h
      storage/ndb/src/common/util/ndbinfo.c
      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.cpp
    added:
      mysql-test/suite/ndb/r/ndbinfo.result
      mysql-test/suite/ndb/t/ndbinfo.test
      sql/ha_ndbinfo.cc
      sql/ha_ndbinfo.h
      storage/ndb/src/kernel/vm/Ndbinfo.cpp
      storage/ndb/src/kernel/vm/Ndbinfo.hpp
      storage/ndb/src/kernel/vm/NdbinfoTables.cpp
      storage/ndb/src/ndbapi/NdbInfo.cpp
      storage/ndb/src/ndbapi/NdbInfo.hpp
      storage/ndb/src/ndbapi/NdbInfoRecAttr.hpp
      storage/ndb/src/ndbapi/NdbInfoScanOperation.cpp
      storage/ndb/src/ndbapi/NdbInfoScanOperation.hpp
      storage/ndb/test/ndbapi/testNdbinfo.cpp
      storage/ndb/tools/ndbinfo_sql.cpp
    modified:
      libmysqld/Makefile.am
      mysql-test/suite/ndb/r/ndb_basic.result
      sql/Makefile.am
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_binlog.h
      storage/ndb/CMakeLists.txt
      storage/ndb/include/Makefile.am
      storage/ndb/include/kernel/signaldata/DbinfoScan.hpp
      storage/ndb/include/kernel/signaldata/SignalData.hpp
      storage/ndb/include/mgmapi/mgmapi.h
      storage/ndb/include/util/BaseString.hpp
      storage/ndb/include/util/HashMap.hpp
      storage/ndb/include/util/Vector.hpp
      storage/ndb/src/common/util/CMakeLists.txt
      storage/ndb/src/common/util/Makefile.am
      storage/ndb/src/kernel/blocks/LocalProxy.cpp
      storage/ndb/src/kernel/blocks/LocalProxy.hpp
      storage/ndb/src/kernel/blocks/Makefile.am
      storage/ndb/src/kernel/blocks/backup/Backup.cpp
      storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
      storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp
      storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
      storage/ndb/src/kernel/blocks/dbinfo/CMakeLists.txt
      storage/ndb/src/kernel/blocks/dbinfo/Dbinfo.cpp
      storage/ndb/src/kernel/blocks/dbinfo/Dbinfo.hpp
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.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/dbtup/DbtupPageMap.cpp
      storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp
      storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp
      storage/ndb/src/kernel/blocks/suma/Suma.cpp
      storage/ndb/src/kernel/blocks/trix/Trix.cpp
      storage/ndb/src/kernel/vm/CMakeLists.txt
      storage/ndb/src/kernel/vm/Makefile.am
      storage/ndb/src/kernel/vm/SimulatedBlock.cpp
      storage/ndb/src/kernel/vm/SimulatedBlock.hpp
      storage/ndb/src/mgmapi/mgmapi.cpp
      storage/ndb/src/mgmclient/CommandInterpreter.cpp
      storage/ndb/src/mgmsrv/Makefile.am
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
      storage/ndb/src/mgmsrv/MgmtSrvr.hpp
      storage/ndb/src/mgmsrv/Services.cpp
      storage/ndb/src/ndbapi/CMakeLists.txt
      storage/ndb/src/ndbapi/Makefile.am
      storage/ndb/test/ndbapi/CMakeLists.txt
      storage/ndb/test/ndbapi/Makefile.am
      storage/ndb/test/ndbapi/testMgm.cpp
      storage/ndb/tools/CMakeLists.txt
      storage/ndb/tools/Makefile.am
=== modified file 'storage/ndb/src/kernel/vm/CMakeLists.txt'
--- a/storage/ndb/src/kernel/vm/CMakeLists.txt	2009-11-08 12:52:27 +0000
+++ b/storage/ndb/src/kernel/vm/CMakeLists.txt	2009-11-08 13:21:21 +0000
@@ -37,6 +37,7 @@ ADD_LIBRARY(ndbkernel STATIC
 	    GlobalData.cpp
 	    SafeMutex.cpp
             Ndbinfo.cpp
+            NdbinfoTables.cpp
 )
 ADD_LIBRARY(ndbsched STATIC
             TimeQueue.cpp

=== modified file 'storage/ndb/src/kernel/vm/Makefile.am'
--- a/storage/ndb/src/kernel/vm/Makefile.am	2009-11-08 12:52:27 +0000
+++ b/storage/ndb/src/kernel/vm/Makefile.am	2009-11-08 13:21:21 +0000
@@ -39,7 +39,7 @@ libkernel_a_SOURCES = \
 	Pool.cpp WOPool.cpp RWPool.cpp DynArr256.cpp LockQueue.cpp \
 	GlobalData.cpp \
 	SafeMutex.cpp \
-	Ndbinfo.cpp
+	Ndbinfo.cpp NdbinfoTables.cpp
 
 libsched_a_SOURCES = TimeQueue.cpp		\
                      ThreadConfig.cpp \

=== modified file 'storage/ndb/src/kernel/vm/Ndbinfo.cpp'
--- a/storage/ndb/src/kernel/vm/Ndbinfo.cpp	2009-11-08 12:52:27 +0000
+++ b/storage/ndb/src/kernel/vm/Ndbinfo.cpp	2009-11-08 13:21:21 +0000
@@ -124,6 +124,3 @@ Ndbinfo::Row::write_uint64(Uint64 value)
 }
 
 
-#include "NdbinfoTables.cpp"
-
-

=== modified file 'storage/ndb/tools/CMakeLists.txt'
--- a/storage/ndb/tools/CMakeLists.txt	2009-11-08 12:52:27 +0000
+++ b/storage/ndb/tools/CMakeLists.txt	2009-11-08 13:22:23 +0000
@@ -55,7 +55,7 @@ SET_TARGET_PROPERTIES(ndb_config PROPERT
                       COMPILE_FLAGS "${options}")
 
 # Build ndbinfo_sql and run it to create ndbinfo.sql
-ADD_EXECUTABLE(ndbinfo_sql ndbinfo_sql.cpp)a
+ADD_EXECUTABLE(ndbinfo_sql ndbinfo_sql.cpp)
 GET_TARGET_PROPERTY(NDBINFO_SQL_EXE comp_sql LOCATION)
 ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_SOURCE_DIR}/storage/ndb/tools/ndbinfo.sql
                    COMMAND ${NDBINFO_SQL_EXE} > ndbinfo.sql

Attachment: [text/bzr-bundle] bzr/[e-mail]