MDEV-30205 Move /usr/share/mysql to /usr/share/mariadb

These are mainly internal files so is a low impact change.

The few scripts/mysql*sql where renames to mariadb_* prefix
on the name.

mysql-test renamed to mariadb-test in the final packages

9 files changed, 30 insertions, 30 deletions

diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 7f9c92f1cf2..774cdb4acf4 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -34,52 +34,52 @@ IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
  TARGET_LINK_LIBRARIES(comp_sql)
 ENDIF()
 
-# Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts)
+# Build mariadb_fix_privilege_tables.sql (concatenate 3 sql scripts)
 IF(NOT WIN32 OR  (CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
   FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
   MARK_AS_ADVANCED(CAT_EXECUTABLE)
 ENDIF()
 
 IF(NOT ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}"))
-  FOREACH(f fill_help_tables.sql mysql_system_tables_fix.sql mysql_system_tables.sql mysql_system_tables_data.sql mysql_performance_tables.sql)
+  FOREACH(f fill_help_tables.sql mariadb_system_tables_fix.sql mariadb_system_tables.sql mariadb_system_tables_data.sql mariadb_performance_tables.sql)
     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${f} ${CMAKE_CURRENT_BINARY_DIR}/${f} COPYONLY)
   ENDFOREACH()
 ENDIF()
 
 IF(CAT_EXECUTABLE)
   SET(CAT_COMMAND COMMAND
-    ${CAT_EXECUTABLE} mysql_system_tables_fix.sql mysql_system_tables.sql mysql_performance_tables.sql mysql_sys_schema.sql>
-    mysql_fix_privilege_tables.sql
+    ${CAT_EXECUTABLE} mariadb_system_tables_fix.sql mariadb_system_tables.sql mariadb_performance_tables.sql mariadb_sys_schema.sql>
+    mariadb_fix_privilege_tables.sql
   )
 ELSEIF(WIN32)
   SET(CAT_COMMAND
    COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_BINARY_DIR}
-   cmd /c copy /b mysql_system_tables_fix.sql + mysql_system_tables.sql +  mysql_performance_tables.sql + mysql_sys_schema.sql
-   mysql_fix_privilege_tables.sql )
+   cmd /c copy /b mariadb_system_tables_fix.sql + mariadb_system_tables.sql +  mariadb_performance_tables.sql + mariadb_sys_schema.sql
+   mariadb_fix_privilege_tables.sql )
 ELSE()
   MESSAGE(FATAL_ERROR "Cannot concatenate files")
 ENDIF()
 
-# Build mysql_fix_privilege_tables.c
+# Build mariadb_fix_privilege_tables.c
 ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mariadb_fix_privilege_tables_sql.c
   ${CAT_COMMAND}
   COMMAND comp_sql
-  mysql_fix_privilege_tables
-  mysql_fix_privilege_tables.sql
-  mysql_fix_privilege_tables_sql.c
+  mariadb_fix_privilege_tables
+  mariadb_fix_privilege_tables.sql
+  mariadb_fix_privilege_tables_sql.c
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
   DEPENDS comp_sql
-  ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql
-  ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_fix.sql
-  ${CMAKE_CURRENT_SOURCE_DIR}/mysql_performance_tables.sql
-  ${CMAKE_CURRENT_BINARY_DIR}/mysql_sys_schema.sql
+  ${CMAKE_CURRENT_SOURCE_DIR}/mariadb_system_tables.sql
+  ${CMAKE_CURRENT_SOURCE_DIR}/mariadb_system_tables_fix.sql
+  ${CMAKE_CURRENT_SOURCE_DIR}/mariadb_performance_tables.sql
+  ${CMAKE_CURRENT_BINARY_DIR}/mariadb_sys_schema.sql
 )
 
 # Add target for the above to be built
 ADD_CUSTOM_TARGET(GenFixPrivs
   ALL
-  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
+  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mariadb_fix_privilege_tables_sql.c
 )
 
 IF(UNIX AND NOT WITHOUT_SERVER)
@@ -109,15 +109,15 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/maria_add_gis_sp.sql.in
 
 IF (NOT WITHOUT_SERVER)
 INSTALL(FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql
-  ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
-  ${CMAKE_CURRENT_SOURCE_DIR}/mysql_performance_tables.sql
-  ${CMAKE_CURRENT_SOURCE_DIR}/mysql_test_db.sql
+  ${CMAKE_CURRENT_SOURCE_DIR}/mariadb_system_tables.sql
+  ${CMAKE_CURRENT_SOURCE_DIR}/mariadb_system_tables_data.sql
+  ${CMAKE_CURRENT_SOURCE_DIR}/mariadb_performance_tables.sql
+  ${CMAKE_CURRENT_SOURCE_DIR}/mariadb_test_db.sql
   ${CMAKE_CURRENT_SOURCE_DIR}/fill_help_tables.sql
-  ${CMAKE_CURRENT_SOURCE_DIR}/mysql_test_data_timezone.sql
+  ${CMAKE_CURRENT_SOURCE_DIR}/mariadb_test_data_timezone.sql
   ${CMAKE_CURRENT_BINARY_DIR}/maria_add_gis_sp.sql
   ${CMAKE_CURRENT_BINARY_DIR}/maria_add_gis_sp_bootstrap.sql
-  ${CMAKE_CURRENT_BINARY_DIR}/mysql_sys_schema.sql
+  ${CMAKE_CURRENT_BINARY_DIR}/mariadb_sys_schema.sql
   ${FIX_PRIVILEGES_SQL}
   DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
 )
