openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package mysql (Revision 7c9649b6bbf15f070ab72aea3e5ac117)

Currently displaying revision 7c9649b6bbf15f070ab72aea3e5ac117 , Show latest

--- mysql-cnf.patch.orig
+++ mysql-cnf.patch
@@ -1,7 +1,8 @@
-diff -Naru mysql-5.1.33-bak/support-files/my-huge.cnf.sh mysql-5.1.33/support-files/my-huge.cnf.sh
---- mysql-5.1.33-bak/support-files/my-huge.cnf.sh	2009-04-03 15:24:32.000000000 +0200
-+++ mysql-5.1.33/support-files/my-huge.cnf.sh	2009-04-03 15:24:49.000000000 +0200
-@@ -134,6 +134,10 @@
+Index: support-files/my-huge.cnf.sh
+===================================================================
+--- support-files/my-huge.cnf.sh.orig
++++ support-files/my-huge.cnf.sh
+@@ -131,6 +131,10 @@ server-id	= 1
  #innodb_flush_log_at_trx_commit = 1
  #innodb_lock_wait_timeout = 50
  
@@ -12,10 +13,11 @@ diff -Naru mysql-5.1.33-bak/support-file
  [mysqldump]
  quick
  max_allowed_packet = 16M
-diff -Naru mysql-5.1.33-bak/support-files/my-large.cnf.sh mysql-5.1.33/support-files/my-large.cnf.sh
---- mysql-5.1.33-bak/support-files/my-large.cnf.sh	2009-04-03 15:24:32.000000000 +0200
-+++ mysql-5.1.33/support-files/my-large.cnf.sh	2009-04-03 15:24:49.000000000 +0200
-@@ -134,6 +134,10 @@
+Index: support-files/my-large.cnf.sh
+===================================================================
+--- support-files/my-large.cnf.sh.orig
++++ support-files/my-large.cnf.sh
+@@ -131,6 +131,10 @@ server-id	= 1
  #innodb_flush_log_at_trx_commit = 1
  #innodb_lock_wait_timeout = 50
  
@@ -26,19 +28,20 @@ diff -Naru mysql-5.1.33-bak/support-file
  [mysqldump]
  quick
  max_allowed_packet = 16M
-diff -Naru mysql-5.1.33-bak/support-files/my-medium.cnf.sh mysql-5.1.33/support-files/my-medium.cnf.sh
---- mysql-5.1.33-bak/support-files/my-medium.cnf.sh	2009-04-03 15:24:32.000000000 +0200
-+++ mysql-5.1.33/support-files/my-medium.cnf.sh	2009-04-03 15:24:49.000000000 +0200
-@@ -26,6 +26,8 @@
+Index: support-files/my-medium.cnf.sh
+===================================================================
+--- support-files/my-medium.cnf.sh.orig
++++ support-files/my-medium.cnf.sh
+@@ -26,6 +26,8 @@ socket		= @MYSQL_UNIX_ADDR@
  [mysqld]
  port		= @MYSQL_TCP_PORT@
  socket		= @MYSQL_UNIX_ADDR@
 +# Change following line if you want to store your database elsewhere
 +datadir	= /var/lib/mysql
  skip-locking
- key_buffer = 16M
+ key_buffer_size = 16M
  max_allowed_packet = 1M
-@@ -132,7 +134,13 @@
+@@ -129,7 +131,13 @@ server-id	= 1
  #innodb_flush_log_at_trx_commit = 1
  #innodb_lock_wait_timeout = 50
  
@@ -52,10 +55,11 @@ diff -Naru mysql-5.1.33-bak/support-file
  quick
  max_allowed_packet = 16M
  
-diff -Naru mysql-5.1.33-bak/support-files/my-small.cnf.sh mysql-5.1.33/support-files/my-small.cnf.sh
---- mysql-5.1.33-bak/support-files/my-small.cnf.sh	2009-04-03 15:24:32.000000000 +0200
-+++ mysql-5.1.33/support-files/my-small.cnf.sh	2009-04-03 15:24:49.000000000 +0200
-@@ -65,6 +65,10 @@
+Index: support-files/my-small.cnf.sh
+===================================================================
+--- support-files/my-small.cnf.sh.orig
++++ support-files/my-small.cnf.sh
+@@ -65,6 +65,10 @@ server-id	= 1
  #innodb_flush_log_at_trx_commit = 1
  #innodb_lock_wait_timeout = 50
  
