mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
50ceea65cf
into mysql.com:/home/my/mysql-new BitKeeper/etc/ignore: auto-union BUILD/SETUP.sh: Auto merged CMakeLists.txt: Auto merged client/get_password.c: Auto merged client/mysqldump.c: Auto merged client/mysqltest.c: Auto merged cmd-line-utils/readline/bind.c: Auto merged cmd-line-utils/readline/display.c: Auto merged cmd-line-utils/readline/histexpand.c: Auto merged cmd-line-utils/readline/history.c: Auto merged cmd-line-utils/readline/readline.c: Auto merged cmd-line-utils/readline/text.c: Auto merged dbug/user.r: Auto merged extra/yassl/src/handshake.cpp: Auto merged include/config-win.h: Auto merged include/m_string.h: Auto merged include/my_global.h: Auto merged include/my_pthread.h: Auto merged include/mysql/plugin.h: Auto merged include/mysql_com.h: Auto merged include/thr_alarm.h: Auto merged libmysql/CMakeLists.txt: Auto merged libmysql/Makefile.shared: Auto merged libmysql/dll.c: Auto merged libmysql/get_password.c: Auto merged libmysql/libmysql.c: Auto merged libmysqld/Makefile.am: Auto merged mysql-test/lib/mtr_cases.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/alter_table.result: Auto merged mysql-test/r/change_user.result: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/r/merge.result: Auto merged mysql-test/r/mix2_myisam.result: Auto merged mysql-test/r/mysqldump.result: Auto merged mysql-test/r/query_cache.result: Auto merged mysql-test/r/subselect.result: Auto merged mysql-test/valgrind.supp: Auto merged mysql-test/r/view.result: Auto merged mysql-test/suite/rpl/r/rpl_events.result: Auto merged mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test: Auto merged mysql-test/t/create.test: Auto merged mysql-test/t/mysqldump.test: Auto merged mysql-test/t/query_cache.test: Auto merged mysql-test/t/subselect.test: Auto merged mysql-test/t/variables.test: Auto merged mysql-test/t/view.test: Auto merged mysys/mf_iocache.c: Auto merged mysys/mf_tempfile.c: Auto merged mysys/my_atomic.c: Auto merged mysys/my_bit.c: Auto merged mysys/my_bitmap.c: Auto merged mysys/my_compress.c: Auto merged mysys/my_create.c: Auto merged mysys/my_delete.c: Auto merged mysys/my_error.c: Auto merged mysys/my_init.c: Auto merged mysys/my_open.c: Auto merged mysys/my_realloc.c: Auto merged mysys/my_rename.c: Auto merged mysys/my_symlink.c: Auto merged mysys/my_sync.c: Auto merged mysys/my_thr_init.c: Auto merged mysys/thr_alarm.c: Auto merged mysys/thr_lock.c: Auto merged scripts/make_binary_distribution.sh: Auto merged server-tools/instance-manager/mysql_connection.cc: Auto merged sql/CMakeLists.txt: Auto merged sql/Makefile.am: Auto merged sql/events.cc: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/filesort.cc: Auto merged sql/gen_lex_hash.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/ha_partition.h: Auto merged sql/handler.h: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged sql/item_subselect.cc: Auto merged sql/lock.cc: Auto merged sql/log.cc: Auto merged sql/log_event.cc: Auto merged sql/net_serv.cc: Auto merged sql/opt_range.cc: Auto merged sql/partition_info.cc: Auto merged sql/rpl_injector.cc: Auto merged sql/set_var.cc: Auto merged sql/slave.cc: Auto merged sql/slave.h: Auto merged sql/sp_head.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_delete.cc: Auto merged sql/sql_load.cc: Auto merged sql/sql_plugin.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_test.cc: Auto merged sql/sql_union.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged sql/table.h: Auto merged sql/unireg.cc: Auto merged sql/share/errmsg.txt: Auto merged storage/csv/ha_tina.cc: Auto merged storage/csv/ha_tina.h: Auto merged storage/myisam/CMakeLists.txt: Auto merged storage/myisam/ft_boolean_search.c: Auto merged storage/myisam/ft_eval.c: Auto merged storage/myisam/ft_nlq_search.c: Auto merged storage/myisam/ft_parser.c: Auto merged storage/myisam/ft_static.c: Auto merged storage/myisam/ft_stopwords.c: Auto merged storage/myisam/ft_test1.c: Auto merged storage/myisam/ft_update.c: Auto merged storage/myisam/ha_myisam.cc: Auto merged storage/myisam/mi_check.c: Auto merged storage/myisam/mi_create.c: Auto merged storage/myisam/mi_delete.c: Auto merged storage/myisam/mi_delete_all.c: Auto merged storage/myisam/mi_dynrec.c: Auto merged storage/myisam/mi_key.c: Auto merged storage/myisam/mi_packrec.c: Auto merged storage/myisam/mi_range.c: Auto merged storage/myisam/mi_search.c: Auto merged storage/myisam/mi_test1.c: Auto merged storage/myisam/mi_test2.c: Auto merged storage/myisam/mi_test3.c: Auto merged storage/myisam/mi_unique.c: Auto merged storage/myisam/mi_write.c: Auto merged storage/myisam/myisamchk.c: Auto merged storage/myisam/myisamdef.h: Auto merged storage/myisam/myisampack.c: Auto merged storage/myisam/sort.c: Auto merged storage/myisam/sp_test.c: Auto merged support-files/mysql.spec.sh: Auto merged tests/mysql_client_test.c: Auto merged configure.in: Manual merge dbug/dbug.c: Restore to original state in Maria tree The big diff comes from a wrong pull from 5.0 -> 5.1 after backporting dbug to 5.0 from 5.1 include/Makefile.am: Manual merge include/my_atomic.h: Ignore changes include/my_base.h: Manual merge include/my_dbug.h: Use orginal my_dbug.h from maria tree include/my_handler.h: Manual merge include/my_sys.h: Manual merge include/myisam.h: Manual merge mysql-test/lib/mtr_report.pl: Manual merge mysql-test/r/myisam.result: Manual merge mysql-test/suite/binlog/r/binlog_unsafe.result: Manual merge mysql-test/suite/binlog/t/binlog_unsafe.test: Manual merge mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result: Manual merge mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result: No changes mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test: Manual merge mysql-test/t/change_user.test: Manual merge mysql-test/t/disabled.def: Manual merge mysql-test/t/merge.test: No changes mysql-test/t/myisam.test: Manual merge mysys/Makefile.am: Manual merge mysys/array.c: Manual merge mysys/mf_keycache.c: Manual merge mysys/my_getsystime.c: Manual merge mysys/my_handler.c: Manual merge mysys/my_pread.c: Manual merge mysys/safemalloc.c: Manual merge sql/ha_partition.cc: Manual merge sql/handler.cc: Manual merge sql/lex.h: Manual merge sql/mysql_priv.h: Manual merge sql/mysqld.cc: Manual merge sql/set_var.h: Manual merge sql/sql_class.cc: Manual merge sql/sql_insert.cc: Manual merge sql/sql_parse.cc: Manual merge sql/sql_select.cc: Manual merge sql/sql_show.cc: Manual merge sql/sql_table.cc: Manual merge storage/myisam/mi_checksum.c: No changes storage/myisam/mi_extra.c: Manual merge storage/myisam/mi_open.c: Manual merge storage/myisammrg/ha_myisammrg.cc: Manual merge strings/strmake.c: No changes
175 lines
8 KiB
CMake
Executable file
175 lines
8 KiB
CMake
Executable file
# Copyright (C) 2006 MySQL AB
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; version 2 of the License.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# 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}/win/mysql_manifest.cmake")
|
|
|
|
SET(CMAKE_CXX_FLAGS_DEBUG
|
|
"${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR /Zi")
|
|
SET(CMAKE_C_FLAGS_DEBUG
|
|
"${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR /Zi")
|
|
SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /MAP /MAPINFO:EXPORTS")
|
|
|
|
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
|
|
${CMAKE_SOURCE_DIR}/extra/yassl/include
|
|
${CMAKE_SOURCE_DIR}/sql
|
|
${CMAKE_SOURCE_DIR}/regex
|
|
${CMAKE_SOURCE_DIR}/zlib
|
|
)
|
|
|
|
SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/sql/message.rc
|
|
${CMAKE_SOURCE_DIR}/sql/message.h
|
|
${CMAKE_SOURCE_DIR}/sql/sql_yacc.h
|
|
${CMAKE_SOURCE_DIR}/sql/sql_yacc.cc
|
|
${CMAKE_SOURCE_DIR}/include/mysql_version.h
|
|
${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc
|
|
${CMAKE_SOURCE_DIR}/sql/lex_hash.h
|
|
${PROJECT_SOURCE_DIR}/include/mysqld_error.h
|
|
${PROJECT_SOURCE_DIR}/include/mysqld_ername.h
|
|
${PROJECT_SOURCE_DIR}/include/sql_state.h
|
|
PROPERTIES GENERATED 1)
|
|
|
|
ADD_DEFINITIONS(-DMYSQL_SERVER -D_CONSOLE -DHAVE_DLOPEN)
|
|
|
|
ADD_EXECUTABLE(mysqld
|
|
../sql-common/client.c derror.cc des_key_file.cc
|
|
discover.cc ../libmysql/errmsg.c field.cc stacktrace.c stacktrace.h field_conv.cc
|
|
filesort.cc gstream.cc
|
|
ha_partition.cc
|
|
handler.cc hash_filo.cc hash_filo.h
|
|
hostname.cc init.cc item.cc item_buff.cc item_cmpfunc.cc
|
|
item_create.cc item_func.cc item_geofunc.cc item_row.cc
|
|
item_strfunc.cc item_subselect.cc item_sum.cc item_timefunc.cc
|
|
key.cc log.cc lock.cc message.rc
|
|
log_event.cc rpl_record.cc rpl_reporting.cc
|
|
log_event_old.cc rpl_record_old.cc
|
|
message.h mf_iocache.cc my_decimal.cc ../sql-common/my_time.c
|
|
mysqld.cc net_serv.cc
|
|
nt_servc.cc nt_servc.h opt_range.cc opt_range.h opt_sum.cc
|
|
../sql-common/pack.c parse_file.cc password.c procedure.cc
|
|
protocol.cc records.cc repl_failsafe.cc rpl_filter.cc set_var.cc
|
|
slave.cc sp.cc sp_cache.cc sp_head.cc sp_pcontext.cc
|
|
sp_rcontext.cc spatial.cc sql_acl.cc sql_analyse.cc sql_base.cc
|
|
sql_cache.cc sql_class.cc sql_client.cc sql_crypt.cc sql_crypt.h
|
|
sql_cursor.cc sql_db.cc sql_delete.cc sql_derived.cc sql_do.cc
|
|
sql_error.cc sql_handler.cc sql_help.cc sql_insert.cc sql_lex.cc
|
|
sql_list.cc sql_load.cc sql_manager.cc sql_map.cc sql_parse.cc
|
|
sql_partition.cc sql_plugin.cc sql_prepare.cc sql_rename.cc
|
|
sql_repl.cc sql_select.cc sql_show.cc sql_state.c sql_string.cc
|
|
sql_table.cc sql_test.cc sql_trigger.cc sql_udf.cc sql_union.cc
|
|
sql_update.cc sql_view.cc strfunc.cc table.cc thr_malloc.cc
|
|
time.cc tztime.cc uniques.cc unireg.cc item_xmlfunc.cc
|
|
rpl_tblmap.cc sql_binlog.cc event_scheduler.cc event_data_objects.cc
|
|
event_queue.cc event_db_repository.cc
|
|
sql_tablespace.cc events.cc ../sql-common/my_user.c
|
|
partition_info.cc rpl_utility.cc rpl_injector.cc sql_locale.cc
|
|
rpl_rli.cc rpl_mi.cc sql_servers.cc
|
|
sql_connect.cc scheduler.cc
|
|
sql_profile.cc
|
|
${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc
|
|
${PROJECT_SOURCE_DIR}/sql/sql_yacc.h
|
|
${PROJECT_SOURCE_DIR}/include/mysqld_error.h
|
|
${PROJECT_SOURCE_DIR}/include/mysqld_ername.h
|
|
${PROJECT_SOURCE_DIR}/include/sql_state.h
|
|
${PROJECT_SOURCE_DIR}/include/mysql_version.h
|
|
${PROJECT_SOURCE_DIR}/sql/sql_builtin.cc
|
|
${PROJECT_SOURCE_DIR}/sql/lex_hash.h)
|
|
|
|
TARGET_LINK_LIBRARIES(mysqld
|
|
heap myisam myisammrg mysys yassl zlib debug dbug yassl
|
|
taocrypt strings vio regex wsock32 ws2_32)
|
|
|
|
SET_TARGET_PROPERTIES(mysqld PROPERTIES OUTPUT_NAME mysqld${MYSQLD_EXE_SUFFIX})
|
|
|
|
IF(cmake_version EQUAL 20406)
|
|
# Work around for 2.4.6 bug, OUTPUT_NAME will not set the right .PDB
|
|
# file name. Note that COMPILE_FLAGS set some temporary pdb during build,
|
|
# LINK_FLAGS sets the real one.
|
|
SET_TARGET_PROPERTIES(mysqld PROPERTIES
|
|
COMPILE_FLAGS "/Fd${CMAKE_CFG_INTDIR}/mysqld${MYSQLD_EXE_SUFFIX}.pdb"
|
|
LINK_FLAGS "/PDB:${CMAKE_CFG_INTDIR}/mysqld${MYSQLD_EXE_SUFFIX}.pdb")
|
|
ENDIF(cmake_version EQUAL 20406)
|
|
|
|
IF(EMBED_MANIFESTS)
|
|
MYSQL_EMBED_MANIFEST("mysqld" "asInvoker")
|
|
ENDIF(EMBED_MANIFESTS)
|
|
IF(WITH_ARCHIVE_STORAGE_ENGINE)
|
|
TARGET_LINK_LIBRARIES(mysqld archive)
|
|
ENDIF(WITH_ARCHIVE_STORAGE_ENGINE)
|
|
IF(WITH_BLACKHOLE_STORAGE_ENGINE)
|
|
TARGET_LINK_LIBRARIES(mysqld blackhole)
|
|
ENDIF(WITH_BLACKHOLE_STORAGE_ENGINE)
|
|
IF(WITH_CSV_STORAGE_ENGINE)
|
|
TARGET_LINK_LIBRARIES(mysqld csv)
|
|
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)
|
|
IF(WITH_MARIA_STORAGE_ENGINE)
|
|
TARGET_LINK_LIBRARIES(mysqld maria)
|
|
ENDIF(WITH_MARIA_STORAGE_ENGINE)
|
|
|
|
ADD_DEPENDENCIES(mysqld GenError)
|
|
|
|
# NOTE CMake 2.4.6 creates strange dependencies between files in OUTPUT,
|
|
# so for now we only list one if more than one
|
|
|
|
# Sql Parser custom command
|
|
ADD_CUSTOM_COMMAND(
|
|
OUTPUT ${PROJECT_SOURCE_DIR}/sql/sql_yacc.h
|
|
# ${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc
|
|
COMMAND bison.exe ARGS -y -p MYSQL --defines=sql_yacc.h
|
|
--output=sql_yacc.cc sql_yacc.yy
|
|
DEPENDS ${PROJECT_SOURCE_DIR}/sql/sql_yacc.yy)
|
|
|
|
IF(WIN32)
|
|
# Windows message file
|
|
ADD_CUSTOM_COMMAND(
|
|
OUTPUT ${PROJECT_SOURCE_DIR}/sql/message.h
|
|
# ${PROJECT_SOURCE_DIR}/sql/message.rc
|
|
COMMAND mc ARGS message.mc
|
|
DEPENDS ${PROJECT_SOURCE_DIR}/sql/message.mc)
|
|
ENDIF(WIN32)
|
|
|
|
# Gen_lex_hash
|
|
ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
|
|
TARGET_LINK_LIBRARIES(gen_lex_hash debug dbug mysqlclient wsock32)
|
|
GET_TARGET_PROPERTY(GEN_LEX_HASH_EXE gen_lex_hash LOCATION)
|
|
ADD_CUSTOM_COMMAND(
|
|
OUTPUT ${PROJECT_SOURCE_DIR}/sql/lex_hash.h
|
|
COMMAND ${GEN_LEX_HASH_EXE} ARGS > lex_hash.h
|
|
DEPENDS ${GEN_LEX_HASH_EXE})
|
|
|
|
ADD_CUSTOM_TARGET(
|
|
GenServerSource ALL
|
|
DEPENDS ${PROJECT_SOURCE_DIR}/sql/sql_yacc.h
|
|
# ${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc
|
|
${PROJECT_SOURCE_DIR}/sql/message.h
|
|
# ${PROJECT_SOURCE_DIR}/sql/message.rc
|
|
${PROJECT_SOURCE_DIR}/sql/lex_hash.h)
|
|
|
|
ADD_DEPENDENCIES(mysqld GenServerSource)
|
|
|
|
# Remove the auto-generated files as part of 'Clean Solution'
|
|
SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
|
|
"lex_hash.h;message.rc;message.h;sql_yacc.h;sql_yacc.cc")
|
|
|
|
ADD_LIBRARY(udf_example MODULE udf_example.c udf_example.def)
|
|
ADD_DEPENDENCIES(udf_example strings GenError)
|
|
TARGET_LINK_LIBRARIES(udf_example strings wsock32)
|