Commit c8a6b027 authored by unknown's avatar unknown
Browse files

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug22224/my50-bug22224 

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
parents 3044afa8 69aa7b40

CMakeLists.txt

+4 −2
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ IF (WITH_MYISAMMRG_STORAGE_ENGINE) 
ENDIF (WITH_MYISAMMRG_STORAGE_ENGINE)



IF(WITH_INNOBASE_STORAGE_ENGINE)

  CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/innobase/ib_config.h.in

               ${CMAKE_SOURCE_DIR}/innobase/ib_config.h @ONLY)

  ADD_DEFINITIONS(-D HAVE_INNOBASE_DB)

  ADD_DEFINITIONS(-D WITH_INNOBASE_STORAGE_ENGINE)

  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_innobase_plugin")
@@ -123,8 +121,12 @@ ADD_SUBDIRECTORY(heap) 
ADD_SUBDIRECTORY(myisam)

ADD_SUBDIRECTORY(myisammrg)

ADD_SUBDIRECTORY(client)

IF(WITH_BERKELEY_STORAGE_ENGINE)

ADD_SUBDIRECTORY(bdb)

ENDIF(WITH_BERKELEY_STORAGE_ENGINE)

IF(WITH_INNOBASE_STORAGE_ENGINE)

ADD_SUBDIRECTORY(innobase)

ENDIF(WITH_INNOBASE_STORAGE_ENGINE)

ADD_SUBDIRECTORY(sql)

ADD_SUBDIRECTORY(sql/examples)

ADD_SUBDIRECTORY(server-tools/instance-manager)

innobase/include/univ.i

+2 −0
Original line number Diff line number Diff line
@@ -39,8 +39,10 @@ if we are compiling on Windows. */ 
#undef PACKAGE

#undef VERSION



#if !defined(__WIN__) && !defined(WIN64) && !defined(_WIN64)

/* Include the header file generated by GNU autoconf */

#include "../ib_config.h"

#endif



#ifdef HAVE_SCHED_H

#include <sched.h>