--- mysql-group.patch.orig
+++ mysql-group.patch
@@ -1,7 +1,8 @@
-diff -Naru mysql-5.1.34-bak/configure.in mysql-5.1.34/configure.in
---- mysql-5.1.34-bak/configure.in	2009-03-31 16:35:39.000000000 +0200
-+++ mysql-5.1.34/configure.in	2009-04-20 16:49:56.000000000 +0200
-@@ -772,6 +772,14 @@
+Index: configure.in
+===================================================================
+--- configure.in.orig
++++ configure.in
+@@ -772,6 +772,14 @@ AC_ARG_WITH(mysqld-user,
      [ MYSQLD_USER=mysql ]
      )
  AC_SUBST(MYSQLD_USER)
@@ -16,10 +17,11 @@ diff -Naru mysql-5.1.34-bak/configure.in
  
  # If we should allow LOAD DATA LOCAL
  AC_MSG_CHECKING(If we should should enable LOAD DATA LOCAL by default)
-diff -Naru mysql-5.1.34-bak/scripts/Makefile.am mysql-5.1.34/scripts/Makefile.am
---- mysql-5.1.34-bak/scripts/Makefile.am	2009-03-31 16:38:52.000000000 +0200
-+++ mysql-5.1.34/scripts/Makefile.am	2009-04-20 16:49:56.000000000 +0200
-@@ -185,6 +185,7 @@
+Index: scripts/Makefile.am
+===================================================================
+--- scripts/Makefile.am.orig
++++ scripts/Makefile.am
+@@ -185,6 +185,7 @@ SUFFIXES = .sh
  	  -e 's!@''TARGET_LINUX''@!@TARGET_LINUX@!' \
  	  -e "s!@""CONF_COMMAND""@!@CONF_COMMAND@!" \
  	  -e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \
@@ -27,10 +29,11 @@ diff -Naru mysql-5.1.34-bak/scripts/Make
  	  -e 's!@''STATIC_NSS_FLAGS''@!@STATIC_NSS_FLAGS@!' \
  	  -e 's!@''NON_THREADED_LIBS''@!@NON_THREADED_LIBS@!' \
  	  -e 's!@''ZLIB_DEPS''@!@ZLIB_DEPS@!' \
-diff -Naru mysql-5.1.34-bak/scripts/mysqld_safe.sh mysql-5.1.34/scripts/mysqld_safe.sh
---- mysql-5.1.34-bak/scripts/mysqld_safe.sh	2009-03-31 16:38:52.000000000 +0200
-+++ mysql-5.1.34/scripts/mysqld_safe.sh	2009-04-20 16:50:41.000000000 +0200
-@@ -19,6 +19,7 @@
+Index: scripts/mysqld_safe.sh
+===================================================================
+--- scripts/mysqld_safe.sh.orig
++++ scripts/mysqld_safe.sh
+@@ -19,6 +19,7 @@ logging=init
  want_syslog=0
  syslog_tag=
  user='@MYSQLD_USER@'
@@ -38,7 +41,7 @@ diff -Naru mysql-5.1.34-bak/scripts/mysq
  pid_file=
  err_log=
  
-@@ -162,6 +163,7 @@
+@@ -162,6 +163,7 @@ parse_arguments() {
        --datadir=*) DATADIR="$val" ;;
        --pid-file=*) pid_file="$val" ;;
        --user=*) user="$val"; SET_USER=1 ;;
@@ -46,7 +49,7 @@ diff -Naru mysql-5.1.34-bak/scripts/mysq
  
        # these might have been set in a [mysqld_safe] section of my.cnf
        # they are added to mysqld command line to override settings from my.cnf
-@@ -388,11 +390,17 @@
+@@ -388,11 +390,17 @@ then
    if test "$user" != "root" -o $SET_USER = 1
    then
      USER_OPTION="--user=$user"
@@ -54,8 +57,8 @@ diff -Naru mysql-5.1.34-bak/scripts/mysq
    fi
    # Change the err log to the right user, if it is in use
    if [ $want_syslog -eq 0 ]; then
-     touch $err_log
--    chown $user $err_log
+     touch "$err_log"
+-    chown $user "$err_log"
 +    if [ "$user" -a "$group" ]; then
 +      chown $user:$group $err_log
 +    else
@@ -65,7 +68,7 @@ diff -Naru mysql-5.1.34-bak/scripts/mysq
    fi
    if test -n "$open_files"
    then
