Mailinglist Archive: opensuse-commit (1301 mails)
| < Previous | Next > |
commit mysql
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Wed, 04 Jul 2007 23:32:16 +0200
- Message-id: <20070704213216.E75A8678183@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package mysql
checked in at Wed Jul 4 23:32:16 CEST 2007.
--------
--- mysql/mysql.changes 2007-06-06 11:44:18.000000000 +0200
+++ /mounts/work_src_done/STABLE/mysql/mysql.changes 2007-07-02 11:01:39.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Jul 2 10:58:59 CEST 2007 - mmarek@xxxxxxx
+
+- mysql_upgrade: don't fail if the db is already up-to-date
+ [#287209] (mysql_upgrade-exit-status.patch)
+
+-------------------------------------------------------------------
Old:
----
minmem
New:
----
mysql_upgrade-exit-status.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mysql.spec ++++++
--- /var/tmp/diff_new_pack.A26855/_old 2007-07-04 23:31:16.000000000 +0200
+++ /var/tmp/diff_new_pack.A26855/_new 2007-07-04 23:31:16.000000000 +0200
@@ -12,10 +12,10 @@
Name: mysql
BuildRequires: gcc-c++ ncurses-devel openssl-devel procps pwdutils readline-devel tcpd-devel zlib-devel
-License: GNU General Public License (GPL), individual distribution permission before version 3.23.xx
+License: GPL v2 or later, individual distribution permission before version 3.23.xx
Group: Productivity/Databases/Servers
Version: 5.0.41
-Release: 9
+Release: 14
# required by rcmysql
Requires: mysql-client = %{version}
Autoreqprov: on
@@ -39,8 +39,9 @@
Patch10: mysql-coredump.patch
Patch11: mysql-5.0.33-compiler-warnings.patch
Patch12: mysql_upgrade.patch
-Patch13: mysql-5.0.33-defaults-extra-file.patch
-Patch14: mysql-vpath.patch
+Patch13: mysql_upgrade-exit-status.patch
+Patch14: mysql-5.0.33-defaults-extra-file.patch
+Patch15: mysql-vpath.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -79,7 +80,7 @@
Provides: mysql-devel = %{version}-%{release}
Obsoletes: mysql-devel <= 5.0.26
Requires: libmysqlclient15 = %{version} libmysqlclient_r15 = %{version} glibc-devel zlib-devel openssl-devel
-License: GNU General Public License (GPL), See package "mysql" for more info
+License: GPL v2 or later, See package "mysql" for more info
Summary: MySQL Development Header Files and Libraries
URL: http://www.mysql.com
Group: Development/Libraries/C and C++
@@ -97,7 +98,7 @@
David Axmark <davida@xxxxxxxxx>
%package client
-License: GNU General Public License (GPL)
+License: GPL v2 or later
Summary: MySQL Client
URL: http://www.mysql.com
Group: Productivity/Databases/Clients
@@ -115,7 +116,7 @@
%package bench
Requires: mysql-client perl-DBD-mysql
-License: GNU Library General Public License v. 2.0 and 2.1 (LGPL), individual distribution permission before version 3.23.xx
+License: LGPL v2 or later, individual distribution permission before version 3.23.xx
Summary: MySQL - Benchmarks
URL: http://www.mysql.com
Group: Productivity/Databases/Tools
@@ -136,7 +137,7 @@
%package -n libmysqlclient15
Summary: MySQL Shared Libraries
-License: GNU General Public License (GPL)
+License: GPL v2 or later
URL: http://www.mysql.com
Group: Development/Libraries/Other
Autoreqprov: on
@@ -154,7 +155,7 @@
%package -n libmysqlclient_r15
Summary: MySQL Shared Libraries
-License: GNU General Public License (GPL)
+License: GPL v2 or later
URL: http://www.mysql.com
Group: Development/Libraries/Other
Autoreqprov: on
@@ -172,7 +173,7 @@
%package Max
Summary: MySQL - Server with Berkeley DB
-License: GNU General Public License (GPL)
+License: GPL v2 or later
URL: http://www.mysql.com
Group: Productivity/Databases/Servers
Requires: mysql = %{version}
@@ -192,7 +193,7 @@
%package debug
Summary: MySQL server with debug options turned on
-License: GNU General Public License (GPL)
+License: GPL v2 or later
URL: http://www.mysql.com
Group: Productivity/Databases/Servers
Requires: mysql = %{version}
@@ -213,7 +214,7 @@
%package test
Summary: MySQL testsuite
-License: GNU General Public License (GPL)
+License: GPL v2 or later
URL: http://www.mysql.com
Group: Productivity/Databases/Servers
Requires: mysql = %{version} mysql-client = %{version} perl-DBD-mysql
@@ -271,6 +272,7 @@
%patch12
%patch13
%patch14
+%patch15
# remove unneeded man manpages
rm man/mysqlman.1 man/safe_mysqld.1 man/mysql.server.1 man/make_win_*.1
rm man/mysqlmanager-pwgen.1 man/mysqlmanagerc.1
@@ -562,6 +564,9 @@
%files tools -f mysql-tools.files
%changelog
+* Mon Jul 02 2007 - mmarek@xxxxxxx
+- mysql_upgrade: don't fail if the db is already up-to-date
+ [#287209] (mysql_upgrade-exit-status.patch)
* Mon Jun 04 2007 - mmarek@xxxxxxx
- updated the mysql-test package (there are still some failures
that don't occur during build-time tests)
++++++ mysql_upgrade-exit-status.patch ++++++
returning non-zero exit status in this case is not nice to scripts using
mysql_upgrade (eg. our init script)
--- client/mysql_upgrade.c.orig
+++ client/mysql_upgrade.c
@@ -758,7 +758,9 @@ int main(int argc, char **argv)
printf("This installation of MySQL is already upgraded to %s, "
"use --force if you still need to run mysql_upgrade\n",
MYSQL_SERVER_VERSION);
- die(NULL);
+ free_used_memory();
+ my_end(MY_CHECK_ERROR);
+ exit(0);
}
/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |