diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-03-23 21:37:32 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-03-24 02:39:32 +0100 |
| commit | e4afd3c337c2b4816d76fbdb5d0624da41293fc5 (patch) | |
| tree | c8f02c8e7fa837e95a624155c15a31b315560b9d | |
| parent | 73edb6ffd41540a088be81622744f4a95c7c443e (diff) | |
| download | mariadb-git-e4afd3c337c2b4816d76fbdb5d0624da41293fc5.tar.gz | |
MDEV-22003 mysql_config disappeared from 10.5 (e.g. binary tarball or source build)
* 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
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | cmake/mariadb_connector_c.cmake | 9 | ||||
| -rw-r--r-- | debian/libmariadb-dev-compat.install | 1 | ||||
| -rwxr-xr-x | debian/libmariadb-dev-compat.links | 1 | ||||
| -rw-r--r-- | scripts/CMakeLists.txt | 1 |
5 files changed, 9 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index 3535f8cc0eb..180755b140c 100644 --- a/.gitignore +++ b/.gitignore @@ -579,6 +579,7 @@ man/mariadb-binlog.1 man/mariadb-check.1 man/mariadb-client-test-embedded.1 man/mariadb-client-test.1 +man/mariadb-config.1 man/mariadb-convert-table-format.1 man/mariadb-dump.1 man/mariadb-dumpslow.1 diff --git a/cmake/mariadb_connector_c.cmake b/cmake/mariadb_connector_c.cmake index 4fb4be44831..0dc7722d11e 100644 --- a/cmake/mariadb_connector_c.cmake +++ b/cmake/mariadb_connector_c.cmake @@ -38,7 +38,10 @@ SET(CLIENT_PLUGIN_PVIO_SOCKET STATIC) MESSAGE("== Configuring MariaDB Connector/C") ADD_SUBDIRECTORY(libmariadb) -#remove after merging libmariadb > v3.0.9 -IF(TARGET caching_sha2_password AND CMAKE_C_FLAGS_DEBUG MATCHES "-Werror") - SET_PROPERTY(TARGET caching_sha2_password APPEND_STRING PROPERTY COMPILE_FLAGS -Wno-unused-function) +IF(UNIX) + INSTALL(CODE "EXECUTE_PROCESS( + 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() diff --git a/debian/libmariadb-dev-compat.install b/debian/libmariadb-dev-compat.install index 7fe10c50f69..cd69216d9c3 100644 --- a/debian/libmariadb-dev-compat.install +++ b/debian/libmariadb-dev-compat.install @@ -2,3 +2,4 @@ usr/lib/*/libmysqlclient.a usr/lib/*/libmysqlclient.so usr/lib/*/libmysqlclient_r.a usr/lib/*/libmysqlclient_r.so +usr/bin/mysql_config diff --git a/debian/libmariadb-dev-compat.links b/debian/libmariadb-dev-compat.links index e02260c0129..60c1c69ee49 100755 --- a/debian/libmariadb-dev-compat.links +++ b/debian/libmariadb-dev-compat.links @@ -1,4 +1,3 @@ #!/usr/bin/dh-exec -usr/bin/mariadb_config usr/bin/mysql_config usr/include/mariadb usr/include/mysql usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/mariadb.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/mysqlclient.pc diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 8fcae8d5fd2..d900b55ecf1 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -313,6 +313,7 @@ ELSE() mariadb-access mariadb-convert-table-format mariadb-find-rows + mysql_config mytop mariadb-hotcopy ${SERVER_SCRIPTS} |