fix bug 66589, mysqlhotcopy yet again forgot _schema table

diff --git a/bug-66589.patch b/bug-66589.patch
new file mode 100644 (file)
index 0000000..fbf75e6
--- /dev/null
+++ b/bug-66589.patch
@@ -0,0 +1,10 @@
+--- 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/mysql.spec b/mysql.spec
index 98e139f5ca77db12785588626dcdedc3b4349727..b7d69e199dd46e34939edcef889094fa3c8f5b99 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -35,7 +35,7 @@ Summary(uk.UTF-8):    MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):  MySQL数据库服务器
 Name:          mysql
 Version:       5.5.33
-Release:       1
+Release:       2
 License:       GPL + MySQL FLOSS Exception
 Group:         Applications/Databases
 # Source0Download: http://dev.mysql.com/downloads/mysql/5.5.html#downloads
@@ -59,6 +59,7 @@ Source13:     %{name}-client.conf
 Source14:      my.cnf
 # from fedora
 Source15:      lib%{name}.version
+
 Patch2:                %{name}hotcopy-5.0-5.5.patch
 Patch3:                bug-67402.patch
 # from fedora
@@ -73,6 +74,7 @@ Patch19:      %{name}-chain-certs.patch
 # from fedora
 Patch20:       %{name}-dubious-exports.patch
 Patch21:       bison3.patch
+Patch22:       bug-66589.patch
 URL:           http://www.mysql.com/products/community/
 BuildRequires: bison >= 1.875
 BuildRequires: cmake >= 2.6
@@ -503,6 +505,7 @@ mv sphinx-*/mysqlse storage/sphinx
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
 
 # to get these files rebuild
 [ -f sql/sql_yacc.cc ] && rm sql/sql_yacc.cc