diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-11-24 14:13:41 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-12-12 00:31:44 +0100 |
| commit | 4abb8216a054e14afbeb81e8529e02bab6fa14ac (patch) | |
| tree | a2e0d28a19ab222edf6bf2e68c26a6df14db05a6 /scripts/CMakeLists.txt | |
| parent | d68d7e50f928f7966f21524b4247a0a54d09a6d1 (diff) | |
| download | mariadb-git-4abb8216a054e14afbeb81e8529e02bab6fa14ac.tar.gz | |
MDEV-17658 change the structure of mysql.user table
Implement User_table_json.
Fix scripts to use mysql.global_priv.
Fix tests.
Diffstat (limited to 'scripts/CMakeLists.txt')
| -rw-r--r-- | scripts/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 464c00d57da..fcb13be5c25 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -31,7 +31,7 @@ ENDIF() IF(CAT_EXECUTABLE) SET(CAT_COMMAND COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_SOURCE_DIR} - ${CAT_EXECUTABLE} mysql_system_tables.sql mysql_system_tables_fix.sql mysql_performance_tables.sql > + ${CAT_EXECUTABLE} mysql_system_tables_fix.sql mysql_system_tables.sql mysql_performance_tables.sql > ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables.sql ) ELSEIF(WIN32) @@ -39,7 +39,7 @@ ELSEIF(WIN32) native_outfile ) SET(CAT_COMMAND COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_SOURCE_DIR} - cmd /c copy /b mysql_system_tables.sql + mysql_system_tables_fix.sql + mysql_performance_tables.sql + cmd /c copy /b mysql_system_tables_fix.sql + mysql_system_tables.sql + mysql_performance_tables.sql ${native_outfile} ) ELSE() MESSAGE(FATAL_ERROR "Cannot concatenate files") |