|
 |
1a2ec63 |
diff -up mysql-5.5.31/mysql-test/lib/My/ConfigFactory.pm.p22 mysql-5.5.31/mysql-test/lib/My/ConfigFactory.pm
|
|
|
1a2ec63 |
--- mysql-5.5.31/mysql-test/lib/My/ConfigFactory.pm.p22 2013-04-24 20:15:14.085623163 +0200
|
|
|
1a2ec63 |
+++ mysql-5.5.31/mysql-test/lib/My/ConfigFactory.pm 2013-04-24 20:15:37.456630939 +0200
|
|
|
1a2ec63 |
@@ -36,7 +36,7 @@ my @pre_rules=
|
|
|
1a2ec63 |
);
|
|
|
1a2ec63 |
|
|
|
1a2ec63 |
|
|
|
1a2ec63 |
-my @share_locations= ("share/mysql", "sql/share", "share");
|
|
|
90502f1 |
+my @share_locations= ("@INSTALL_MYSQLSHAREDIR@", "sql/share", "share");
|
|
|
1a2ec63 |
|
|
|
1a2ec63 |
|
|
|
1a2ec63 |
sub get_basedir {
|
|
|
1a2ec63 |
diff -up mysql-5.5.31/mysql-test/mysql-test-run.pl.p22 mysql-5.5.31/mysql-test/mysql-test-run.pl
|
|
|
1a2ec63 |
--- mysql-5.5.31/mysql-test/mysql-test-run.pl.p22 2013-03-25 14:14:58.000000000 +0100
|
|
|
1a2ec63 |
+++ mysql-5.5.31/mysql-test/mysql-test-run.pl 2013-04-24 20:18:28.538687866 +0200
|
|
|
1a2ec63 |
@@ -1238,11 +1238,11 @@ sub command_line_setup {
|
|
|
1a2ec63 |
}
|
|
|
1a2ec63 |
|
|
|
1a2ec63 |
# Look for language files and charsetsdir, use same share
|
|
|
1a2ec63 |
- $path_language= mtr_path_exists("$bindir/share/mysql",
|
|
|
90502f1 |
+ $path_language= mtr_path_exists("$bindir/@INSTALL_MYSQLSHAREDIR@",
|
|
|
1a2ec63 |
"$bindir/sql/share",
|
|
|
1a2ec63 |
"$bindir/share");
|
|
|
1a2ec63 |
my $path_share= $path_language;
|
|
|
1a2ec63 |
- $path_charsetsdir = mtr_path_exists("$basedir/share/mysql/charsets",
|
|
|
90502f1 |
+ $path_charsetsdir = mtr_path_exists("$basedir/@INSTALL_MYSQLSHAREDIR@/charsets",
|
|
|
1a2ec63 |
"$basedir/sql/share/charsets",
|
|
|
1a2ec63 |
"$basedir/share/charsets");
|
|
|
1a2ec63 |
|
|
|
1a2ec63 |
@@ -3324,7 +3324,7 @@ sub mysql_install_db {
|
|
|
1a2ec63 |
}
|
|
|
1a2ec63 |
|
|
|
1a2ec63 |
my $path_sql= my_find_file($install_basedir,
|
|
|
1a2ec63 |
- ["mysql", "sql/share", "share/mysql",
|
|
|
90502f1 |
+ ["mysql", "sql/share", "@INSTALL_MYSQLSHAREDIR@",
|
|
|
1a2ec63 |
"share", "scripts"],
|
|
|
1a2ec63 |
"mysql_system_tables.sql",
|
|
|
1a2ec63 |
NOT_REQUIRED);
|
|
|
90502f1 |
diff -up mysql-5.6.23/mysql-test/CMakeLists.txt.sharedir mysql-5.6.23/mysql-test/CMakeLists.txt
|
|
|
90502f1 |
--- mysql-5.6.23/mysql-test/CMakeLists.txt.sharedir 2015-01-19 14:48:31.000000000 +0100
|
|
|
90502f1 |
+++ mysql-5.6.23/mysql-test/CMakeLists.txt 2015-02-23 13:11:58.358488693 +0100
|
|
|
90502f1 |
@@ -33,6 +33,10 @@ ENDIF()
|
|
|
90502f1 |
|
|
|
90502f1 |
|
|
|
90502f1 |
|
|
|
90502f1 |
+# Expand some paths in the perl scripts correctly
|
|
|
90502f1 |
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/lib/My/ConfigFactory.pm ${CMAKE_CURRENT_SOURCE_DIR}/lib/My/ConfigFactory.pm @ONLY)
|
|
|
90502f1 |
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql-test-run.pl ${CMAKE_CURRENT_SOURCE_DIR}/mysql-test-run.pl @ONLY)
|
|
|
90502f1 |
+
|
|
|
90502f1 |
IF(NOT ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
|
|
|
90502f1 |
# Enable running mtr from build directory
|
|
|
90502f1 |
CONFIGURE_FILE(
|