@@ -208,8 +208,8 @@ ENDIF()
 
 SET(resolveip_locations "$basedir/${INSTALL_BINDIR} $basedir/bin")
 SET(mysqld_locations "$basedir/${INSTALL_SBINDIR} $basedir/libexec $basedir/sbin $basedir/bin")
-SET(errmsg_locations "$basedir/${INSTALL_MYSQLSHAREDIR}/english $basedir/share/english $basedir/share/mysql/english")
-SET(pkgdata_locations "$basedir/${INSTALL_MYSQLSHAREDIR} $basedir/share $basedir/share/mysql")
+SET(errmsg_locations "$basedir/${INSTALL_MYSQLSHAREDIR}/english $basedir/share/english $basedir/share/mariadb/english $basedir/share/mysql/english")
+SET(pkgdata_locations "$basedir/${INSTALL_MYSQLSHAREDIR} $basedir/share $basedir/share/mariadb $basedir/share/mysql")
 
 # install mysql_install_db.sh at this point since it needs
 # different values for the above variables that will change
diff --git a/scripts/mysql_performance_tables.sql b/scripts/mariadb_performance_tables.sql
index 306160355de..306160355de 100644
--- a/scripts/mysql_performance_tables.sql
+++ b/scripts/mariadb_performance_tables.sql
diff --git a/scripts/mysql_system_tables.sql b/scripts/mariadb_system_tables.sql
index 0c33e40cf57..0c33e40cf57 100644
--- a/scripts/mysql_system_tables.sql
+++ b/scripts/mariadb_system_tables.sql
diff --git a/scripts/mysql_system_tables_data.sql b/scripts/mariadb_system_tables_data.sql
index ab3dd704d2e..ab3dd704d2e 100644
--- a/scripts/mysql_system_tables_data.sql
+++ b/scripts/mariadb_system_tables_data.sql
diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mariadb_system_tables_fix.sql
index a46c49c88b0..a46c49c88b0 100644
--- a/scripts/mysql_system_tables_fix.sql
+++ b/scripts/mariadb_system_tables_fix.sql
diff --git a/scripts/mysql_test_data_timezone.sql b/scripts/mariadb_test_data_timezone.sql
index 8d07d413cef..8d07d413cef 100644
--- a/scripts/mysql_test_data_timezone.sql
+++ b/scripts/mariadb_test_data_timezone.sql
diff --git a/scripts/mysql_test_db.sql b/scripts/mariadb_test_db.sql
index c83f2c44a4f..c83f2c44a4f 100644
--- a/scripts/mysql_test_db.sql
+++ b/scripts/mariadb_test_db.sql
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index b28e533ecd8..e9a141af0d6 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -402,12 +402,12 @@ fi
 
 # Set up paths to SQL scripts required for bootstrap
 fill_help_tables="$srcpkgdatadir/fill_help_tables.sql"
-create_system_tables="$srcpkgdatadir/mysql_system_tables.sql"
-create_system_tables2="$srcpkgdatadir/mysql_performance_tables.sql"
-fill_system_tables="$srcpkgdatadir/mysql_system_tables_data.sql"
+create_system_tables="$srcpkgdatadir/mariadb_system_tables.sql"
+create_system_tables2="$srcpkgdatadir/mariadb_performance_tables.sql"
+fill_system_tables="$srcpkgdatadir/mariadb_system_tables_data.sql"
 maria_add_gis_sp="$buildpkgdatadir/maria_add_gis_sp_bootstrap.sql"
-mysql_test_db="$srcpkgdatadir/mysql_test_db.sql"
-mysql_sys_schema="$buildpkgdatadir/mysql_sys_schema.sql"
+mysql_test_db="$srcpkgdatadir/mariadb_test_db.sql"
+mysql_sys_schema="$buildpkgdatadir/mariadb_sys_schema.sql"
 
 for f in "$fill_help_tables" "$create_system_tables" "$create_system_tables2" "$fill_system_tables" "$maria_add_gis_sp" "$mysql_test_db" "$mysql_sys_schema"
 do
diff --git a/scripts/sys_schema/CMakeLists.txt b/scripts/sys_schema/CMakeLists.txt
index dc023174fc7..9222f9fa7aa 100644
--- a/scripts/sys_schema/CMakeLists.txt
+++ b/scripts/sys_schema/CMakeLists.txt
@@ -175,4 +175,4 @@ FOREACH(f ${files})
   FILE(READ ${f} content)
   SET(CMAKE_CONFIGURABLE_FILE_CONTENT "${CMAKE_CONFIGURABLE_FILE_CONTENT}${content}\n")
 ENDFOREACH()
-CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/configurable_file_content.in ${CMAKE_BINARY_DIR}/scripts/mysql_sys_schema.sql)
+CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/configurable_file_content.in ${CMAKE_BINARY_DIR}/scripts/mariadb_sys_schema.sql)