database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-22003 mysql_config disappeared from 10.5 (e.g. binary tarball or source build)

Browse Source 
* generate and install mysql_config
* symlink mariadb_config (from C/C) to mariadb-config

also:
* .gitignore generated mariadb-config.1
* remove obsolete compiler flag from C/C
This commit is contained in:
Sergei Golubchik
2020-03-23 21:37:32 +01:00
parent 73edb6ffd4
commit e4afd3c337
5 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -579,6 +579,7 @@ man/mariadb-binlog.1
man/mariadb-check.1 man/mariadb-check.1
man/mariadb-client-test-embedded.1 man/mariadb-client-test-embedded.1
man/mariadb-client-test.1 man/mariadb-client-test.1
man/mariadb-config.1
man/mariadb-convert-table-format.1 man/mariadb-convert-table-format.1
man/mariadb-dump.1 man/mariadb-dump.1
man/mariadb-dumpslow.1 man/mariadb-dumpslow.1

9
cmake/mariadb_connector_c.cmake
View File

@@ -38,7 +38,10 @@ SET(CLIENT_PLUGIN_PVIO_SOCKET STATIC)
MESSAGE("== Configuring MariaDB Connector/C") MESSAGE("== Configuring MariaDB Connector/C")
ADD_SUBDIRECTORY(libmariadb) ADD_SUBDIRECTORY(libmariadb)
#remove after merging libmariadb > v3.0.9 IF(UNIX)
IF(TARGET caching_sha2_password AND CMAKE_C_FLAGS_DEBUG MATCHES "-Werror") INSTALL(CODE "EXECUTE_PROCESS(
SET_PROPERTY(TARGET caching_sha2_password APPEND_STRING PROPERTY COMPILE_FLAGS -Wno-unused-function) COMMAND ${CMAKE_COMMAND} -E make_directory ${INSTALL_BINDIR}
COMMAND ${CMAKE_COMMAND} -E create_symlink mariadb_config ${INSTALL_BINDIR}/mariadb-config
WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX})"
COMPONENT Development)
ENDIF() ENDIF()

1
debian/libmariadb-dev-compat.install vendored
View File

@@ -2,3 +2,4 @@ usr/lib/*/libmysqlclient.a
usr/lib/*/libmysqlclient.so usr/lib/*/libmysqlclient.so
usr/lib/*/libmysqlclient_r.a usr/lib/*/libmysqlclient_r.a
usr/lib/*/libmysqlclient_r.so usr/lib/*/libmysqlclient_r.so
usr/bin/mysql_config

1
debian/libmariadb-dev-compat.links vendored
View File

@@ -1,4 +1,3 @@
#!/usr/bin/dh-exec #!/usr/bin/dh-exec
usr/bin/mariadb_config usr/bin/mysql_config
usr/include/mariadb usr/include/mysql usr/include/mariadb usr/include/mysql
usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/mariadb.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/mysqlclient.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/mariadb.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/mysqlclient.pc

1
scripts/CMakeLists.txt
View File

@@ -313,6 +313,7 @@ ELSE()
mariadb-access mariadb-access
mariadb-convert-table-format mariadb-convert-table-format
mariadb-find-rows mariadb-find-rows
mysql_config
mytop mytop
mariadb-hotcopy mariadb-hotcopy
${SERVER_SCRIPTS} ${SERVER_SCRIPTS}