Commit cf9d738b authored by unknown's avatar unknown
Browse files

fix for windows build 


CMakeLists.txt:
  add for federated
libmysqld/CMakeLists.txt:
  ha_heap.cc and ha_myisam.cc are removed
  add for federated
sql/CMakeLists.txt:
  add for federated
sql/handler.cc:
  fix for fussy compilers
storage/heap/CMakeLists.txt:
  add ha_heap.cc
storage/myisammrg/CMakeLists.txt:
  add ha_myisammrg.cc
parent 4ec86b1c

CMakeLists.txt

+3 −0
Original line number Diff line number Diff line
@@ -140,6 +140,9 @@ ENDIF(WITH_CSV_STORAGE_ENGINE) 
IF(WITH_EXAMPLE_STORAGE_ENGINE)

  ADD_SUBDIRECTORY(storage/example)

ENDIF(WITH_EXAMPLE_STORAGE_ENGINE)

IF(WITH_FEDERATED_STORAGE_ENGINE)

  ADD_SUBDIRECTORY(storage/federated)

ENDIF(WITH_FEDERATED_STORAGE_ENGINE)

IF(WITH_INNOBASE_STORAGE_ENGINE)

  ADD_SUBDIRECTORY(storage/innobase)

ENDIF(WITH_INNOBASE_STORAGE_ENGINE)

libmysqld/CMakeLists.txt

+4 −2
Original line number Diff line number Diff line
@@ -30,8 +30,7 @@ ADD_LIBRARY(mysqldemb emb_qcache.cc libmysqld.c lib_sql.cc 
            ../sql-common/pack.c ../sql/derror.cc ../sql/event_scheduler.cc

            ../sql/event_timed.cc ../sql/events.cc ../sql/discover.cc

            ../sql/field_conv.cc ../sql/field.cc ../sql/filesort.cc

            ../sql/gstream.cc ../sql/ha_heap.cc ../sql/ha_myisam.cc

            ../sql/ha_myisammrg.cc ${mysql_se_ha_src}

            ../sql/gstream.cc ${mysql_se_ha_src}

            ../sql/handler.cc ../sql/hash_filo.cc

            ../sql/hostname.cc ../sql/init.cc ../sql/item_buff.cc

            ../sql/item_cmpfunc.cc ../sql/item.cc ../sql/item_create.cc
@@ -80,6 +79,9 @@ ENDIF(WITH_ARCHIVE_STORAGE_ENGINE) 
IF(WITH_EXAMPLE_STORAGE_ENGINE)

  ADD_DEPENDENCIES(mysqlserver example)

ENDIF(WITH_EXAMPLE_STORAGE_ENGINE)

IF(WITH_FEDERATED_STORAGE_ENGINE)

  ADD_DEPENDENCIES(mysqlserver federated)

ENDIF(WITH_FEDERATED_STORAGE_ENGINE)

IF(WITH_INNOBASE_STORAGE_ENGINE)

  ADD_DEPENDENCIES(mysqlserver innobase)

ENDIF(WITH_INNOBASE_STORAGE_ENGINE)

sql/CMakeLists.txt

+3 −0
Original line number Diff line number Diff line
@@ -75,6 +75,9 @@ ENDIF(WITH_CSV_STORAGE_ENGINE) 
IF(WITH_EXAMPLE_STORAGE_ENGINE)

  TARGET_LINK_LIBRARIES(mysqld example)

ENDIF(WITH_EXAMPLE_STORAGE_ENGINE)

IF(WITH_FEDERATED_STORAGE_ENGINE)

  TARGET_LINK_LIBRARIES(mysqld federated)

ENDIF(WITH_FEDERATED_STORAGE_ENGINE)

IF(WITH_INNOBASE_STORAGE_ENGINE)

  TARGET_LINK_LIBRARIES(mysqld innobase)

ENDIF(WITH_INNOBASE_STORAGE_ENGINE)

sql/handler.cc

+1 −1
Original line number Diff line number Diff line
@@ -3515,7 +3515,7 @@ int handler::ha_reset() 
  /* Check that we have called all proper delallocation functions */

  DBUG_ASSERT((byte*) table->def_read_set.bitmap +

              table->s->column_bitmap_size ==

              (char*) table->def_write_set.bitmap);

              (byte*) table->def_write_set.bitmap);

  DBUG_ASSERT(bitmap_is_set_all(&table->s->all_set));

  DBUG_ASSERT(table->key_read == 0);

  /* ensure that ha_index_end / ha_rnd_end has been called */

storage/heap/CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib 
                    ${CMAKE_SOURCE_DIR}/regex

                    ${CMAKE_SOURCE_DIR}/extra/yassl/include)

ADD_LIBRARY(heap _check.c _rectest.c hp_block.c hp_clear.c hp_close.c hp_create.c

				ha_heap.cc

				hp_delete.c hp_extra.c hp_hash.c hp_info.c hp_open.c hp_panic.c

				hp_rename.c hp_rfirst.c hp_rkey.c hp_rlast.c hp_rnext.c hp_rprev.c

				hp_rrnd.c hp_rsame.c hp_scan.c hp_static.c hp_update.c hp_write.c)