mysql/mysql-sharedir.patch

28 lines
1.0 KiB
Diff
Raw Normal View History

2018-04-25 08:13:27 +00:00
diff --git a/mysql-test/CMakeLists.txt b/mysql-test/CMakeLists.txt
2019-10-14 09:04:55 +00:00
index f77bd022..a3a3bd9f 100644
2018-04-25 08:13:27 +00:00
--- a/mysql-test/CMakeLists.txt
+++ b/mysql-test/CMakeLists.txt
2019-10-14 09:04:55 +00:00
@@ -57,6 +57,9 @@ IF(INSTALL_MYSQLTESTDIR)
2018-04-25 08:13:27 +00:00
ENDIF()
2013-04-24 18:23:23 +00:00
2019-04-26 13:37:22 +00:00
+# Expand some paths in the perl script correctly
2018-04-25 08:13:27 +00:00
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql-test-run.pl ${CMAKE_CURRENT_SOURCE_DIR}/mysql-test-run.pl @ONLY)
+
IF(NOT ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
# Enable running mtr from build directory
2019-04-26 13:37:22 +00:00
FIND_PROGRAM(PERL_EXECUTABLE perl
2018-04-25 08:13:27 +00:00
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
2019-10-14 09:04:55 +00:00
index b82611fd..7fc5987e 100755
2018-04-25 08:13:27 +00:00
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
2019-10-14 09:04:55 +00:00
@@ -1656,7 +1656,7 @@ sub command_line_setup {
2018-08-01 13:17:10 +00:00
my $path_share = $path_language;
2013-04-24 18:23:23 +00:00
2018-08-01 13:17:10 +00:00
@share_locations =
- ("share/mysql-" . $mysql_base_version, "share/mysql", "share");
+ ("@INSTALL_MYSQLSHAREDIR@", "share/mysql-" . $mysql_base_version, "share/mysql", "share");
2018-04-25 08:13:27 +00:00
2018-08-01 13:17:10 +00:00
$path_charsetsdir = my_find_dir($basedir, \@share_locations, "charsets");
2013-04-24 18:23:23 +00:00