MySQL 5.1 -> MariaDB 5.1 merge: windows build fixes

CMakeLists.txt

@@ -137,6 +137,7 @@ ENDIF(MSVC)
 
 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

sql/CMakeLists.txt

@@ -25,6 +25,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
                     ${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 @@ ADD_EXECUTABLE(mysqld cmake_dummy.cc)
 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)
 

storage/maria/CMakeLists.txt

@@ -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 @@ SET(MARIA_SOURCES ma_init.c ma_open.c ma_extra.c ma_info.c ma_rkey.c
             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)
 

storage/maria/ma_rt_index.c

@@ -1134,12 +1134,12 @@ my_bool maria_rtree_real_delete(MARIA_HA *info, MARIA_KEY *key,
     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)
     {

unittest/mysys/waiting_threads-t.c

@@ -263,6 +263,7 @@ void do_tests()
   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;                              \