commit eb85327d4df0d3a758a9a5ccc01e7debaf0f7688
Author: Elan Ruusamäe <[email protected]>
Date:   Tue Jan 1 15:07:10 2013 +0200

    Release 1.1.1 (Released December 14, 2012)
    
    - BUG#13559593: mysqldiskusage crashes if empty is specified and no empty 
dbs
    - BUG#14021584: mysqlfailover fails to promote a slave when master shut down
    - BUG#14031924: mysqlfailover fails to promote a slave w/explicit candidates
    - BUG#14624358: mysqlfailover should report gtid information for master
    - BUG#14711565: Exception thrown at Server module on unsupported server vers
    - BUG#14711624: mysqldbexport can fail if column is none
    - BUG#14802229: Correct GTID identifiers changed by BUG#14775984
    - BUG#15867353: Add GTID handling to mysqldbcopy, mysqldbexport
    - BUG#14735026: workbench scripts fail if db has non numeric

 bug-66863.patch      | 31 -------------------------------
 mysql-utilities.spec |  8 +++-----
 2 files changed, 3 insertions(+), 36 deletions(-)
---
diff --git a/mysql-utilities.spec b/mysql-utilities.spec
index 8be319b..8c40894 100644
--- a/mysql-utilities.spec
+++ b/mysql-utilities.spec
@@ -1,15 +1,14 @@
 # NOTE: Not yet published (currently bundled with mysql-workbench),
 Summary:       Scripts for managing and administering MySQL servers
 Name:          mysql-utilities
-Version:       1.1.0
+Version:       1.1.1
 Release:       1
 License:       GPL v2
 Group:         Applications/Databases
-Source0:       
ftp://ftp.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/mysql-workbench-gpl-5.2.44-src.tar.gz
-# Source0-md5: ea609fcd5d42333291a8ea6015627583
+Source0:       
ftp://ftp.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/mysql-workbench-gpl-5.2.45-src.tar.gz
+# Source0-md5: 9cb676dd11ae54e3b6b9819331050122
 Patch0:                mu-man.patch
 Patch1:                paths.patch
-Patch2:                bug-66863.patch
 URL:           https://code.launchpad.net/mysql-utilities
 BuildRequires: python-Sphinx >= 1.0
 BuildRequires: python-devel >= 1:2.4
@@ -30,7 +29,6 @@ mv mysql-workbench-gpl-*-src/ext/%{name}/* .
 %{__rm} -r mysql-workbench-gpl-*-src
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 # build static list of mysql utilities
 # because otherwise it will try to run python --help for every *.py it finds 
from /usr/bin!
diff --git a/bug-66863.patch b/bug-66863.patch
deleted file mode 100644
index dac1647..0000000
--- a/bug-66863.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-seems to have got bronken with this commit:
-
-http://bazaar.launchpad.net/~mysql/mysql-utilities/trunk/revision/148#mysql/utilities/common/server.py
-
-or maybe even earlier
-
-http://bugs.mysql.com/bug.php?id=66863
-also http://bugs.mysql.com/bug.php?id=67512
-
---- mysql-utilities-1.1.0/./mysql/utilities/common/server.py~  2012-09-26 
23:50:47.000000000 +0300
-+++ mysql-utilities-1.1.0/./mysql/utilities/common/server.py   2012-10-05 
01:30:37.440326297 +0300
-@@ -330,7 +330,7 @@
-     if not _require_version(source, version):
-         raise UtilError("The %s version is incompatible. Utility "
-                         "requires version %s or higher." %
--                        (source.name, version))
-+                        (source.host, version))
- 
-     # If not cloning, connect to the destination server and check version
-     if not cloning:
---- mysql-utilities-1.1.0/./mysql/utilities/common/server.py~  2012-10-05 
01:31:09.000000000 +0300
-+++ mysql-utilities-1.1.0/./mysql/utilities/common/server.py   2012-10-05 
01:42:07.724991092 +0300
-@@ -343,7 +343,7 @@
-         if not _require_version(destination, version):
-             raise UtilError("The %s version is incompatible. Utility "
-                             "requires version %s or higher." %
--                            (destination.name, version))
-+                            (destination.host, version))
-     elif not quiet and dest_dict is not None and \
-          not isinstance(dest_val, Server):
-         _print_connection(dest_name, src_dict)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mysql-utilities.git/commitdiff/eb85327d4df0d3a758a9a5ccc01e7debaf0f7688

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to