mariadb104: Install missing scripts
This commit is contained in:
parent
f6b2738861
commit
c8503f6243
|
@ -7,6 +7,7 @@ bin/mariadb-check
|
|||
bin/mariadb-dump
|
||||
bin/mariadb-find-rows
|
||||
bin/mariadb-import
|
||||
bin/mariadb-install-db
|
||||
bin/mariadb-plugin
|
||||
bin/mariadb-show
|
||||
bin/mariadb-slap
|
||||
|
@ -16,6 +17,7 @@ bin/msql2mysql
|
|||
bin/mysql
|
||||
bin/mysql_config
|
||||
bin/mysql_find_rows
|
||||
bin/mysql_install_db
|
||||
bin/mysql_plugin
|
||||
bin/mysqlaccess
|
||||
bin/mysqladmin
|
||||
|
@ -310,3 +312,12 @@ man/man1/wsrep_sst_rsync.1
|
|||
man/man1/wsrep_sst_rsync_wan.1
|
||||
man/man8/mariadbd.8
|
||||
man/man8/mysqld.8
|
||||
share/mysql/fill_help_tables.sql
|
||||
share/mysql/maria_add_gis_sp.sql
|
||||
share/mysql/maria_add_gis_sp_bootstrap.sql
|
||||
share/mysql/mysql_performance_tables.sql
|
||||
share/mysql/mysql_system_tables.sql
|
||||
share/mysql/mysql_system_tables_data.sql
|
||||
share/mysql/mysql_test_data_timezone.sql
|
||||
share/mysql/mysql_test_db.sql
|
||||
share/mysql/mysql_to_mariadb.sql
|
||||
|
|
|
@ -10,6 +10,7 @@ SHA1 (patch-extra_wolfssl_wolfssl_certs_intermediate_genintcerts.sh) = cd9a98288
|
|||
SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403
|
||||
SHA1 (patch-mysys_my__context.c) = f9c7e6b3b68b857e7781cf5f36c49e88051cfb66
|
||||
SHA1 (patch-plugin_auth__pam_CMakeLists.txt) = b941343898ddc175818b161021fb7fccccee3e28
|
||||
SHA1 (patch-scripts_CMakeLists.txt) = afbab5f9c8044adb63f0e770802c67376a5f64e9
|
||||
SHA1 (patch-scripts_mysqld__safe.sh) = 4124e4c8df1527049f5eec9f3d2d4bbe80e7c33f
|
||||
SHA1 (patch-sql_mysqld.cc) = 21f9ea79ca90a78f18598d55f209a1835b95858f
|
||||
SHA1 (patch-sql_threadpool__generic.cc) = 73df368457a2e88f3cc3221031e565c4208b87ab
|
||||
|
|
|
@ -0,0 +1,60 @@
|
|||
$NetBSD$
|
||||
|
||||
Install missing scripts.
|
||||
|
||||
We install all scripts with the client, for Reasons.
|
||||
|
||||
--- scripts/CMakeLists.txt.orig 2020-01-26 20:43:53.000000000 +0000
|
||||
+++ scripts/CMakeLists.txt
|
||||
@@ -91,7 +91,7 @@ SET(ADD_GIS_SP_EOL ";")
|
||||
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/maria_add_gis_sp.sql.in
|
||||
${CMAKE_CURRENT_BINARY_DIR}/maria_add_gis_sp_bootstrap.sql ESCAPE_QUOTES @ONLY)
|
||||
|
||||
-IF (NOT WITHOUT_SERVER)
|
||||
+IF (TRUE)
|
||||
INSTALL(FILES
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
|
||||
@@ -103,7 +103,7 @@ INSTALL(FILES
|
||||
${CMAKE_CURRENT_BINARY_DIR}/maria_add_gis_sp.sql
|
||||
${CMAKE_CURRENT_BINARY_DIR}/maria_add_gis_sp_bootstrap.sql
|
||||
${FIX_PRIVILEGES_SQL}
|
||||
- DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
|
||||
+ DESTINATION ${INSTALL_MYSQLSHAREDIR}
|
||||
)
|
||||
ENDIF()
|
||||
|
||||
@@ -122,9 +122,9 @@ ENDIF()
|
||||
|
||||
|
||||
IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
|
||||
- SET (PERL_PATH "/usr/local/bin/perl")
|
||||
+ SET (PERL_PATH "/usr/pkg/bin/perl")
|
||||
ELSE()
|
||||
- SET (PERL_PATH "/usr/bin/perl")
|
||||
+ SET (PERL_PATH "/usr/pkg/bin/perl")
|
||||
ENDIF()
|
||||
|
||||
IF(UNIX)
|
||||
@@ -202,10 +202,9 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DI
|
||||
COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db
|
||||
)
|
||||
|
||||
-INSTALL_SCRIPT(
|
||||
- "${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db"
|
||||
+INSTALL(
|
||||
+ FILES "${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db"
|
||||
DESTINATION ${INSTALL_SCRIPTDIR}
|
||||
- COMPONENT Server
|
||||
)
|
||||
ENDIF()
|
||||
|
||||
@@ -282,7 +281,7 @@ ELSE()
|
||||
wsrep_sst_common
|
||||
)
|
||||
ENDIF()
|
||||
- IF (NOT WITHOUT_SERVER)
|
||||
+ IF (TRUE)
|
||||
SET(SERVER_SCRIPTS
|
||||
mysql_fix_extensions
|
||||
mysqld_multi
|
Loading…
Reference in New Issue