mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 10:14:19 +01:00
fb8f32d077
The problem was that when a embedded linked version of mysqltest crashed there was no way to obtain a stack trace if no core file is available. Another problem is that the embedded version of libmysql was not behaving (crash) the same as the non-embedded with respect to sending commands to a explicitly closed connection. The solution is to generate a mysqltest's stack trace on crash and to enable "reconnect" if the connection handle was explicitly closed so the behavior matches the non-embedded one. client/CMakeLists.txt: Link mysys to mysqltest. client/Makefile.am: Link mysys to mysqltest. client/mysqltest.c: Add fatal signal handling with backtracing for Unix and Windows. configure.in: Add check for weak symbols support and remove a spurious word. include/Makefile.am: Add new header with prototype for stack tracing functions. include/my_stacktrace.h: Add new header with prototype for stack tracing functions. libmysqld/CMakeLists.txt: stack tracing is now part of mysys. libmysqld/Makefile.am: stack tracing is now part of mysys. libmysqld/lib_sql.cc: Re-connect if connection was explicitly closed. This is done to match the behavior of the non-embeded libmysql. mysql-test/t/sql_low_priority_updates_func.test: Test expects parallelism between queries that cannot be guaranteed under embedded. mysys/CMakeLists.txt: Add stacktrace to mysys. mysys/Makefile.am: Add stacktrace to mysys. mysys/stacktrace.c: Move stacktrace to mysys and add weak symbol for the C++ name de-mangling function so that it can later be overridden in C++ code. Also add my_ prefix to exported functions. sql/CMakeLists.txt: stacktrace was moved to mysys. sql/Makefile.am: stacktrace was moved to mysys. sql/mysqld.cc: Add my_ prefix to mysys functions.
85 lines
3.4 KiB
CMake
Executable file
85 lines
3.4 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")
|
|
|
|
# We use the "mysqlclient_notls" library here just as safety, in case
|
|
# any of the clients here would go beyond the client API and access the
|
|
# Thread Local Storage directly.
|
|
|
|
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
|
|
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
|
|
|
|
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
|
|
${CMAKE_SOURCE_DIR}/zlib
|
|
${CMAKE_SOURCE_DIR}/extra/yassl/include
|
|
${CMAKE_SOURCE_DIR}/libmysql
|
|
${CMAKE_SOURCE_DIR}/regex
|
|
${CMAKE_SOURCE_DIR}/sql
|
|
${CMAKE_SOURCE_DIR}/strings)
|
|
|
|
ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc ../mysys/my_conio.c)
|
|
TARGET_LINK_LIBRARIES(mysql mysqlclient_notls wsock32)
|
|
|
|
ADD_EXECUTABLE(mysqltest mysqltest.c)
|
|
SET_SOURCE_FILES_PROPERTIES(mysqltest.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
|
|
TARGET_LINK_LIBRARIES(mysqltest mysqlclient mysys regex wsock32 dbug)
|
|
|
|
ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
|
|
TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient_notls wsock32)
|
|
|
|
ADD_EXECUTABLE(mysqldump mysqldump.c ../sql-common/my_user.c ../mysys/mf_getdate.c)
|
|
TARGET_LINK_LIBRARIES(mysqldump mysqlclient_notls wsock32)
|
|
|
|
ADD_EXECUTABLE(mysqlimport mysqlimport.c)
|
|
TARGET_LINK_LIBRARIES(mysqlimport mysqlclient_notls wsock32)
|
|
|
|
ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c ../mysys/my_getpagesize.c)
|
|
TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient_notls wsock32)
|
|
ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
|
|
|
|
ADD_EXECUTABLE(mysqlshow mysqlshow.c)
|
|
TARGET_LINK_LIBRARIES(mysqlshow mysqlclient_notls wsock32)
|
|
|
|
ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc
|
|
../mysys/mf_tempdir.c
|
|
../mysys/my_new.cc
|
|
../mysys/my_bit.c
|
|
../mysys/my_bitmap.c
|
|
../mysys/my_vle.c
|
|
../mysys/base64.c)
|
|
TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient_notls wsock32)
|
|
|
|
ADD_EXECUTABLE(mysqladmin mysqladmin.cc)
|
|
TARGET_LINK_LIBRARIES(mysqladmin mysqlclient_notls wsock32)
|
|
|
|
ADD_EXECUTABLE(mysqlslap mysqlslap.c)
|
|
SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
|
|
TARGET_LINK_LIBRARIES(mysqlslap mysqlclient mysys zlib wsock32 dbug)
|
|
|
|
ADD_EXECUTABLE(echo echo.c)
|
|
|
|
IF(EMBED_MANIFESTS)
|
|
MYSQL_EMBED_MANIFEST("mysql" "asInvoker")
|
|
MYSQL_EMBED_MANIFEST("mysqltest" "asInvoker")
|
|
MYSQL_EMBED_MANIFEST("mysqlcheck" "asInvoker")
|
|
MYSQL_EMBED_MANIFEST("mysqldump" "asInvoker")
|
|
MYSQL_EMBED_MANIFEST("mysqlimport" "asInvoker")
|
|
MYSQL_EMBED_MANIFEST("mysql_upgrade" "asInvoker")
|
|
MYSQL_EMBED_MANIFEST("mysqlshow" "asInvoker")
|
|
MYSQL_EMBED_MANIFEST("mysqlbinlog" "asInvoker")
|
|
MYSQL_EMBED_MANIFEST("mysqladmin" "asInvoker")
|
|
MYSQL_EMBED_MANIFEST("echo" "asInvoker")
|
|
ENDIF(EMBED_MANIFESTS)
|
|
|