MDEV-21303 Make executables MariaDB named

To change all executables to have a mariadb name I had to:
- Do name changes in every CMakeLists.txt that produces executables
- CREATE_MARIADB_SYMLINK was removed and GET_SYMLINK added by Wlad to reuse the function in other places also
- The scripts/CMakeLists.txt could make use of GET_SYMLINK instead of introducing redundant code, but I thought I'll leave that for next release
- A lot of changes to debian/.install and debian/.links files due to swapping of real executable and symlink. I did not however change the name of the manpages, so the real name is still mysql there and mariadb are symlinks.
- The Windows part needed a change now when we made the executables mariadb -named. MSI (and ZIP) do not support symlinks and to not break backward compatibility we had to include mysql named binaries also. Done by Wlad

2 files changed, 14 insertions, 18 deletions

diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt
index 2fc56ce5e98..b7b1d215711 100644
--- a/extra/CMakeLists.txt
+++ b/extra/CMakeLists.txt
@@ -1,14 +1,14 @@
 # Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
-# 
+#
 # 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-1335 USA
@@ -30,9 +30,9 @@ ENDIF()
 # to mysqld_error.h using cmake -E copy_if_different
 ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp
    COMMAND comp_err
-	--charset=${PROJECT_SOURCE_DIR}/sql/share/charsets 
+	--charset=${PROJECT_SOURCE_DIR}/sql/share/charsets
 	--out-dir=${CMAKE_BINARY_DIR}/sql/share/
-	--header_file=${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp 
+	--header_file=${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp
 	--name_file=${CMAKE_BINARY_DIR}/include/mysqld_ername.h.tmp
 	--state_file=${CMAKE_BINARY_DIR}/include/sql_state.h.tmp
 	--in_file=${PROJECT_SOURCE_DIR}/sql/share/errmsg-utf8.txt
@@ -43,7 +43,7 @@ ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp
 
 ADD_CUSTOM_TARGET(GenError
                   ALL
-                  DEPENDS 
+                  DEPENDS
                   ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp)
 
 MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
@@ -106,9 +106,9 @@ IF(UNIX)
   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)
   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys)
 
-  MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client)
-  TARGET_LINK_LIBRARIES(mysql_waitpid mysys)
+  MYSQL_ADD_EXECUTABLE(mariadb-waitpid mysql_waitpid.c COMPONENT Client)
+  TARGET_LINK_LIBRARIES(mariadb-waitpid mysys)
 
-  MYSQL_ADD_EXECUTABLE(mysqld_safe_helper mysqld_safe_helper.c COMPONENT Server)
-  TARGET_LINK_LIBRARIES(mysqld_safe_helper mysys)
+  MYSQL_ADD_EXECUTABLE(mariadbd-safe-helper mysqld_safe_helper.c COMPONENT Server)
+  TARGET_LINK_LIBRARIES(mariadbd-safe-helper mysys)
 ENDIF()
diff --git a/extra/mariabackup/CMakeLists.txt b/extra/mariabackup/CMakeLists.txt
index b703c5c4344..ad36d2fa6a6 100644
--- a/extra/mariabackup/CMakeLists.txt
+++ b/extra/mariabackup/CMakeLists.txt
@@ -55,7 +55,7 @@ ENDIF()
 
 ADD_DEFINITIONS(-DPCRE_STATIC=1)
 ADD_DEFINITIONS(${SSL_DEFINES})
-MYSQL_ADD_EXECUTABLE(mariabackup
+MYSQL_ADD_EXECUTABLE(mariadb-backup
   xtrabackup.cc
   innobackupex.cc
   changed_page_bitmap.cc
@@ -82,17 +82,13 @@ MYSQL_ADD_EXECUTABLE(mariabackup
   COMPONENT backup
   )
 
-
-
-
 # Export all symbols on Unix, for better crash callstacks
-SET_TARGET_PROPERTIES(mariabackup PROPERTIES ENABLE_EXPORTS TRUE)
+SET_TARGET_PROPERTIES(mariadb-backup PROPERTIES ENABLE_EXPORTS TRUE)
 ADD_SUBDIRECTORY(crc)
 
-
-TARGET_LINK_LIBRARIES(mariabackup sql sql_builtins crc)
+TARGET_LINK_LIBRARIES(mariadb-backup sql sql_builtins crc)
 IF(NOT HAVE_SYSTEM_REGEX)
-  TARGET_LINK_LIBRARIES(mariabackup pcre2-posix)
+  TARGET_LINK_LIBRARIES(mariadb-backup pcre2-posix)
 ENDIF()