-@@ -407,7 +415,12 @@
+@@ -407,7 +415,12 @@ mysql_unix_port_dir=`dirname $safe_mysql
  if [ ! -d $mysql_unix_port_dir ]
  then
    mkdir $mysql_unix_port_dir
@@ -79,10 +82,11 @@ diff -Naru mysql-5.1.34-bak/scripts/mysq
    chmod 755 $mysql_unix_port_dir
  fi
  
-diff -Naru mysql-5.1.34-bak/scripts/mysql_install_db.sh mysql-5.1.34/scripts/mysql_install_db.sh
---- mysql-5.1.34-bak/scripts/mysql_install_db.sh	2009-03-31 16:38:52.000000000 +0200
-+++ mysql-5.1.34/scripts/mysql_install_db.sh	2009-04-20 16:49:56.000000000 +0200
-@@ -28,6 +28,7 @@
+Index: scripts/mysql_install_db.sh
+===================================================================
+--- scripts/mysql_install_db.sh.orig
++++ scripts/mysql_install_db.sh
+@@ -28,6 +28,7 @@ args=""
  defaults=""
  mysqld_opt=""
  user=""
@@ -90,7 +94,7 @@ diff -Naru mysql-5.1.34-bak/scripts/mysq
  
  force=0
  in_rpm=0
-@@ -63,6 +64,11 @@
+@@ -63,6 +64,11 @@ Usage: $0 [OPTIONS]
                         user.  You must be root to use this option.  By default
                         mysqld runs using your current login name and files and
                         directories that it creates will be owned by you.
@@ -102,7 +106,7 @@ diff -Naru mysql-5.1.34-bak/scripts/mysq
  
  All other options are passed to the mysqld program
  
-@@ -103,11 +109,11 @@
+@@ -103,11 +109,11 @@ parse_arguments()
        --builddir=*) builddir=`parse_arg "$arg"` ;;
        --srcdir=*)  srcdir=`parse_arg "$arg"` ;;
        --ldata=*|--datadir=*) ldata=`parse_arg "$arg"` ;;
@@ -116,7 +120,7 @@ diff -Naru mysql-5.1.34-bak/scripts/mysq
        --skip-name-resolve) ip_only=1 ;;
        --verbose) verbose=1 ;; # Obsolete
        --rpm) in_rpm=1 ;;
-@@ -360,7 +366,12 @@
+@@ -360,7 +366,12 @@ do
    fi
    if test -w / -a ! -z "$user"
    then
@@ -130,7 +134,7 @@ diff -Naru mysql-5.1.34-bak/scripts/mysq
    fi
  done
  
-@@ -369,6 +380,11 @@
+@@ -369,6 +380,11 @@ then
    args="$args --user=$user"
  fi
  
--- mysql.changes.orig
+++ mysql.changes
@@ -1,7 +1,21 @@
 -------------------------------------------------------------------
-Fri Jul 24 17:35:07 CEST 2009 - dmueller@suse.de
+Mon Jul 27 14:45:24 CEST 2009 - mhrusecky@suse.cz
 
-- fix baselibs.conf (bnc#525065)
+- Applying upstream patch for upstream bug#36259
+  'Optimizing with ORDER BY'
+- Disabling bmove512 as it can make performance worse then memcpy
+  (see upstream bug #19974)
+
+-------------------------------------------------------------------
+Tue Jul  7 11:19:05 CEST 2009 - mhrusecky@suse.cz
+
+- updated to 5.1.36, see
+  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-36.html
+
+-------------------------------------------------------------------
+Fri Jun 26 11:09:34 CEST 2009 - mhrusecky@suse.cz
+
+- fixed rcmysql status
 
 -------------------------------------------------------------------
 Tue Jun 23 19:33:08 CEST 2009 - mhrusecky@suse.cz
--- mysql.spec.orig
+++ mysql.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package mysql (Version 5.1.35)
+# spec file for package mysql (Version 5.1.36)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -20,17 +20,19 @@
 %if %{?rel:0}%{!?rel:1}
 %define rel 1
 %endif
+
 #Distribution:   %dist
 #Packager:       %packager
 #Vendor:         %vendor
 
 Name:           mysql
 Summary:        A True Multiuser, Multithreaded SQL Database Server
-Version:        5.1.35
-Release:        2
+Version:        5.1.36
+Release:        1
 License:        GPL v2 only
 Group:          Productivity/Databases/Servers
 Url:            http://www.mysql.com
+# http://dev.mysql.com/get/Downloads/MySQL-5.1/%{name}-%{version}.tar.gz/from/pick
 Source:         mysql-%{version}.tar.bz2
 Source3:        README.debug
 Source4:        suse-test-run
@@ -80,11 +82,14 @@ Patch31:        mysql-5.1.33-ssl-lib64-m
 Patch32:        mysql-5.1.34-code-cleanup.patch
 # PATCH-FIX-SUSE mysql-5.1.35-test-rpl_ndb_circular.patch [] mhrusecky@suse.cz -- better cleanup after rpl_ndb_circular* tests - bug is known to upstream but no clean solution exists (this may also fail, it just happens less)
 Patch33:        mysql-5.1.35-test-rpl_ndb_circular.patch
-# PATCH-FIX-UPSTREAM mysql-5.1.35-test-events_stress-cleanup.patch [ upstream#45617 ] mhrusecky@suse.cz -- cleanup at the end of the test
-# http://bugs.mysql.com/bug.php?id=45617 
-Patch34:        mysql-5.1.35-test-events_stress-cleanup.patch
 # PATCH-FIX-SUSE mysql-5.1.35-test-utf8.patch [] mhrusecky@suse.cz -- we use utf-8 by default which produces different output with few tests
 Patch35:        mysql-5.1.35-test-utf8.patch
+# PATCH-FIX_UPSTREAM mysql-5.1.36-bug36259.patch [ upstream#36259 ] mhrusecky@suse.cz -- application of upstream patch
+# http://bugs.mysql.com/bug.php?id=36259
+Patch36:        mysql-5.1.36-bug36259.patch
+# PATCH-FIX-UPSTREAM mysql-5.1.36-bmove512.patch [ upstream#19974 ] mhrusecky@suse.cz -- disabling bmove512 as it is ugly and performs badly on newer machines
+# http://bugs.mysql.com/bug.php?id=19974
+Patch37:        mysql-5.1.36-bmove512.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         /usr/sbin/useradd /usr/sbin/groupadd
 PreReq:         coreutils sed grep
@@ -103,11 +108,12 @@ Recommends:     logrotate
 %else
 Requires:       logrotate
 %endif
+
 # required by rcmysql
 Requires:       mysql-client = %{version} perl-base
+
 Obsoletes:      mysql-Max <= %{version}
 Provides:       mysql-Max = %{version}
-#-------------------------------------------------------------------------------
 
 %description
 SQL is the most popular database language in the world. MySQL is a
@@ -138,8 +144,8 @@ Authors:
     Michael Widenius <monty@mysql.com>
     David Axmark <davida@mysql.com>
 
---------------------------------------------------------------------------------
 
+#--------------------------------------------------------------------------------
 %package -n libmysqlclient-devel
 #-------------------------------------------------------------------------------
 # mysql-devel was last used in openSUSE 10.2
@@ -149,7 +155,6 @@ Requires:       libmysqlclient16 = %vers
 Summary:        MySQL Development Header Files and Libraries
 License:        GPL v2 only ; with additional permissions: EXCEPTIONS-CLIENT
 Group:          Development/Libraries/C and C++
-#-------------------------------------------------------------------------------
 
 %description -n libmysqlclient-devel
 This package contains the development header files and libraries
@@ -160,29 +165,26 @@ Authors:
     Michael Widenius <monty@mysql.com>
     David Axmark <davida@mysql.com>
 
---------------------------------------------------------------------------------
 
+#--------------------------------------------------------------------------------
 %package -n libmysqld-devel
-License:        GPL v2 only ; with additional permissions: EXCEPTIONS-CLIENT
 #-------------------------------------------------------------------------------
+License:        GPL v2 only ; with additional permissions: EXCEPTIONS-CLIENT
 Summary:        MySQL embedded server development files
 # the headers files are the shared
 Requires:       libmysqlclient-devel = %version
 Group:          Development/Libraries/C and C++
-#-------------------------------------------------------------------------------
 
 %description -n libmysqld-devel
 This package contains the development header files and libraries
 for developing application that embed the MySQL server
 
---------------------------------------------------------------------------------
-
+#-------------------------------------------------------------------------------
 %package client
-License:        GPL v2 only ; with additional permissions: EXCEPTIONS-CLIENT
 #-------------------------------------------------------------------------------
+License:        GPL v2 only ; with additional permissions: EXCEPTIONS-CLIENT
 Summary:        MySQL Client
 Group:          Productivity/Databases/Clients
-#-------------------------------------------------------------------------------
 
 %description client
 This package contains the standard MySQL clients.
@@ -192,15 +194,14 @@ Authors:
     Michael Widenius <monty@mysql.com>
     David Axmark <davida@mysql.com>
 
---------------------------------------------------------------------------------
 
+#-------------------------------------------------------------------------------
 %package bench
 #-------------------------------------------------------------------------------
 Requires:       mysql-client perl-DBD-mysql
 License:        LGPL v2.1 only
 Summary:        MySQL - Benchmarks
 Group:          Productivity/Databases/Tools
-#-------------------------------------------------------------------------------
 
 %description bench
 This package contains MySQL benchmark scripts and data.
@@ -213,14 +214,12 @@ Authors:
     Michael Widenius <monty@mysql.com>
     David Axmark <davida@mysql.com>
 
---------------------------------------------------------------------------------
-
+#-------------------------------------------------------------------------------
 %package -n libmysqlclient16
 #-------------------------------------------------------------------------------
 Summary:        MySQL Shared Libraries
 License:        GPL v2 only ; with additional permissions: EXCEPTIONS-CLIENT
 Group:          Development/Libraries/Other
-#-------------------------------------------------------------------------------
 
 %description -n libmysqlclient16
 This package contains the shared libraries (.so) which certain
@@ -231,14 +230,12 @@ Authors:
     Michael Widenius <monty@mysql.com>
     David Axmark <davida@mysql.com>
 
---------------------------------------------------------------------------------
-
+#-------------------------------------------------------------------------------
 %package -n libmysqlclient_r16
 #-------------------------------------------------------------------------------
 Summary:        MySQL Shared Libraries
 License:        GPL v2 only ; with additional permissions: EXCEPTIONS-CLIENT
 Group:          Development/Libraries/Other
-#-------------------------------------------------------------------------------
 
 %description -n libmysqlclient_r16
 This package contains the shared libraries (.so) which certain
@@ -249,15 +246,14 @@ Authors:
     Michael Widenius <monty@mysql.com>
     David Axmark <davida@mysql.com>
 
---------------------------------------------------------------------------------
 
+#-------------------------------------------------------------------------------
 %package debug
-License:        GPL v2 only ; with additional permissions: EXCEPTIONS-CLIENT
 #-------------------------------------------------------------------------------
+License:        GPL v2 only ; with additional permissions: EXCEPTIONS-CLIENT
 Summary:        MySQL server with debug options turned on
 Group:          Productivity/Databases/Servers
 Requires:       mysql = %{version}
-#-------------------------------------------------------------------------------
 
 %description debug
 A version of the mysql server that has some debug code turned on.
@@ -271,18 +267,16 @@ Authors:
     Michael Widenius <monty@mysql.com>
     David Axmark <davida@mysql.com>
 
---------------------------------------------------------------------------------
-
+#-------------------------------------------------------------------------------
 %package test
-License:        GPL v2 only ; with additional permissions: EXCEPTIONS-CLIENT
 #-------------------------------------------------------------------------------
+License:        GPL v2 only ; with additional permissions: EXCEPTIONS-CLIENT
 Summary:        MySQL testsuite
 Group:          Productivity/Databases/Servers
 Requires:       mysql = %{version} mysql-client = %{version} perl-DBD-mysql mysql-tools = %{version} mysql-bench = %{version}
 %if 0%{?sles_version} > 10 || 0%{?suse_version} > 1030
 Recommends:     mysql-ndb-storage = %{version} mysql-ndb-tools = %{version} mysql-ndb-management = %{version}
 %endif
-#-------------------------------------------------------------------------------
 
 %description test
 This package contains the MySQL test scripts and data.
@@ -294,17 +288,15 @@ Authors:
     Michael Widenius <monty@mysql.com>
     David Axmark <davida@mysql.com>
 
---------------------------------------------------------------------------------
-
+#-------------------------------------------------------------------------------
 %package tools
-License:        GPL v2 only ; with additional permissions: EXCEPTIONS-CLIENT
 #-------------------------------------------------------------------------------
+License:        GPL v2 only ; with additional permissions: EXCEPTIONS-CLIENT
 Summary:        MySQL tools
 Group:          Productivity/Databases/Servers
 Requires:       perl-DBD-mysql
 # make sure this package is installed when updating from 10.2 and older
 Provides:       mysql:/usr/bin/mysqlhotcopy mysql-client:/usr/bin/perror
-#-------------------------------------------------------------------------------
 
 %description tools
 A set of scripts for administering a MySQL server or developing
@@ -315,25 +307,23 @@ Authors:
     Michael Widenius <monty@mysql.com>
     David Axmark <davida@mysql.com>
 
---------------------------------------------------------------------------------
 
+#-------------------------------------------------------------------------------
 %package ndb-storage
-License:        GPL v2 only ; with additional permissions: EXCEPTIONS-CLIENT
 #-------------------------------------------------------------------------------
+License:        GPL v2 only ; with additional permissions: EXCEPTIONS-CLIENT
 Summary:        MySQL - ndbcluster storage engine
 Group:          Productivity/Databases/Servers
-#-------------------------------------------------------------------------------
 
 %description ndb-storage
 This package contains the ndbcluster storage engine. 
 It is necessary to have this package installed on all 
 computers that should store ndbcluster table data.
 
---------------------------------------------------------------------------------
-
+#-------------------------------------------------------------------------------
 %package ndb-management
-License:        GPL v2 only ; with additional permissions: EXCEPTIONS-CLIENT
 #-------------------------------------------------------------------------------
+License:        GPL v2 only ; with additional permissions: EXCEPTIONS-CLIENT
 Summary:        MySQL - ndbcluster storage engine management
 Group:          Productivity/Databases/Servers
 #-------------------------------------------------------------------------------
@@ -343,40 +333,35 @@ This package contains ndbcluster storage
 It is necessary to have this package installed on at least 
 one computer in the cluster.
 
---------------------------------------------------------------------------------
-
+#-------------------------------------------------------------------------------
 %package ndb-tools
-License:        GPL v2 only ; with additional permissions: EXCEPTIONS-CLIENT
 #-------------------------------------------------------------------------------
+License:        GPL v2 only ; with additional permissions: EXCEPTIONS-CLIENT
 Summary:        MySQL - ndbcluster storage engine basic tools
 Group:          Productivity/Databases/Servers
-#-------------------------------------------------------------------------------
 
 %description ndb-tools
 This package contains ndbcluster storage engine basic tools.
 
---------------------------------------------------------------------------------
-
+#-------------------------------------------------------------------------------
 %package ndb-extra
-License:        GPL v2 only ; with additional permissions: EXCEPTIONS-CLIENT
 #-------------------------------------------------------------------------------
+License:        GPL v2 only ; with additional permissions: EXCEPTIONS-CLIENT
 Summary:        MySQL - ndbcluster storage engine extra tools
 Group:          Productivity/Databases/Servers
-#-------------------------------------------------------------------------------
 
 %description ndb-extra
 This package contains some extra ndbcluster storage engine tools for the
 advanced user.  They should be used with caution.
 
---------------------------------------------------------------------------------
-
+#-------------------------------------------------------------------------------
 %prep
 #-------------------------------------------------------------------------------
 %setup -q -n mysql-%version
 cp %_sourcedir/suse-test-run .
-%patch2 -p1
+%patch2
 %patch3
-%patch4 -p1
+%patch4
 %patch5
 %patch7
 %patch8
@@ -394,8 +379,8 @@ cp %_sourcedir/suse-test-run .
 %patch31
 %patch32 -p1
 %patch33
-%patch34
 %patch35
+%patch36 -p1
 # remove unneeded manpages ('make install' basically installs everything under
 # man/*)
 rm -f man/mysqlman.1        # dummy fallback manpage
@@ -407,8 +392,8 @@ rm -f man/ndbd_redo_log_reader.1
 # breaks VPATH builds when in sourcedir, is generated in the builddirs
 rm -f sql/sql_builtin.cc
 sed -i 's|@localstatedir@|/var/log|' support-files/mysql-log-rotate.sh
-#-------------------------------------------------------------------------------
 
+#-------------------------------------------------------------------------------
 %build
 #-------------------------------------------------------------------------------
 %if 0%{?suse_version} < 1120 && 0%{?suse_version} > 0
@@ -479,8 +464,8 @@ BuildMySQL() {
 BuildMySQL "" --with-embedded-server
 # build mysqld-debug
 BuildMySQL "-debug" --with-debug --without-embedded-server
-#-------------------------------------------------------------------------------
 
+#-------------------------------------------------------------------------------
 %install
 #-------------------------------------------------------------------------------
 # install the debug server first, so that we don't overwrite the standard
@@ -598,8 +583,8 @@ if [ -d $olddir ] && ! [ -d $newdir ]
 then
 cp -a $olddir $newdir || echo "Error while copying the database files to the new location!"
 fi
-#-------------------------------------------------------------------------------
 
+#-------------------------------------------------------------------------------
 %post
 #-------------------------------------------------------------------------------
 %remove_and_set -n mysql MYSQLD_MULTI
@@ -632,44 +617,44 @@ RUNLEVEL="`/sbin/runlevel | sed 's|.\ ||
 if [ -e /etc/rc.d/rc${RUNLEVEL}.d/S[0-9]*mysql ]; then
 	/usr/sbin/rcmysql start
 fi
