From 320a4b52c9c73a37b3553cec6a9d170924957c36 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Mon, 12 Dec 2022 14:20:08 +1100 Subject: 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 --- sql/CMakeLists.txt | 12 ++++++------ sql/privilege.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'sql') diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 4938f8da02b..2ac802314ee 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -481,14 +481,14 @@ IF(WIN32) ADD_CUSTOM_COMMAND(OUTPUT ${my_bootstrap_sql} COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/scripts - cmd /c copy mysql_system_tables.sql+mysql_system_tables_data.sql+fill_help_tables.sql+mysql_performance_tables.sql+mysql_test_db.sql+mysql_sys_schema.sql ${native_outfile} + cmd /c copy mariadb_system_tables.sql+mariadb_system_tables_data.sql+fill_help_tables.sql+mariadb_performance_tables.sql+mariadb_test_db.sql+mariadb_sys_schema.sql ${native_outfile} DEPENDS - ${CMAKE_SOURCE_DIR}/scripts/mysql_system_tables.sql - ${CMAKE_SOURCE_DIR}/scripts/mysql_system_tables_data.sql + ${CMAKE_SOURCE_DIR}/scripts/mariadb_system_tables.sql + ${CMAKE_SOURCE_DIR}/scripts/mariadb_system_tables_data.sql ${CMAKE_SOURCE_DIR}/scripts/fill_help_tables.sql - ${CMAKE_SOURCE_DIR}/scripts/mysql_performance_tables.sql - ${CMAKE_SOURCE_DIR}/scripts/mysql_test_db.sql - ${CMAKE_BINARY_DIR}/scripts/mysql_sys_schema.sql + ${CMAKE_SOURCE_DIR}/scripts/mariadb_performance_tables.sql + ${CMAKE_SOURCE_DIR}/scripts/mariadb_test_db.sql + ${CMAKE_BINARY_DIR}/scripts/mariadb_sys_schema.sql ) ADD_CUSTOM_COMMAND( diff --git a/sql/privilege.h b/sql/privilege.h index a34d3f4a172..2a4a5cec519 100644 --- a/sql/privilege.h +++ b/sql/privilege.h @@ -80,7 +80,7 @@ enum privilege_t: unsigned long long In other files: - static struct show_privileges_st sys_privileges[] - static const char *command_array[] and static uint command_lengths[] - - mysql_system_tables.sql and mysql_system_tables_fix.sql + - mariadb_system_tables.sql and mariadb_system_tables_fix.sql - acl_init() or whatever - to define behaviour for old privilege tables - Update User_table_json::get_access() - sql_yacc.yy - for GRANT/REVOKE to work -- cgit v1.2.1