rpms/mysql
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix some paths related to test suite

Browse Source
This commit is contained in:
Honza Horák 2013-04-24 20:23:23 +02:00
parent eab6baa98b
commit 1a2ec63b46
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
community-mysql-sharedir.patch Normal file
View File

@ -0,0 +1,38 @@
diff -up mysql-5.5.31/mysql-test/lib/My/ConfigFactory.pm.p22 mysql-5.5.31/mysql-test/lib/My/ConfigFactory.pm
--- mysql-5.5.31/mysql-test/lib/My/ConfigFactory.pm.p22 2013-04-24 20:15:14.085623163 +0200
+++ mysql-5.5.31/mysql-test/lib/My/ConfigFactory.pm 2013-04-24 20:15:37.456630939 +0200
@@ -36,7 +36,7 @@ my @pre_rules=
);
-my @share_locations= ("share/mysql", "sql/share", "share");
+my @share_locations= ("share/community-mysql", "sql/share", "share");
sub get_basedir {
diff -up mysql-5.5.31/mysql-test/mysql-test-run.pl.p22 mysql-5.5.31/mysql-test/mysql-test-run.pl
--- mysql-5.5.31/mysql-test/mysql-test-run.pl.p22 2013-03-25 14:14:58.000000000 +0100
+++ mysql-5.5.31/mysql-test/mysql-test-run.pl 2013-04-24 20:18:28.538687866 +0200
@@ -1238,11 +1238,11 @@ sub command_line_setup {
}
# Look for language files and charsetsdir, use same share
- $path_language= mtr_path_exists("$bindir/share/mysql",
+ $path_language= mtr_path_exists("$bindir/share/community-mysql",
"$bindir/sql/share",
"$bindir/share");
my $path_share= $path_language;
- $path_charsetsdir = mtr_path_exists("$basedir/share/mysql/charsets",
+ $path_charsetsdir = mtr_path_exists("$basedir/share/community-mysql/charsets",
"$basedir/sql/share/charsets",
"$basedir/share/charsets");
@@ -3324,7 +3324,7 @@ sub mysql_install_db {
}
my $path_sql= my_find_file($install_basedir,
- ["mysql", "sql/share", "share/mysql",
+ ["mysql", "sql/share", "share/community-mysql",
"share", "scripts"],
"mysql_system_tables.sql",
NOT_REQUIRED);

3
community-mysql.spec
View File

@ -61,6 +61,7 @@ Patch19: community-mysql-file-contents.patch
Patch20: community-mysql-string-overflow.patch Patch20: community-mysql-string-overflow.patch
Patch21: community-mysql-dh1024.patch Patch21: community-mysql-dh1024.patch
Patch22: community-mysql-major.patch Patch22: community-mysql-major.patch
Patch23: community-mysql-sharedir.patch
BuildRequires: perl, readline-devel, openssl-devel BuildRequires: perl, readline-devel, openssl-devel
BuildRequires: cmake, ncurses-devel, zlib-devel, libaio-devel BuildRequires: cmake, ncurses-devel, zlib-devel, libaio-devel
@ -244,6 +245,7 @@ the MySQL sources.
%patch20 -p1 %patch20 -p1
%patch21 -p1 %patch21 -p1
%patch22 -p1 %patch22 -p1
%patch23 -p1
# workaround for upstream bug #56342 # workaround for upstream bug #56342
rm -f mysql-test/t/ssl_8k_key-master.opt rm -f mysql-test/t/ssl_8k_key-master.opt
@ -701,6 +703,7 @@ install -m 0644 mysql-test/rh-skipped-tests.list ${RPM_BUILD_ROOT}%{_datadir}/my
%changelog %changelog
* Mon Apr 22 2013 Honza Horak <hhorak@redhat.com> 5.5.31-2 * Mon Apr 22 2013 Honza Horak <hhorak@redhat.com> 5.5.31-2
- Build with _hardened_build - Build with _hardened_build
- Fix some paths related to test suite
* Fri Apr 19 2013 Honza Horak <hhorak@redhat.com> 5.5.31-1 * Fri Apr 19 2013 Honza Horak <hhorak@redhat.com> 5.5.31-1
- Update to MySQL 5.5.31, for various fixes described at - Update to MySQL 5.5.31, for various fixes described at