Hello community, here is the log from the commit of package mysql-administrator checked in at Fri Jun 9 23:29:19 CEST 2006. -------- --- mysql-administrator/mysql-administrator.changes 2006-05-04 12:00:11.000000000 +0200 +++ mysql-administrator/mysql-administrator.changes 2006-06-09 12:30:42.000000000 +0200 @@ -1,0 +2,17 @@ +Fri Jun 9 12:29:04 CEST 2006 - mmarek@suse.cz + +- reduce BuildRequires + +------------------------------------------------------------------- +Thu Jun 8 16:22:39 CEST 2006 - mmarek@suse.cz + +- update to version 1.1.10 (#168656) + * really fixes the deadlock (there was still a race) + * adds support for table engines Falcon, Archive, CSV, Blackhole, + Federated + * obsoleted patches: + mysql-administrator-1.1.6-xqual.patch + mysql-gui-common-0.6.0-xqual.patch + mysql-gui-common-0.6.0-gtk-fix.patch + +------------------------------------------------------------------- Old: ---- mysql-administrator-1.1.6-deadlock.patch mysql-administrator-1.1.6-help.patch mysql-administrator-1.1.6-interpreter.patch mysql-administrator-1.1.6-xqual.patch mysql-administrator-1.1.6.tar.bz2 mysql-gui-common-0.6.0-gtk-fix.patch mysql-gui-common-0.6.0-xqual.patch New: ---- mysql-administrator-1.1.10-deadlock.patch mysql-administrator-1.1.10-help.patch mysql-administrator-1.1.10-interpreter.patch mysql-administrator-1.1.10.tar.bz2 mysql-gui-common-0.6.0-unused-func.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql-administrator.spec ++++++ --- /var/tmp/diff_new_pack.I5AvIO/_old 2006-06-09 23:28:54.000000000 +0200 +++ /var/tmp/diff_new_pack.I5AvIO/_new 2006-06-09 23:28:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package mysql-administrator (Version 1.1.6) +# spec file for package mysql-administrator (Version 1.1.10) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,25 +11,23 @@ # norootforbuild Name: mysql-administrator -BuildRequires: gcc-c++ gnutls-devel gtkmm24-devel libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel mDNSResponder-devel mysql-devel pcre-devel update-desktop-files +BuildRequires: gcc-c++ gtkmm24-devel libglade2-devel mysql-devel pcre-devel update-desktop-files Summary: A MySQL Server Management, Configuration, and Monitoring Tool -Version: 1.1.6 -Release: 14 +Version: 1.1.10 +Release: 1 %define gui_version 0.6.0 Group: Productivity/Databases/Servers Requires: mysql-gui-common License: GPL URL: http://www.mysql.com/products/tools/administrator/ Source: %{name}-%{version}.tar.bz2 -Patch1: %{name}-%{version}-xqual.patch Patch2: %{name}-%{version}-help.patch Patch3: %{name}-%{version}-interpreter.patch Patch4: %{name}-%{version}-deadlock.patch # patch10+ is for mysql-gui-common (used in mysql-{administrator,query-browser}) -Patch10: mysql-gui-common-%{gui_version}-gtk-fix.patch -Patch11: mysql-gui-common-%{gui_version}-xqual.patch Patch12: mysql-gui-common-%{gui_version}-pkg-config.patch Patch13: mysql-gui-common-%{gui_version}-uninitialized.patch +Patch14: mysql-gui-common-%{gui_version}-unused-func.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -46,15 +44,13 @@ %prep %setup -q -n %{name}-%{version}/%{name} -%patch1 %patch2 %patch3 %patch4 cd ../mysql-gui-common -%patch10 -%patch11 %patch12 %patch13 +%patch14 %build # first we have to build the common libs @@ -65,7 +61,6 @@ cd ../%{name} %configure --with-commondirname=administrator make %{?jobs:-j%jobs} -(cd source/linux; ./static_make) || exit %install cd ../mysql-gui-common @@ -93,6 +88,17 @@ #{_datadir}/mysql-gui/administrator %changelog -n mysql-administrator +* Fri Jun 09 2006 - mmarek@suse.cz +- reduce BuildRequires +* Thu Jun 08 2006 - mmarek@suse.cz +- update to version 1.1.10 (#168656) + * really fixes the deadlock (there was still a race) + * adds support for table engines Falcon, Archive, CSV, Blackhole, + Federated + * obsoleted patches: + mysql-administrator-1.1.6-xqual.patch + mysql-gui-common-0.6.0-xqual.patch + mysql-gui-common-0.6.0-gtk-fix.patch * Thu May 04 2006 - mmarek@suse.cz - fix unexpected invocation of callback which caused a deadlock [#168656] (deadlock.patch) ++++++ mysql-administrator-1.1.6-deadlock.patch -> mysql-administrator-1.1.10-deadlock.patch ++++++ --- mysql-administrator/mysql-administrator-1.1.6-deadlock.patch 2006-05-04 11:45:44.000000000 +0200 +++ mysql-administrator/mysql-administrator-1.1.10-deadlock.patch 2006-06-06 09:57:06.000000000 +0200 @@ -1,6 +1,6 @@ --- source/linux/MAUserAdministrationPanel.cc +++ source/linux/MAUserAdministrationPanel.cc -@@ -2112,6 +2112,9 @@ +@@ -2141,6 +2141,9 @@ Gtk::TreeIter node= cnode; bool is_host= false; ++++++ mysql-administrator-1.1.6-help.patch -> mysql-administrator-1.1.10-help.patch ++++++ ++++++ mysql-administrator-1.1.6-interpreter.patch -> mysql-administrator-1.1.10-interpreter.patch ++++++ ++++++ mysql-administrator-1.1.6.tar.bz2 -> mysql-administrator-1.1.10.tar.bz2 ++++++ mysql-administrator/mysql-administrator-1.1.6.tar.bz2 mysql-administrator/mysql-administrator-1.1.10.tar.bz2 differ: char 11, line 1 ++++++ mysql-gui-common-0.6.0-unused-func.patch ++++++ --- library_sql_resultset/source/MYXResultSetStorage.cc +++ library_sql_resultset/source/MYXResultSetStorage.cc @@ -423,9 +423,9 @@ +/* MYXRSCompareStatus MYXResultSetStorage::get_compare_status(bigint row, int column) { - /* switch (_resultset->rows[row].diff&MYX_RD_MASK) { case MYX_RD_OTHER_ONLY: @@ -438,8 +438,9 @@ return MCSDiffers; default: return MCSMatch; - }*/ + } } +*/ MYXRSEditStatus MYXResultSetStorage::get_edit_status(bigint row, int column) const ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org