bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:3200)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@strippedaqudwetw2w

 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
=== 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"
-
-

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