diff options
| author | Daniel Black <daniel@mariadb.org> | 2022-12-12 14:20:08 +1100 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2023-04-11 07:59:02 +1000 |
| commit | 320a4b52c9c73a37b3553cec6a9d170924957c36 (patch) | |
| tree | f6adda5397ddc51ef83ab66160e2c326a8648e9c /sql | |
| parent | 2b61ff8f2221745f0a96855a0feb0825c426f993 (diff) | |
| download | mariadb-git-320a4b52c9c73a37b3553cec6a9d170924957c36.tar.gz | |
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
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | sql/privilege.h | 2 |
2 files changed, 7 insertions, 7 deletions
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 |