From: Elan Ruusamäe <glen@delfi.ee>
Date: Sun, 28 Oct 2012 19:37:05 +0000 (+0200)
Subject: mysqlhotcopy: fix documentation error for log_pos table
X-Git-Tag: auto/th/mysql-5.5.28-1~6
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=d6ae4994f776a0a9516d34be73525e64ce7ff622;p=packages%2Fmysql.git

mysqlhotcopy: fix documentation error for log_pos table
---

diff --git a/bug-67402.patch b/bug-67402.patch
new file mode 100644
index 0000000..18bd2ee
--- /dev/null
+++ b/bug-67402.patch
@@ -0,0 +1,14 @@
+
+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.spec b/mysql.spec
index bd81d76..1a3a047 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -26,6 +26,7 @@
 %bcond_with	tests		# FIXME: don't run correctly
 %bcond_with	ndb		# NDB is now a separate product, this here is broken, so disable it
 
+%define	percona_rel	28.1
 %include	/usr/lib/rpm/macros.perl
 Summary:	MySQL: a very fast and reliable SQL database engine
 Summary(de.UTF-8):	MySQL: ist eine SQL-Datenbank
@@ -36,14 +37,13 @@ Summary(ru.UTF-8):	MySQL - быстрый SQL-сервер
 Summary(uk.UTF-8):	MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):	MySQL数据库服务器
 Name:		mysql
-%define	percona_rel	28.1
 Version:	5.5.27
 Release:	1
 License:	GPL + MySQL FLOSS Exception
 Group:		Applications/Databases
 # Source0Download: http://dev.mysql.com/downloads/mysql/5.5.html#downloads
 # Source0:	http://vesta.informatik.rwth-aachen.de/mysql/Downloads/MySQL-5.5/%{name}-%{version}.tar.gz
-Source0:	http://www.percona.com/redir/downloads/Percona-Server-5.5/Percona-Server-5.5.27-28.1/source/Percona-Server-5.5.27-rel28.1.tar.gz
+Source0:	http://www.percona.com/redir/downloads/Percona-Server-5.5/Percona-Server-5.5.27-28.1/source/Percona-Server-%{version}-rel28.1.tar.gz
 # Source0-md5:	92fecef62446b5388ec2369d997506ed
 Source100:	http://sphinxsearch.com/files/sphinx-2.0.3-release.tar.gz
 # Source100-md5:	a1293aecd5034aa797811610beb7ba89
@@ -63,6 +63,7 @@ Source14:	my.cnf
 # from fedora
 Source15:	lib%{name}.version
 
+Patch3:		bug-67402.patch
 Patch4:		bug-62472.patch
 # from fedora
 Patch5:		%{name}-versioning.patch
@@ -496,6 +497,7 @@ mv sphinx-*/mysqlse storage/sphinx
 %patch18 -p1
 %endif
 
+%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1