At file:///home/psergey/bzr-new/mysql-5.1-maria-contd3/ ------------------------------------------------------------ revno: 2730 revision-id: psergey@askmonty.org-20090914224548-yho0nxw78vvxd5yi parent: knielsen@knielsen-hq.org-20090912073839-2jfav265c8pkm1ae committer: Sergey Petrunya <psergey@askmonty.org> branch nick: mysql-5.1-maria-contd3 timestamp: Tue 2009-09-15 02:45:48 +0400 message: MySQL 5.1 -> MariaDB 5.1 merge: windows build fixes === modified file 'CMakeLists.txt' --- a/CMakeLists.txt 2009-09-07 20:50:10 +0000 +++ b/CMakeLists.txt 2009-09-14 22:45:48 +0000 @@ -137,6 +137,7 @@ IF(WIN32) ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D_CRT_SECURE_NO_DEPRECATE") + ADD_DEFINITIONS("-D_WIN32_WINNT=0x0501") ENDIF(WIN32) # default to x86 platform. We'll check for X64 in a bit === modified file 'sql/CMakeLists.txt' --- a/sql/CMakeLists.txt 2009-09-07 20:50:10 +0000 +++ b/sql/CMakeLists.txt 2009-09-14 22:45:48 +0000 @@ -25,6 +25,7 @@ ${CMAKE_SOURCE_DIR}/sql ${CMAKE_SOURCE_DIR}/regex ${CMAKE_SOURCE_DIR}/zlib + ${CMAKE_SOURCE_DIR}/extra/libevent ) SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/sql/sql_yacc.h @@ -93,7 +94,7 @@ SET_TARGET_PROPERTIES(mysqld PROPERTIES OUTPUT_NAME mysqld${MYSQLD_EXE_SUFFIX}) SET_TARGET_PROPERTIES(mysqld PROPERTIES ENABLE_EXPORTS TRUE) -SET (MYSQLD_CORE_LIBS mysys zlib dbug strings yassl taocrypt vio regex sql) +SET (MYSQLD_CORE_LIBS mysys zlib dbug strings yassl taocrypt vio regex sql libevent) TARGET_LINK_LIBRARIES(mysqld ${MYSQLD_CORE_LIBS} ${MYSQLD_STATIC_ENGINE_LIBS}) TARGET_LINK_LIBRARIES(mysqld ws2_32.lib) === modified file 'storage/maria/CMakeLists.txt' --- a/storage/maria/CMakeLists.txt 2008-06-09 09:06:06 +0000 +++ b/storage/maria/CMakeLists.txt 2009-09-14 22:45:48 +0000 @@ -12,8 +12,10 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +INCLUDE("${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake") INCLUDE("${PROJECT_SOURCE_DIR}/win/mysql_manifest.cmake") + SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") @@ -46,10 +48,9 @@ ha_maria.h maria_def.h ma_recovery_util.c ) +MYSQL_STORAGE_ENGINE(MARIA) IF(NOT SOURCE_SUBLIBS) - ADD_LIBRARY(maria ${MARIA_SOURCES}) - ADD_EXECUTABLE(maria_ftdump maria_ftdump.c) TARGET_LINK_LIBRARIES(maria_ftdump maria myisam mysys dbug strings zlib wsock32) === modified file 'storage/maria/ma_rt_index.c' --- a/storage/maria/ma_rt_index.c 2009-02-19 09:01:25 +0000 +++ b/storage/maria/ma_rt_index.c 2009-09-14 22:45:48 +0000 @@ -1134,12 +1134,12 @@ uint nod_flag; ulong i; MARIA_KEY tmp_key; + uchar *page_buf; + MARIA_PAGE page; tmp_key.keyinfo= key->keyinfo; tmp_key.data_length= key->data_length; tmp_key.ref_length= key->ref_length; tmp_key.flag= 0; /* Safety */ - uchar *page_buf; - MARIA_PAGE page; if (ReinsertList.n_pages) { === modified file 'unittest/mysys/waiting_threads-t.c' --- a/unittest/mysys/waiting_threads-t.c 2009-03-20 11:41:30 +0000 +++ b/unittest/mysys/waiting_threads-t.c 2009-09-14 22:45:48 +0000 @@ -263,6 +263,7 @@ kill_strategy=X; \ do_one_test(); #else + #define test_kill_strategy(X) \ diag("kill strategy: " #X); \ DBUG_PRINT("info", ("kill strategy: " #X)); \ kill_strategy=X; \