[packages/mysql] - update files (partial)
arekm
arekm at pld-linux.org
Thu Oct 22 11:54:45 CEST 2015
commit 19538fde3e451c7f8fb1312cc6600bbd72cb525d
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Thu Oct 22 11:54:39 2015 +0200
- update files (partial)
bug-44278.patch | 180 ---------------------------------------------
bug-66589.patch | 10 ---
bug-67402.patch | 14 ----
mysql-bug-43594.patch | 30 --------
mysql.spec | 112 ++++++----------------------
mysqlhotcopy-5.0-5.5.patch | 11 ---
6 files changed, 23 insertions(+), 334 deletions(-)
---
diff --git a/mysql.spec b/mysql.spec
index 2a6857e..b6947c2 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -57,8 +57,6 @@ Source13: %{name}-client.conf
Source14: my.cnf
Patch0: %{name}-opt.patch
Patch1: %{name}-versioning.patch
-Patch2: %{name}hotcopy-5.0-5.5.patch
-Patch3: bug-67402.patch
Patch4: %{name}-no-default-secure-auth.patch
Patch5: %{name}-system-libhsclient.patch
# from fedora
@@ -67,14 +65,12 @@ Patch6: %{name}-system-users.patch
Patch9: %{name}-build.patch
Patch11: %{name}-upgrade.patch
Patch12: %{name}-config.patch
-Patch14: %{name}-bug-43594.patch
+
Patch18: %{name}-sphinx.patch
Patch19: %{name}-chain-certs.patch
# from fedora
Patch20: %{name}-dubious-exports.patch
-Patch22: bug-66589.patch
-Patch23: bug-44278.patch
Patch24: %{name}-cmake.patch
Patch26: mysqldumpslow-clusters.patch
@@ -83,6 +79,7 @@ URL: http://www.mysql.com/products/community/
BuildRequires: bison >= 1.875
BuildRequires: boost-devel >= 1.59.0
BuildRequires: cmake >= 2.6
+BuildRequires: libaio-devel
BuildRequires: readline-devel >= 6.2
%if "%{pld_release}" == "ac"
BuildRequires: libstdc++4-devel >= 5:4.0
@@ -245,32 +242,6 @@ and server.
Ten pakiet zawiera definicje kodowań znaków potrzebne dla serwera i
klienta.
-%package -n mysqlhotcopy
-Summary: mysqlhotcopy - A MySQL database backup program
-Summary(pl.UTF-8): mysqlhotcopy - program do tworzenia kopii zapasowych baz MySQL
-Group: Applications/Databases
-Requires: perl-DBD-mysql
-
-%description -n mysqlhotcopy
-mysqlhotcopy uses LOCK TABLES, FLUSH TABLES, and cp or scp to make a
-database backup quickly. It is the fastest way to make a backup of the
-database or single tables, but it can be run only on the same machine
-where the database directories are located. mysqlhotcopy works only
-for backing up MyISAM and ARCHIVE tables.
-
-See innobackup package to backup InnoDB tables.
-
-%description -n mysqlhotcopy -l pl.UTF-8
-mysqlhotcopy wykorzystuje LOCK TABLES, FLUSH TABLES oraz cp i scp do
-szybkiego tworzenia kopii zapasowych baz danych. Jest to najszybszy
-sposób wykonania kopii zapasowej bazy danych lub pojedynczych tabel,
-ale może działać tylko na maszynie, na której znajdują się katalogi z
-bazą danych. mysqlhotcopy działa tylko dla tabel typu MyISAM i
-ARCHIVE.
-
-Narzędzie do tworzenia kopii tabel InnoDB znajduje się w pakiecie
-innobackup.
-
%package extras
Summary: MySQL additional utilities
Summary(pl.UTF-8): Dodatkowe narzędzia do MySQL
@@ -415,7 +386,7 @@ Summary(uk.UTF-8): MySQL - бенчмарки
Group: Applications/Databases
Requires: %{name} = %{version}-%{release}
Requires: %{name}-client
-Requires: perl(DBD::mysql)
+Requires: perl-DBD-mysql
Obsoletes: MySQL-bench
%description bench
@@ -505,8 +476,6 @@ mv sphinx-*/mysqlse storage/sphinx
%patch18 -p1
%endif
#%patch1 -p1
-#%patch2 -p1 DROP
-#%patch3 -p1 DROP
#%patch4 -p1 FIXME?
#%patch5 -p1
#%patch6 -p1 PROBABLY OBSOLETE
@@ -514,15 +483,12 @@ mv sphinx-*/mysqlse storage/sphinx
#%patch9 -p1
#%patch11 -p1
#%patch12 -p1
-#%patch14 -p0 DROP
# really not fixed? verify
%patch19 -p1
#%patch20 -p1
-#%patch22 -p1 DROP
-#%patch23 -p1 DROP
%patch24 -p1
%patch26 -p1
@@ -641,9 +607,6 @@ sed -i -e '/libs/s/-lprobes_mysql//' $RPM_BUILD_ROOT%{_bindir}/mysql_config
mv $RPM_BUILD_ROOT%{_bindir}/{,mysql_}resolve_stack_dump
mv $RPM_BUILD_ROOT%{_mandir}/man1/{,mysql_}resolve_stack_dump.1
-# move to _sysconfdir
-mv $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}}/mysqlaccess.conf
-
# not useful without -debug build
%{!?debug:%{__rm} $RPM_BUILD_ROOT%{_bindir}/mysql_resolve_stack_dump}
%{!?debug:%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mysql_resolve_stack_dump.1}
@@ -673,8 +636,6 @@ mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysqlcheck
#rm $RPM_BUILD_ROOT%{_datadir}/%{name}/mysql.server
#rm $RPM_BUILD_ROOT%{_datadir}/%{name}/binary-configure
%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/errmsg-utf8.txt
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/mysql_waitpid
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mysql_waitpid.1*
%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mysql.server*
%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mysqlman.1*
%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/comp_err.1*
@@ -693,8 +654,10 @@ mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysqlcheck
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/plugin/libdaemon_example.*
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/plugin/daemon_example.ini
-# not an .info file
-%{__rm} $RPM_BUILD_ROOT%{_infodir}/mysql.info
+# test plugins
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/plugin/libtest*.so
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/plugin/rewrite_example.so
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/plugin/test_security_context.so
%clean
rm -rf $RPM_BUILD_ROOT
@@ -897,7 +860,6 @@ done
%attr(754,root,root) /etc/rc.d/init.d/%{name}
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
%attr(640,root,mysql) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/clusters.conf
-%attr(755,root,root) %{_bindir}/ps_tokudb_admin
%attr(755,root,root) %{_sbindir}/innochecksum
%attr(755,root,root) %{_sbindir}/my_print_defaults
%attr(755,root,root) %{_sbindir}/myisamchk
@@ -911,30 +873,21 @@ done
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/plugin
%attr(755,root,root) %{_libdir}/%{name}/plugin/adt_null.so
-%attr(755,root,root) %{_libdir}/%{name}/plugin/audit_log.so
%attr(755,root,root) %{_libdir}/%{name}/plugin/auth.so
-%attr(755,root,root) %{_libdir}/%{name}/plugin/auth_pam.so
-%attr(755,root,root) %{_libdir}/%{name}/plugin/auth_pam_compat.so
%attr(755,root,root) %{_libdir}/%{name}/plugin/auth_socket.so
%attr(755,root,root) %{_libdir}/%{name}/plugin/auth_test_plugin.so
-%attr(755,root,root) %{_libdir}/%{name}/plugin/dialog.so
-#%attr(755,root,root) %{_libdir}/%{name}/plugin/ha_archive.so
-#%attr(755,root,root) %{_libdir}/%{name}/plugin/ha_blackhole.so
-#%attr(755,root,root) %{_libdir}/%{name}/plugin/ha_federated.so
-%attr(755,root,root) %{_libdir}/%{name}/plugin/handlersocket.so
-%attr(755,root,root) %{_libdir}/%{name}/plugin/libfnv1a_udf.so
-%attr(755,root,root) %{_libdir}/%{name}/plugin/libfnv_udf.so
-%attr(755,root,root) %{_libdir}/%{name}/plugin/libmurmur_udf.so
+%attr(755,root,root) %{_libdir}/%{name}/plugin/locking_service.so
%attr(755,root,root) %{_libdir}/%{name}/plugin/mypluglib.so
%attr(755,root,root) %{_libdir}/%{name}/plugin/mysql_no_login.so
%attr(755,root,root) %{_libdir}/%{name}/plugin/qa_auth_client.so
%attr(755,root,root) %{_libdir}/%{name}/plugin/qa_auth_interface.so
%attr(755,root,root) %{_libdir}/%{name}/plugin/qa_auth_server.so
-%attr(755,root,root) %{_libdir}/%{name}/plugin/query_response_time.so
-%attr(755,root,root) %{_libdir}/%{name}/plugin/scalability_metrics.so
+%attr(755,root,root) %{_libdir}/%{name}/plugin/replication_observers_example_plugin.so
+%attr(755,root,root) %{_libdir}/%{name}/plugin/rewriter.so
%attr(755,root,root) %{_libdir}/%{name}/plugin/semisync_master.so
%attr(755,root,root) %{_libdir}/%{name}/plugin/semisync_slave.so
%attr(755,root,root) %{_libdir}/%{name}/plugin/validate_password.so
+%attr(755,root,root) %{_libdir}/%{name}/plugin/version_token.so
%if %{with sphinx}
%attr(755,root,root) %{_libdir}/%{name}/plugin/ha_sphinx.so
%endif
@@ -967,6 +920,7 @@ done
# This is template for configuration file which is created after 'service mysql init'
%{_datadir}/%{name}/mysqld.conf
%{_datadir}/%{name}/mysql_security_commands.sql
+%{_datadir}/%{name}/mysql_sys_schema.sql
%{_datadir}/%{name}/mysql_system_tables_data.sql
%{_datadir}/%{name}/mysql_system_tables.sql
%{_datadir}/%{name}/mysql_test_data_timezone.sql
@@ -975,7 +929,8 @@ done
%{_datadir}/%{name}/dictionary.txt
%{_datadir}/%{name}/fill_help_tables.sql
%{_datadir}/%{name}/innodb_memcached_config.sql
-#%{_datadir}/%{name}/mysql_fix_privilege_tables.sql
+%{_datadir}/%{name}/install_rewriter.sql
+%{_datadir}/%{name}/uninstall_rewriter.sql
%lang(bg) %{_datadir}/%{name}/bulgarian
%lang(cs) %{_datadir}/%{name}/czech
%lang(da) %{_datadir}/%{name}/danish
@@ -1007,44 +962,26 @@ done
%files extras
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/msql2mysql
%attr(755,root,root) %{_bindir}/myisam_ftdump
%attr(755,root,root) %{_bindir}/mysql_install_db
+%attr(755,root,root) %{_bindir}/mysql_ssl_rsa_setup
%attr(755,root,root) %{_bindir}/mysql_secure_installation
%attr(755,root,root) %{_bindir}/mysql_tzinfo_to_sql
%attr(755,root,root) %{_bindir}/perror
%attr(755,root,root) %{_bindir}/replace
%attr(755,root,root) %{_bindir}/resolveip
-%{_mandir}/man1/msql2mysql.1*
%{_mandir}/man1/myisam_ftdump.1*
%{_mandir}/man1/mysql_install_db.1*
+%{_mandir}/man1/mysql_ssl_rsa_setup.1*
%{_mandir}/man1/mysql_secure_installation.1*
%{_mandir}/man1/mysql_tzinfo_to_sql.1*
%{_mandir}/man1/perror.1*
%{_mandir}/man1/replace.1*
%{_mandir}/man1/resolveip.1*
-%files -n mysqlhotcopy
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/mysqlhotcopy
-%{_mandir}/man1/mysqlhotcopy.1*
-
%files extras-perl
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/mysql_convert_table_format
-%attr(755,root,root) %{_bindir}/mysql_find_rows
-%attr(755,root,root) %{_bindir}/mysql_fix_extensions
-%attr(755,root,root) %{_bindir}/mysql_setpermission
-%attr(755,root,root) %{_bindir}/mysql_zap
-%attr(755,root,root) %{_bindir}/mysqlaccess
%attr(755,root,root) %{_bindir}/mysqldumpslow
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mysqlaccess.conf
-%{_mandir}/man1/mysql_convert_table_format.1*
-%{_mandir}/man1/mysql_find_rows.1*
-%{_mandir}/man1/mysql_fix_extensions.1*
-%{_mandir}/man1/mysql_setpermission.1*
-%{_mandir}/man1/mysql_zap.1*
-%{_mandir}/man1/mysqlaccess.1*
%{_mandir}/man1/mysqldumpslow.1*
%files client
@@ -1053,18 +990,18 @@ done
%attr(755,root,root) %{_bindir}/mysql
%attr(755,root,root) %{_bindir}/mysqladmin
%attr(755,root,root) %{_bindir}/mysqlbinlog
-%attr(755,root,root) %{_bindir}/mysqlbug
%attr(755,root,root) %{_bindir}/mysql_config_editor
%attr(755,root,root) %{_bindir}/mysqldump
%attr(755,root,root) %{_bindir}/mysqlimport
+%attr(755,root,root) %{_bindir}/mysqlpump
%attr(755,root,root) %{_bindir}/mysqlshow
%{_mandir}/man1/mysql.1*
%{_mandir}/man1/mysqladmin.1*
%{_mandir}/man1/mysqlbinlog.1*
-%{_mandir}/man1/mysqlbug.1*
%{_mandir}/man1/mysql_config_editor.1*
%{_mandir}/man1/mysqldump.1*
%{_mandir}/man1/mysqlimport.1*
+%{_mandir}/man1/mysqlpump.1*
%{_mandir}/man1/mysqlshow.1*
%files libs
@@ -1073,9 +1010,7 @@ done
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/mysql-client.conf
%{_sysconfdir}/%{name}/my.cnf
%attr(755,root,root) %{_libdir}/libmysqlclient.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmysqlclient.so.18
-%attr(755,root,root) %{_libdir}/libmysqlclient_r.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmysqlclient_r.so.18
+%attr(755,root,root) %ghost %{_libdir}/libmysqlclient.so.20
%if %{with ndb}
%attr(755,root,root) %{_libdir}/libndbclient.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libndbclient.so.3
@@ -1085,10 +1020,10 @@ done
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/mysql_config
%attr(755,root,root) %{_libdir}/libmysqlclient.so
-%attr(755,root,root) %{_libdir}/libmysqlclient_r.so
%if %{with ndb}
%attr(755,root,root) %{_libdir}/libndbclient.so
%endif
+%{_pkgconfigdir}/mysqlclient.pc
# static-only so far
%{_libdir}/libmysqld.a
%{_includedir}/mysql
@@ -1098,7 +1033,6 @@ done
%files static
%defattr(644,root,root,755)
%{_libdir}/libmysqlclient.a
-%{_libdir}/libmysqlclient_r.a
%if %{with ndb}
%{_libdir}/libndbclient.a
%endif
@@ -1107,9 +1041,9 @@ done
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/mysqlslap
%attr(755,root,root) %{_bindir}/mysqltest
-%dir %{_datadir}/sql-bench
-%{_datadir}/sql-bench/[CDRl]*
-%attr(755,root,root) %{_datadir}/sql-bench/[bcgirst]*
+#%dir %{_datadir}/sql-bench
+#%{_datadir}/sql-bench/[CDRl]*
+#%attr(755,root,root) %{_datadir}/sql-bench/[bcgirst]*
%{_mandir}/man1/mysqlslap.1*
%{_mandir}/man1/mysqltest.1*
%{_mandir}/man1/mysqltest_embedded.1*
diff --git a/bug-44278.patch b/bug-44278.patch
deleted file mode 100644
index b5d680c..0000000
--- a/bug-44278.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-http://bugs.mysql.com/bug.php?id=44278
-http://lists.mysql.com/commits/80079?f=plain
-
-From: Jim Winstead
-Date: August 4 2009 7:00pm
-Subject: bzr commit into mysql-5.1-bugteam branch (jimw:3055) Bug#44278
-List-Archive: http://lists.mysql.com/commits/80079
-X-Bug: 44278
-MIME-Version: 1.0
-Content-Type: multipart/mixed; boundary="===============1792034184=="
-
---===============1792034184==
-MIME-Version: 1.0
-Content-Type: text/plain; charset="us-ascii"
-Content-Transfer-Encoding: 7bit
-Content-Disposition: inline
-
-#At file:///Users/jimw/my/mysql-5.1-fixes/ based on revid:jimw at stripped
-
- 3055 Jim Winstead 2009-08-04
- mysqlhotcopy did not handle the encoding of schema names in the filesystem, so
- schemas with most non-alphanumeric characters in their name could not be
- backed up. (Bug #44278).
-
- modified:
- scripts/mysqlhotcopy.sh
-=== modified file 'scripts/mysqlhotcopy.sh'
---- Percona-Server-5.6.14-rel62.0/scripts/mysqlhotcopy.sh~ 2013-12-20 14:56:59.000000000 +0200
-+++ Percona-Server-5.6.14-rel62.0/scripts/mysqlhotcopy.sh 2013-12-20 14:58:39.183005974 +0200
-@@ -222,7 +222,7 @@ my ($tgt_dirname, $to_other_database);
- $to_other_database=0;
- if (defined($tgt_name) && $tgt_name =~ m:^\w+$: && @db_desc <= 1)
- {
-- $tgt_dirname = "$datadir/$tgt_name";
-+ $tgt_dirname = "$datadir/" . encode_identifier_as_filename($tgt_name);
- $to_other_database=1;
- }
- elsif (defined($tgt_name) && ($tgt_name =~ m:/: || $tgt_name eq '.')) {
-@@ -285,7 +285,7 @@ foreach my $rdb ( @db_desc ) {
- }
-
- ## get list of files to copy
-- my $db_dir = "$datadir/$db";
-+ my $db_dir = "$datadir/" . encode_identifier_as_filename($db);
- opendir(DBDIR, $db_dir )
- or die "Cannot open dir '$db_dir': $!";
-
-@@ -353,7 +353,8 @@ if (defined($tgt_name) && length $tgt_na
- elsif ($opt{method} =~ /^scp\b/)
- { # we have to trust scp to hit the target
- foreach my $rdb ( @db_desc ) {
-- $rdb->{target} = "$tgt_dirname/$rdb->{src}";
-+ $rdb->{target} = "$tgt_dirname/" .
-+ encode_identifier_as_filename($rdb->{src});
- }
- }
- else
-@@ -361,7 +362,8 @@ if (defined($tgt_name) && length $tgt_na
- die "Last argument ($tgt_dirname) is not a directory\n"
- if (!(-e $tgt_dirname && -d $tgt_dirname ) );
- foreach my $rdb ( @db_desc ) {
-- $rdb->{target} = "$tgt_dirname/$rdb->{src}";
-+ $rdb->{target} = "$tgt_dirname/" .
-+ encode_identifier_as_filename($rdb->{src});
- }
- }
- }
-@@ -369,7 +371,8 @@ else {
- die "Error: expected \$opt{suffix} to exist" unless ( exists $opt{suffix} );
-
- foreach my $rdb ( @db_desc ) {
-- $rdb->{target} = "$datadir/$rdb->{src}$opt{suffix}";
-+ $rdb->{target} = "$datadir/" .
-+ encode_identifier_as_filename("$rdb->{src}$opt{suffix}");
- }
- }
-
-@@ -464,7 +464,8 @@
- else {
- mkdir($tgt_dirpath, 0750) or die "Can't create '$tgt_dirpath': $!\n"
- unless -d $tgt_dirpath;
-- my @f_info= stat "$datadir/$rdb->{src}";
-+ my @f_info= stat "$datadir/" .
-+ encode_identifier_as_filename($rdb->{src});
- chown $f_info[4], $f_info[5], $tgt_dirpath;
- }
- }
-@@ -471,7 +475,9 @@ my @failed = ();
-
- foreach my $rdb ( @db_desc )
- {
-- my @files = map { "$datadir/$rdb->{src}/$_" } @{$rdb->{files}};
-+ my @files = map { "$datadir/" .
-+ encode_identifier_as_filename($rdb->{src}) .
-+ "/$_" } @{$rdb->{files}};
- next unless @files;
-
- eval { copy_files($opt{method}, \@files, $rdb->{target}); };
-@@ -482,7 +488,8 @@ foreach my $rdb ( @db_desc )
- if ($rdb->{index})
- {
- copy_index($opt{method}, \@files,
-- "$datadir/$rdb->{src}", $rdb->{target} );
-+ "$datadir/" . encode_identifier_as_filename($rdb->{src}),
-+ $rdb->{target} );
- }
-
- if ( $opt{checkpoint} ) {
-@@ -794,6 +801,20 @@ sub quote_names {
- return "`$db`.`$table`";
- }
-
-+#
-+# In MySQL 5.1 and later, directory and table names are encoded on disk.
-+# We use the server to figure out the encoded names, and just fall back
-+# to the unencoded identifier if that fails.
-+#
-+sub encode_identifier_as_filename {
-+ my ($ident)= @_;
-+ my ($filename)= $dbh->selectrow_array(
-+ "SELECT BINARY(CAST(? AS CHAR CHARACTER SET FILENAME))",
-+ { RaiseError => 0 },
-+ $ident);
-+ return $filename ? $filename : $ident;
-+}
-+
- __END__
-
- =head1 DESCRIPTION
-
-
---===============1792034184==
-MIME-Version: 1.0
-Content-Type: text/bzr-bundle; charset="us-ascii";
- name="bzr/jimw at stripped"
-Content-Transfer-Encoding: 7bit
-Content-Disposition: inline
-
-# Bazaar merge directive format 2 (Bazaar 0.90)
-# revision_id: jimw at stripped
-# target_branch: file:///Users/jimw/my/mysql-5.1-fixes/
-# testament_sha1: 21dd6f5b49582e2759b846d4abfe69e3f3c913d4
-# timestamp: 2009-08-04 12:00:08 -0700
-# source_branch: bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-\
-# 5.1-bugteam/
-# base_revision_id: jimw at stripped
-#
-# Begin bundle
-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
-F3JFOFCQVDO13Q==
-
-
---===============1792034184==--
diff --git a/bug-66589.patch b/bug-66589.patch
deleted file mode 100644
index fbf75e6..0000000
--- a/bug-66589.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Percona-Server-5.5.33-rel31.1/scripts/mysqlhotcopy.sh~ 2013-10-02 20:29:57.000000000 +0300
-+++ Percona-Server-5.5.33-rel31.1/scripts/mysqlhotcopy.sh 2013-10-02 20:30:33.825747635 +0300
-@@ -268,6 +268,7 @@
- $sth_dbs->execute;
- while ( my ($db_name) = $sth_dbs->fetchrow_array ) {
- next if $db_name =~ m/^information_schema$/i;
-+ next if $db_name =~ m/^performance_schema$/i;
- push @db_desc, { 'src' => $db_name, 't_regex' => $t_regex } if ( $db_name =~ m/$opt{regexp}/o );
- }
- }
diff --git a/bug-67402.patch b/bug-67402.patch
deleted file mode 100644
index 18bd2ee..0000000
--- a/bug-67402.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-
-Upstream-Bugtracker: http://bugs.mysql.com/67402
-
---- 5.5.27/scripts/mysqlhotcopy.sh~ 2012-10-28 21:20:46.000000000 +0200
-+++ 5.5.27/scripts/mysqlhotcopy.sh 2012-10-28 21:23:12.574442093 +0200
-@@ -895,7 +895,7 @@
-
- CREATE TABLE log_pos (
- host varchar(60) NOT null,
-- time_stamp timestamp(14) NOT NULL,
-+ time_stamp timestamp NOT NULL,
- log_file varchar(32) default NULL,
- log_pos int(11) default NULL,
- master_host varchar(60) NULL,
diff --git a/mysql-bug-43594.patch b/mysql-bug-43594.patch
deleted file mode 100644
index b8cc07b..0000000
--- a/mysql-bug-43594.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-=== modified file 'scripts/mysqlhotcopy.sh'
---- scripts/mysqlhotcopy.sh 2008-03-07 20:45:40 +0000
-+++ scripts/mysqlhotcopy.sh 2009-03-12 13:06:42 +0000
-@@ -777,7 +777,24 @@ sub get_list_of_tables {
- } || [];
- warn "Unable to retrieve list of tables in $db: $@" if $@;
-
-- return (map { $_->[0] } @$tables);
-+ my @ignore_tables = ();
-+
-+ # Ignore tables for the mysql database
-+ if ($db eq 'mysql') {
-+ @ignore_tables = qw(general_log slow_log schema apply_status);
-+ }
-+
-+ my @res = ();
-+ if ($#ignore_tables > 1) {
-+ my @tmp = (map { $_->[0] } @$tables);
-+ for my $t (@tmp) {
-+ push(@res, $t) if not exists { map { $_=>1 } @ignore_tables }->{$t};
-+ }
-+ } else {
-+ @res = (map { $_->[0] } @$tables);
-+ }
-+
-+ return @res;
- }
-
- sub quote_names {
-
diff --git a/mysqlhotcopy-5.0-5.5.patch b/mysqlhotcopy-5.0-5.5.patch
deleted file mode 100644
index 3382da2..0000000
--- a/mysqlhotcopy-5.0-5.5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./scripts/mysqlhotcopy.sh~ 2013-03-19 11:30:02.000000000 +0200
-+++ ./scripts/mysqlhotcopy.sh 2013-05-10 00:42:25.986175909 +0300
-@@ -789,7 +789,7 @@
-
- eval {
- my ($file,$position) = get_row( $dbh, "show master status" );
-- die "master status is undefined" if !defined $file || !defined $position;
-+ warn "master status is undefined" if !defined $file || !defined $position;
-
- my $row_hash = get_row_hash( $dbh, "show slave status" );
- my ($master_host, $log_file, $log_pos );
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mysql.git/commitdiff/19538fde3e451c7f8fb1312cc6600bbd72cb525d
More information about the pld-cvs-commit
mailing list