-#-------------------------------------------------------------------------------
 
+#-------------------------------------------------------------------------------
 %post -n libmysqlclient16
 #-------------------------------------------------------------------------------
 /sbin/ldconfig
-#-------------------------------------------------------------------------------
 
+#-------------------------------------------------------------------------------
 %postun -n libmysqlclient16
 #-------------------------------------------------------------------------------
 /sbin/ldconfig
-#-------------------------------------------------------------------------------
 
+#-------------------------------------------------------------------------------
 %post -n libmysqlclient_r16
 #-------------------------------------------------------------------------------
 /sbin/ldconfig
-#-------------------------------------------------------------------------------
 
+#-------------------------------------------------------------------------------
 %postun -n libmysqlclient_r16
 #-------------------------------------------------------------------------------
 /sbin/ldconfig
-#-------------------------------------------------------------------------------
 
+#-------------------------------------------------------------------------------
 %preun
 #-------------------------------------------------------------------------------
 [ -x /usr/sbin/rcmysql ] && /usr/sbin/rcmysql stop
-#-------------------------------------------------------------------------------
 
+#-------------------------------------------------------------------------------
 %postun
 #-------------------------------------------------------------------------------
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/mysql.info.gz
 %{insserv_cleanup}
-#-------------------------------------------------------------------------------
 
