bzr commit into mysql-5.1-telco-7.0 branch (jack:2936) Bug#45402

[jack andrews]

#At file:///C:/w/repo/mysql-5.1-telco-7.0-bug45402/ based on revid:jack@stripped

 2936 jack andrews	2009-06-29
      Bug #45402  	Win32AsyncFile::rmrfReq can run an infinite loop
        - the first step:
           . move mgmsrv/DirIterator.?pp to util
           . alter make files to build ndbgeneral with DirIterator
        - more to come.

    renamed:
      storage/ndb/src/mgmsrv/DirIterator.cpp => storage/ndb/src/common/util/DirIterator.cpp
      storage/ndb/src/mgmsrv/DirIterator.hpp => storage/ndb/include/util/DirIterator.hpp
    modified:
      storage/ndb/src/common/util/CMakeLists.txt
      storage/ndb/src/common/util/Makefile.am
      storage/ndb/src/mgmsrv/CMakeLists.txt
      storage/ndb/src/mgmsrv/Makefile.am
=== renamed file 'storage/ndb/src/mgmsrv/DirIterator.hpp' => 'storage/ndb/include/util/DirIterator.hpp'
=== modified file 'storage/ndb/src/common/util/CMakeLists.txt'
--- a/storage/ndb/src/common/util/CMakeLists.txt	2009-06-02 14:00:06 +0000
+++ b/storage/ndb/src/common/util/CMakeLists.txt	2009-06-29 10:15:39 +0000
@@ -54,6 +54,7 @@ ADD_LIBRARY(ndbgeneral STATIC
             basestring_vsnprintf.c
             Bitmask.cpp
 	    ndbinfo.c
+	    DirIterator.cpp
 )
 TARGET_LINK_LIBRARIES(ndbgeneral zlib)
 
@@ -67,3 +68,8 @@ SET_TARGET_PROPERTIES(Bitmask-t
                       PROPERTIES COMPILE_FLAGS "-DTEST_BITMASK")
 TARGET_LINK_LIBRARIES(Bitmask-t ndbgeneral)
 
+ADD_EXECUTABLE(DirIterator-t DirIterator.cpp)
+SET_TARGET_PROPERTIES(DirIterator-t
+                      PROPERTIES COMPILE_FLAGS "-DTAP_TEST")
+TARGET_LINK_LIBRARIES(DirIterator-t ndbgeneral mysys wsock32)
+

=== renamed file 'storage/ndb/src/mgmsrv/DirIterator.cpp' => 'storage/ndb/src/common/util/DirIterator.cpp'
=== modified file 'storage/ndb/src/common/util/Makefile.am'
--- a/storage/ndb/src/common/util/Makefile.am	2009-06-03 16:04:23 +0000
+++ b/storage/ndb/src/common/util/Makefile.am	2009-06-29 10:15:39 +0000
@@ -29,14 +29,20 @@ libgeneral_la_SOURCES = \
             ConfigValues.cpp ndb_init.cpp basestring_vsnprintf.c \
             Bitmask.cpp \
 	    ndb_rand.c \
-	    ndbinfo.c
+	    ndbinfo.c DirIterator.cpp
 
 INCLUDES_LOC = @ZLIB_INCLUDES@
 
 libndbazio_la_SOURCES = azio.c
 libndbazio_la_LIBADD = @ZLIB_LIBS@
 
-noinst_PROGRAMS = BaseString-t HashMap-t Bitmask-t
+noinst_PROGRAMS = BaseString-t HashMap-t Bitmask-t DirIterator-t
+
+DirIterator_t_SOURCES = DirIterator.cpp
+DirIterator_t_CXXFLAGS = -DTAP_TEST
+DirIterator_t_LDADD = \
+	libgeneral.la \
+	$(top_builddir)/mysys/libmysyslt.la
 
 BaseString_t_SOURCES = BaseString.cpp
 BaseString_t_CXXFLAGS = -DTEST_BASE_STRING

=== modified file 'storage/ndb/src/mgmsrv/CMakeLists.txt'
--- a/storage/ndb/src/mgmsrv/CMakeLists.txt	2008-10-24 12:41:10 +0000
+++ b/storage/ndb/src/mgmsrv/CMakeLists.txt	2009-06-29 10:15:39 +0000
@@ -41,6 +41,5 @@ ADD_EXECUTABLE(ndb_mgmd
                MgmtSrvr.cpp
                main.cpp
                Services.cpp
-               ConfigManager.cpp
-               DirIterator.cpp)
+               ConfigManager.cpp)
 TARGET_LINK_LIBRARIES(ndb_mgmd ndbconf)

=== modified file 'storage/ndb/src/mgmsrv/Makefile.am'
--- a/storage/ndb/src/mgmsrv/Makefile.am	2009-05-27 15:21:45 +0000
+++ b/storage/ndb/src/mgmsrv/Makefile.am	2009-06-29 10:15:39 +0000
@@ -31,8 +31,7 @@ ndb_mgmd_SOURCES = \
 	InitConfigFileParser.cpp \
 	Config.cpp \
 	mgm_ndbinfo.cpp \
-	ConfigManager.cpp \
-	DirIterator.cpp
+	ConfigManager.cpp
 
 noinst_PROGRAMS = testConfig
 


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