|
 |
d305d48 |
diff --git a/mysql-test/CMakeLists.txt b/mysql-test/CMakeLists.txt
|
|
|
d305d48 |
index 7c1e82b..a92ba91 100644
|
|
|
d305d48 |
--- a/mysql-test/CMakeLists.txt
|
|
|
d305d48 |
+++ b/mysql-test/CMakeLists.txt
|
|
|
d305d48 |
@@ -56,6 +56,10 @@ INSTALL(
|
|
|
d305d48 |
ENDIF()
|
|
|
d305d48 |
|
|
|
d305d48 |
|
|
|
d305d48 |
+# Expand some paths in the perl scripts correctly
|
|
|
d305d48 |
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/lib/My/ConfigFactory.pm ${CMAKE_CURRENT_SOURCE_DIR}/lib/My/ConfigFactory.pm @ONLY)
|
|
|
d305d48 |
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql-test-run.pl ${CMAKE_CURRENT_SOURCE_DIR}/mysql-test-run.pl @ONLY)
|
|
|
d305d48 |
+
|
|
|
d305d48 |
IF(NOT ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
|
|
|
d305d48 |
# Enable running mtr from build directory
|
|
|
d305d48 |
CONFIGURE_FILE(
|
|
|
d305d48 |
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
|
|
Norvald H. Ryeng |
decb6b3 |
index e9130dd..388c039 100755
|
|
|
d305d48 |
--- a/mysql-test/mysql-test-run.pl
|
|
|
d305d48 |
+++ b/mysql-test/mysql-test-run.pl
|
|
Norvald H. Ryeng |
decb6b3 |
@@ -1535,11 +1535,13 @@ sub command_line_setup {
|
|
 |
1a2ec63 |
}
|
|
|
1a2ec63 |
|
|
|
1a2ec63 |
# Look for language files and charsetsdir, use same share
|
|
|
d305d48 |
- $path_language= mtr_path_exists("$bindir/share/mysql",
|
|
|
d305d48 |
+ $path_language= mtr_path_exists("$bindir/@INSTALL_MYSQLSHAREDIR@",
|
|
|
d305d48 |
+ "$bindir/share/mysql",
|
|
|
d305d48 |
"$bindir/share");
|
|
|
1a2ec63 |
my $path_share= $path_language;
|
|
|
1a2ec63 |
|
|
Norvald H. Ryeng |
decb6b3 |
- @share_locations= ("share/mysql",
|
|
Norvald H. Ryeng |
decb6b3 |
+ @share_locations= ("@INSTALL_MYSQLSHAREDIR@",
|
|
Norvald H. Ryeng |
decb6b3 |
+ "share/mysql",
|
|
Norvald H. Ryeng |
decb6b3 |
"share/mysql-" . $mysql_base_version,
|
|
Norvald H. Ryeng |
decb6b3 |
"share");
|
|
Norvald H. Ryeng |
decb6b3 |
|
|
Norvald H. Ryeng |
decb6b3 |
@@ -4140,6 +4142,7 @@ sub mysql_install_db {
|
|
|
1a2ec63 |
|
|
|
1a2ec63 |
my $path_sql= my_find_file($install_basedir,
|
|
Norvald H. Ryeng |
decb6b3 |
["mysql", "share/mysql",
|
|
Norvald H. Ryeng |
decb6b3 |
+ "@INSTALL_MYSQLSHAREDIR@",
|
|
Norvald H. Ryeng |
decb6b3 |
"share/mysql-" . $mysql_base_version,
|
|
|
1a2ec63 |
"share", "scripts"],
|
|
Jakub Dorňák |
bf0a83b |
"mysql_system_tables.sql",
|