List:Commits« Previous MessageNext Message »
From:Stewart Smith Date:August 22 2008 12:24am
Subject:bzr push into mysql-5.1 branch (stewart:2796 to 2798)
View as plain text  
 2798 Stewart Smith	2008-08-22
      CreateEvnt.cpp isn't built in Makefile.am, don't include in Cmake
modified:
  storage/ndb/src/common/debugger/signaldata/CMakeLists.txt

 2797 Stewart Smith	2008-08-22
      add my_times.c to EXTRA_DIST (needed on win32)
modified:
  mysys/Makefile.am

 2796 Stewart Smith	2008-08-22
      Add PARTITION to config.cmake (allowing selection from Cmake UI). Automatically enable partitioning if NDB engine is enabled.
modified:
  config.cmake

=== modified file 'mysys/Makefile.am'
--- a/mysys/Makefile.am	2008-04-28 00:09:08 +0000
+++ b/mysys/Makefile.am	2008-08-22 00:20:57 +0000
@@ -72,7 +72,7 @@ libmysyslt_la_SOURCES =	my_init.c my_get
 			thr_mutex.c thr_rwlock.c \
 			mf_soundex.c \
 			my_conio.c my_wincond.c my_winthread.c
-EXTRA_DIST =  		CMakeLists.txt 
+EXTRA_DIST =  		CMakeLists.txt my_times.c
 
 DEFS =			-DDEFAULT_BASEDIR=\"$(prefix)\" \
 			-DDATADIR="\"$(MYSQLDATAdir)\"" \

=== modified file 'storage/ndb/src/common/debugger/signaldata/CMakeLists.txt'
--- a/storage/ndb/src/common/debugger/signaldata/CMakeLists.txt	2008-08-20 13:22:09 +0000
+++ b/storage/ndb/src/common/debugger/signaldata/CMakeLists.txt	2008-08-22 00:22:44 +0000
@@ -17,7 +17,7 @@
 INCLUDE(${CMAKE_SOURCE_DIR}/storage/ndb/config/type_ndbapi.cmake)
 ADD_LIBRARY(ndbsignaldata STATIC
         AlterIndxImpl.cpp BuildIndxImpl.cpp BuildIndx.cpp
-        CreateEvnt.cpp CreateIndxImpl.cpp CreateTab.cpp
+        CreateIndxImpl.cpp CreateTab.cpp
         CreateTable.cpp CreateTrigImpl.cpp #DihSwitchReplicaReq.cpp
         DropIndxImpl.cpp DropTable.cpp DropTrigImpl.cpp
         GetTabInfo.cpp

Thread
bzr push into mysql-5.1 branch (stewart:2796 to 2798) Stewart Smith22 Aug