+#-------------------------------------------------------------------------------
 %clean
 #-------------------------------------------------------------------------------
 [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && %{__rm} -rf $RPM_BUILD_ROOT
-#-------------------------------------------------------------------------------
 
+#-------------------------------------------------------------------------------
 %files -f mysql.files
 #-------------------------------------------------------------------------------
 %defattr(-, root, root)
@@ -686,14 +671,14 @@ fi
 %config /etc/sysconfig/SuSEfirewall2.d/services/mysql
 %dir %_libdir/mysql/plugin
 %_libdir/mysql/plugin/ha_*
-#-------------------------------------------------------------------------------
 
+#-------------------------------------------------------------------------------
 %files client -f mysql-client.files
 #-------------------------------------------------------------------------------
 %defattr(-, root, root)
 %config /etc/mysqlaccess.conf
-#-------------------------------------------------------------------------------
 
+#-------------------------------------------------------------------------------
 %files -n libmysqlclient-devel -f libmysqlclient-devel.files
 #-------------------------------------------------------------------------------
 %defattr(-, root, root)
@@ -701,69 +686,68 @@ fi
 %{_libdir}/libmysqlclient.so
 %{_libdir}/libmysqlclient_r.so
 /usr/share/aclocal/mysql.m4
-#-------------------------------------------------------------------------------
 
+#-------------------------------------------------------------------------------
 %files -n libmysqld-devel
 #-------------------------------------------------------------------------------
 %defattr(-,root,root)
 %_libdir/libmysqld.a
-#-------------------------------------------------------------------------------
 
+#-------------------------------------------------------------------------------
 %files bench -f mysql-bench.files
 #-------------------------------------------------------------------------------
 %defattr(-, root, root)
 /usr/share/sql-bench
-#-------------------------------------------------------------------------------
 
+#-------------------------------------------------------------------------------
 %files -n libmysqlclient16
 #-------------------------------------------------------------------------------
 %defattr(-, root, root)
 %{_libdir}/libmysqlclient.so.*
-#-------------------------------------------------------------------------------
 
+#-------------------------------------------------------------------------------
 %files -n libmysqlclient_r16
 #-------------------------------------------------------------------------------
 %defattr(-, root, root)
 %{_libdir}/libmysqlclient_r.so.*
-#-------------------------------------------------------------------------------
 
+#-------------------------------------------------------------------------------
 %files debug
 #-------------------------------------------------------------------------------
 %defattr(-, root, root)
 /usr/sbin/mysqld-debug
 %{_libdir}/mysql/mysqld-debug.sym
-#-------------------------------------------------------------------------------
 
+#-------------------------------------------------------------------------------
 %files test -f mysql-test.files
 #-------------------------------------------------------------------------------
 %defattr(-, root, root)
 %{_bindir}/my_safe_process
 %_mandir/man1/mysql-test-run.pl.1*
 %_mandir/man1/mysql-stress-test.pl.1*
+/usr/share/mysql-test/valgrind.supp
 %dir %attr(755, root, root)/usr/share/mysql-test
 /usr/share/mysql-test/[^v]*
 %dir %attr(755, mysql, mysql) /usr/share/mysql-test/var
-#-------------------------------------------------------------------------------
 
-%files tools -f mysql-tools.files
 #-------------------------------------------------------------------------------
+%files tools -f mysql-tools.files
 #-------------------------------------------------------------------------------
 
-%files ndb-storage -f mysql-ndb-storage.files
 #-------------------------------------------------------------------------------
+%files ndb-storage -f mysql-ndb-storage.files
 #-------------------------------------------------------------------------------
 
-%files ndb-management -f mysql-ndb-management.files
 #-------------------------------------------------------------------------------
+%files ndb-management -f mysql-ndb-management.files
 #-------------------------------------------------------------------------------
 
-%files ndb-tools -f mysql-ndb-tools.files
 #-------------------------------------------------------------------------------
+%files ndb-tools -f mysql-ndb-tools.files
 #-------------------------------------------------------------------------------
 
-%files ndb-extra -f mysql-ndb-extra.files
-#-------------------------------------------------------------------------------
 #-------------------------------------------------------------------------------
+%files ndb-extra -f mysql-ndb-extra.files
 #-------------------------------------------------------------------------------
 
 %changelog
--- mysqld_multi.patch.orig
+++ mysqld_multi.patch
@@ -2,6 +2,8 @@
  scripts/mysqld_multi.sh |  108 ++++++++++++++++++++++++++++++++++++++++++++----
  1 file changed, 100 insertions(+), 8 deletions(-)
 
+Index: scripts/mysqld_multi.sh
+===================================================================
 --- scripts/mysqld_multi.sh.orig
 +++ scripts/mysqld_multi.sh
 @@ -2,6 +2,7 @@
@@ -82,15 +84,7 @@
        if ("--mysqladmin=" eq substr($options[$j], 0, 13))
        {
  	# catch this and ignore
-@@ -316,6 +355,7 @@ sub start_mysqlds()
- 	$tmp.= " $options[$j]";
-       }
-     }
-+
-     if ($opt_verbose && $com =~ m/\/safe_mysqld$/ && !$info_sent)
-     {
-       print "WARNING: safe_mysqld is being used to start mysqld. In this case you ";
-@@ -347,6 +387,58 @@ sub start_mysqlds()
+@@ -347,6 +386,58 @@ sub start_mysqlds()
  }
  
  ####
