mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
f0ae3ce9b9
Fixed compile-pentium64 scripts Fixed wrong estimate of update_with_key_prefix in sql-bench Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into mysql.com:/home/my/mysql-5.1 Fixed unsafe define of uint4korr() Fixed that --extern works with mysql-test-run.pl Small trivial cleanups This also fixes a bug in counting number of rows that are updated when we have many simultanous queries Move all connection handling and command exectuion main loop from sql_parse.cc to sql_connection.cc Split handle_one_connection() into reusable sub functions. Split create_new_thread() into reusable sub functions. Added thread_scheduler; Preliminary interface code for future thread_handling code. Use 'my_thread_id' for internal thread id's Make thr_alarm_kill() to depend on thread_id instead of thread Make thr_abort_locks_for_thread() depend on thread_id instead of thread In store_globals(), set my_thread_var->id to be thd->thread_id. Use my_thread_var->id as basis for my_thread_name() The above changes makes the connection we have between THD and threads more soft. Added a lot of DBUG_PRINT() and DBUG_ASSERT() functions Fixed compiler warnings Fixed core dumps when running with --debug Removed setting of signal masks (was never used) Made event code call pthread_exit() (portability fix) Fixed that event code doesn't call DBUG_xxx functions before my_thread_init() is called. Made handling of thread_id and thd->variables.pseudo_thread_id uniform. Removed one common 'not freed memory' warning from mysqltest Fixed a couple of usage of not initialized warnings (unlikely cases) Suppress compiler warnings from bdb and (for the moment) warnings from ndb
106 lines
5.3 KiB
CMake
106 lines
5.3 KiB
CMake
# 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
|
|
|
|
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
|
|
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
|
|
|
|
# Need to set USE_TLS, since __declspec(thread) approach to thread local
|
|
# storage does not work properly in DLLs.
|
|
ADD_DEFINITIONS(-DUSE_TLS -DMYSQL_SERVER -DEMBEDDED_LIBRARY)
|
|
|
|
# The old Windows build method used renamed (.cc -> .cpp) source files, fails
|
|
# in #include in lib_sql.cc. So disable that using the USING_CMAKE define.
|
|
ADD_DEFINITIONS(-DUSING_CMAKE)
|
|
|
|
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
|
|
${CMAKE_SOURCE_DIR}/libmysqld
|
|
${CMAKE_SOURCE_DIR}/libmysql
|
|
${CMAKE_SOURCE_DIR}/sql
|
|
${CMAKE_SOURCE_DIR}/regex
|
|
${CMAKE_SOURCE_DIR}/extra/yassl/include
|
|
${CMAKE_SOURCE_DIR}/zlib
|
|
)
|
|
|
|
SET_SOURCE_FILES_PROPERTIES(${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc
|
|
${PROJECT_SOURCE_DIR}/sql/sql_yacc.h
|
|
PROPERTIES GENERATED 1)
|
|
|
|
ADD_LIBRARY(mysqldemb emb_qcache.cc libmysqld.c lib_sql.cc
|
|
../client/get_password.c ../libmysql/errmsg.c
|
|
../libmysql/libmysql.c ../sql/password.c ../sql-common/client.c
|
|
../sql-common/my_time.c ../sql-common/my_user.c
|
|
../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 ${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
|
|
../sql/item_func.cc ../sql/item_geofunc.cc ../sql/item_row.cc
|
|
../sql/item_strfunc.cc ../sql/item_subselect.cc ../sql/item_sum.cc
|
|
../sql/item_timefunc.cc ../sql/item_uniq.cc ../sql/item_xmlfunc.cc
|
|
../sql/key.cc ../sql/lock.cc ../sql/log.cc ../sql/log_event.cc
|
|
../sql/mf_iocache.cc ../sql/my_decimal.cc ../sql/net_serv.cc
|
|
../sql/opt_range.cc ../sql/opt_sum.cc ../sql/parse_file.cc
|
|
../sql/procedure.cc ../sql/protocol.cc ../sql/records.cc
|
|
../sql/repl_failsafe.cc ../sql/rpl_filter.cc ../sql/set_var.cc
|
|
../sql/spatial.cc ../sql/sp_cache.cc ../sql/sp.cc
|
|
../sql/sp_head.cc ../sql/sp_pcontext.cc ../sql/sp_rcontext.cc
|
|
../sql/sql_acl.cc ../sql/sql_analyse.cc ../sql/sql_base.cc
|
|
../sql/sql_cache.cc ../sql/sql_class.cc ../sql/sql_crypt.cc
|
|
../sql/sql_cursor.cc ../sql/sql_db.cc ../sql/sql_delete.cc
|
|
../sql/sql_derived.cc ../sql/sql_do.cc ../sql/sql_error.cc
|
|
../sql/sql_handler.cc ../sql/sql_help.cc ../sql/sql_insert.cc
|
|
../sql/sql_lex.cc ../sql/sql_list.cc ../sql/sql_load.cc
|
|
../sql/sql_manager.cc ../sql/sql_map.cc ../sql/sql_parse.cc
|
|
../sql/sql_partition.cc ../sql/sql_plugin.cc ../sql/sql_prepare.cc
|
|
../sql/sql_rename.cc ../sql/sql_repl.cc ../sql/sql_select.cc
|
|
../sql/sql_show.cc ../sql/sql_state.c ../sql/sql_string.cc
|
|
../sql/sql_tablespace.cc ../sql/sql_table.cc ../sql/sql_test.cc
|
|
../sql/sql_trigger.cc ../sql/sql_udf.cc ../sql/sql_union.cc
|
|
../sql/sql_update.cc ../sql/sql_view.cc
|
|
../sql/strfunc.cc ../sql/table.cc ../sql/thr_malloc.cc
|
|
../sql/time.cc ../sql/tztime.cc ../sql/uniques.cc ../sql/unireg.cc
|
|
../sql/partition_info.cc ../sql/sql_locale.cc
|
|
../sql/sql_connect.cc ../sql/scheduler.cc
|
|
../vio/vio.c ../vio/viosocket.c ../vio/viossl.c
|
|
../vio/viosslfactories.c
|
|
${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc
|
|
${PROJECT_SOURCE_DIR}/sql/sql_yacc.h)
|
|
|
|
# Seems we cannot make a library without at least one source file. So use a
|
|
# dummy empty file
|
|
FILE(WRITE cmake_dummy.c " ")
|
|
|
|
ADD_LIBRARY(mysqlserver cmake_dummy.c)
|
|
TARGET_LINK_LIBRARIES(mysqlserver wsock32)
|
|
ADD_DEPENDENCIES(mysqlserver dbug mysys strings zlib mysqldemb regex myisam myisammrg
|
|
heap yassl taocrypt)
|
|
IF(WITH_ARCHIVE_STORAGE_ENGINE)
|
|
ADD_DEPENDENCIES(mysqlserver archive)
|
|
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)
|
|
|
|
ADD_LIBRARY(libmysqld MODULE cmake_dummy.c libmysqld.def)
|
|
TARGET_LINK_LIBRARIES(libmysqld wsock32)
|
|
ADD_DEPENDENCIES(libmysqld mysqlserver)
|