Blame SOURCES/mysql-sharedir.patch
|
 |
dbc8c5 |
diff --git a/mysql-test/CMakeLists.txt b/mysql-test/CMakeLists.txt
|
|
|
a596b2 |
index f77bd022..a3a3bd9f 100644
|
|
|
dbc8c5 |
--- a/mysql-test/CMakeLists.txt
|
|
|
dbc8c5 |
+++ b/mysql-test/CMakeLists.txt
|
|
|
a596b2 |
@@ -57,6 +57,9 @@ IF(INSTALL_MYSQLTESTDIR)
|
|
|
dbc8c5 |
ENDIF()
|
|
|
dbc8c5 |
|
|
|
dbc8c5 |
|
|
|
d565be |
+# Expand some paths in the perl script correctly
|
|
|
dbc8c5 |
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql-test-run.pl ${CMAKE_CURRENT_SOURCE_DIR}/mysql-test-run.pl @ONLY)
|
|
|
dbc8c5 |
+
|
|
|
dbc8c5 |
IF(NOT ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
|
|
|
dbc8c5 |
# Enable running mtr from build directory
|
|
|
d565be |
FIND_PROGRAM(PERL_EXECUTABLE perl
|
|
|
dbc8c5 |
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
|
|
|
a596b2 |
index b82611fd..7fc5987e 100755
|
|
|
dbc8c5 |
--- a/mysql-test/mysql-test-run.pl
|
|
|
dbc8c5 |
+++ b/mysql-test/mysql-test-run.pl
|
|
|
a596b2 |
@@ -1656,7 +1656,7 @@ sub command_line_setup {
|
|
|
dbc8c5 |
my $path_share = $path_language;
|
|
|
dbc8c5 |
|
|
|
dbc8c5 |
@share_locations =
|
|
|
dbc8c5 |
- ("share/mysql-" . $mysql_base_version, "share/mysql", "share");
|
|
|
dbc8c5 |
+ ("@INSTALL_MYSQLSHAREDIR@", "share/mysql-" . $mysql_base_version, "share/mysql", "share");
|
|
|
dbc8c5 |
|
|
|
dbc8c5 |
$path_charsetsdir = my_find_dir($basedir, \@share_locations, "charsets");
|
|
|
dbc8c5 |
|