@@ -149,7 +143,7 @@
  #### stop multiple servers
  ####
  
-@@ -709,7 +801,7 @@ sub usage
+@@ -709,7 +800,7 @@ sub usage
  $my_progname version $VER by Jani Tolonen
  
  Description:
@@ -158,7 +152,7 @@
  mysqld processes running in different TCP/IP ports and UNIX sockets.
  
  $my_progname can read group [mysqld_multi] from my.cnf file. You may
-@@ -727,16 +819,16 @@ starting from 1. These groups should be
+@@ -727,16 +818,16 @@ starting from 1. These groups should be
  [mysqld] group, but with those port, socket and any other options
  that are to be used with each separate mysqld process. The number
  in the group name has another function; it can be used for starting,
--- rc.mysql-multi.orig
+++ rc.mysql-multi
@@ -472,7 +472,8 @@ else
 				mount -n -t proc proc /proc
 				test -e /proc/version || set_return_value 100
 			fi
-			if [ -d "/proc/`cat "$pid_file"`" ]; then
+			pid="`cat "$pid_file"`"
+			if [ -d "/proc/$pid" ]; then
 				if exe=`readlink "/proc/$pid/exe"`; then
 					if [ "`echo "$exe" | grep "^$MYSQLD"`" ]; then
 						set_return_value 0
@@ -480,7 +481,7 @@ else
 						set_return_value 1
 					fi
 				else
-					set_return_value 100
+					set_return_value 1
 				fi
 			else
 				set_return_value 1

Places

File project.diff of Package mysql (Revision 7c9649b6bbf15f070ab72aea3e5ac117)

Places