openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package mysql (Revision a196835cc1b1a49e0b14ab1ba1ad83fc)

Currently displaying revision a196835cc1b1a49e0b14ab1ba1ad83fc , Show latest

--- mysql-cnf.patch.orig
+++ mysql-cnf.patch
@@ -1,67 +1,76 @@
----
- support-files/my-huge.cnf.sh   |    4 ++++
- support-files/my-large.cnf.sh  |    4 ++++
- support-files/my-medium.cnf.sh |    6 +++++-
- support-files/my-small.cnf.sh  |    4 ++++
- 4 files changed, 17 insertions(+), 1 deletion(-)
-
---- support-files/my-huge.cnf.sh.orig
-+++ support-files/my-huge.cnf.sh
-@@ -133,6 +133,10 @@ server-id	= 1
+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 @@
  #innodb_flush_log_at_trx_commit = 1
  #innodb_lock_wait_timeout = 50
  
 +# The safe_mysqld script
 +[safe_mysqld]
-+log-error=@localstatedir@/mysqld.log
++log-error=/var/log/mysqld.log
 +
  [mysqldump]
  quick
  max_allowed_packet = 16M
---- support-files/my-large.cnf.sh.orig
-+++ support-files/my-large.cnf.sh
-@@ -133,6 +133,10 @@ server-id	= 1
+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 @@
  #innodb_flush_log_at_trx_commit = 1
  #innodb_lock_wait_timeout = 50
  
 +# The safe_mysqld script
 +[safe_mysqld]
-+log-error=@localstatedir@/mysqld.log
++log-error=/var/log/mysqld.log
 +
  [mysqldump]
  quick
  max_allowed_packet = 16M
---- support-files/my-medium.cnf.sh.orig
-+++ support-files/my-medium.cnf.sh
-@@ -46,7 +46,7 @@ myisam_sort_buffer_size = 8M
+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 @@
+ [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
+ max_allowed_packet = 1M
+@@ -45,7 +47,7 @@
+ #skip-networking
+ 
+ # Disable Federated by default
+-skip-federated
++# skip-federated
  
  # Replication Master Server (default)
  # binary logging is required for replication
--log-bin=mysql-bin
-+# log-bin=mysql-bin
- 
- # required unique id between 1 and 2^32 - 1
- # defaults to 1 if master-host is not set
-@@ -131,6 +131,10 @@ server-id	= 1
+@@ -132,7 +134,13 @@
  #innodb_flush_log_at_trx_commit = 1
  #innodb_lock_wait_timeout = 50
  
 +# The safe_mysqld script
 +[safe_mysqld]
-+log-error=@localstatedir@/mysqld.log
++log-error=/var/log/mysqld.log
++datadir	= /var/lib/mysql
 +
  [mysqldump]
++datadir	= /var/lib/mysql
  quick
  max_allowed_packet = 16M
---- support-files/my-small.cnf.sh.orig
-+++ support-files/my-small.cnf.sh
-@@ -66,6 +66,10 @@ server-id	= 1
+ 
+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 @@
  #innodb_flush_log_at_trx_commit = 1
  #innodb_lock_wait_timeout = 50
  
 +# The safe_mysqld script
 +[safe_mysqld]
-+log-error=@localstatedir@/mysqld.log
++log-error=/var/log/mysqld.log
 +
  [mysqldump]
  quick
--- mysql-group.patch.orig
+++ mysql-group.patch
@@ -1,30 +1,153 @@
---- scripts/mysqld_safe.sh
-+++ scripts/mysqld_safe.sh
-@@ -69,6 +69,10 @@
-       --pid-file=*) pid_file=`echo "$arg" | sed -e "s;--pid-file=;;"` ;;
-       --user=*) user=`echo "$arg" | sed -e "s;--[^=]*=;;"` ; SET_USER=1 ;;
- 
-+      --group=*)
-+        group=`echo "$arg" | sed -e "s;--group=;;"`
-+        ;;
+diff -Naru mysql-5.1.29-rc-backup/configure.in mysql-5.1.29-rc/configure.in
+--- mysql-5.1.29-rc-backup/configure.in	2008-11-24 14:41:57.000000000 +0100
++++ mysql-5.1.29-rc/configure.in	2008-11-24 14:50:55.000000000 +0100
+@@ -770,6 +770,14 @@
+     [ MYSQLD_USER=mysql ]
+     )
+ AC_SUBST(MYSQLD_USER)
++AC_ARG_WITH(mysqld-group,
++    [  --with-mysqld-group=groupname   
++                          What group the mysqld daemon shall be run as.],
++    [ MYSQLD_GROUP=$withval ],
++    [ MYSQLD_GROUP=mysql ]
++    )
++AC_SUBST(MYSQLD_GROUP)
 +
-       # these two 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
-       --socket=*)  mysql_unix_port=`echo "$arg" | sed -e "s;--socket=;;"` ;;
-@@ -173,6 +177,7 @@
- export MYSQL_HOME
  
+ # If we should allow LOAD DATA LOCAL
+ AC_MSG_CHECKING(If we should should enable LOAD DATA LOCAL by default)
+--- mysql-5.1.29-rc-backup/scripts/Makefile.am	2008-11-25 15:36:12.000000000 +0100
++++ mysql-5.1.29-rc/scripts/Makefile.am	2008-11-25 15:34:19.000000000 +0100
+@@ -184,6 +184,7 @@
+ 	  -e 's!@''TARGET_LINUX''@!@TARGET_LINUX@!' \
+ 	  -e "s!@""CONF_COMMAND""@!@CONF_COMMAND@!" \
+ 	  -e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \
++	  -e 's!@''MYSQLD_GROUP''@!@MYSQLD_GROUP@!' \
+ 	  -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.29-rc-backup/scripts/mysqld_safe.sh mysql-5.1.29-rc/scripts/mysqld_safe.sh
+--- mysql-5.1.29-rc-backup/scripts/mysqld_safe.sh	2008-11-24 14:41:54.000000000 +0100
++++ mysql-5.1.29-rc/scripts/mysqld_safe.sh	2008-11-24 14:51:29.000000000 +0100
+@@ -19,6 +19,7 @@
+ want_syslog=0
+ syslog_tag=
  user=@MYSQLD_USER@
-+group=mysql
- niceness=0
++group=@MYSQLD_GROUP@
+ pid_file=
+ err_log=
+ 
+@@ -158,6 +159,7 @@
+       --datadir=*) DATADIR="$val" ;;
+       --pid-file=*) pid_file="$val" ;;
+       --user=*) user="$val"; SET_USER=1 ;;
++      --group=*) group="$val"; SET_USER=1 ;;
  
- # these rely on $DATADIR by default, so we'll set them later on
-@@ -315,7 +320,7 @@
-     USER_OPTION="--user=$user"
+       # 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
+@@ -369,12 +371,18 @@
+ then
+   if test "$user" != "root" -o $SET_USER = 1
+   then
+-    USER_OPTION="--user=$user"
++    USER_OPTION="--user=$user"
++    GROUP_OPTION="--group=$group"
+   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
++    if [ "$user" -a "$group" ]; then
++      chown $user:$group $err_log
++    else
++      [ "$user" ] && chown $user $err_log
++      [ "$group" ] && chgrp $group $err_log
++    fi
    fi
-   # If we are root, change the err log to the right user.
--  touch $err_log; chown $user $err_log
-+  touch $err_log; chown $user.$group $err_log
    if test -n "$open_files"
    then
-     ulimit -n $open_files
+@@ -389,7 +391,12 @@
+ if [ ! -d $mysql_unix_port_dir ]
+ then
+   mkdir $mysql_unix_port_dir
+-  chown $user $mysql_unix_port_dir
++  if [ "$user" -a "$group" ]; then
++    chown $user:$group $mysql_unix_port_dir
++  else
++    [ "$user" ] && chown $user $mysql_unix_port_dir
++    [ "$group" ] && chgrp $group $mysql_unix_port_dir
++  fi
+   chmod 755 $mysql_unix_port_dir
+ fi
+ 
+@@ -537,7 +537,7 @@
+ cmd="$NOHUP_NICENESS"
+ 
+ for i in  "$ledir/$MYSQLD" "$defaults" "--basedir=$MY_BASEDIR_VERSION" \
+-  "--datadir=$DATADIR" "$USER_OPTION"
++  "--datadir=$DATADIR" "$USER_OPTION"
+ do
+   cmd="$cmd "`shell_quote_string "$i"`
+ done
+--- a/scripts/mysql_install_db.sh	2009-03-17 17:28:41.000000000 +0100
++++ b/scripts/mysql_install_db.sh	2009-03-17 17:34:51.000000000 +0100
+@@ -28,6 +28,7 @@
+ defaults=""
+ mysqld_opt=""
+ user=""
++group=""
+ 
+ force=0
+ in_rpm=0
+@@ -63,6 +64,11 @@
+                        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.
++  --group=group_name   The login group to use for running mysqld.  Files and
++                       directories created by mysqld will be owned by this
++                       group. You must be root to use this option.  By default
++                       mysqld runs using your current group and files and
++                       directories that it creates will be owned by you.
+ 
+ All other options are passed to the mysqld program
+ 
+@@ -103,11 +109,11 @@
+       --builddir=*) builddir=`parse_arg "$arg"` ;;
+       --srcdir=*)  srcdir=`parse_arg "$arg"` ;;
+       --ldata=*|--datadir=*) ldata=`parse_arg "$arg"` ;;
+-      --user=*)
+         # Note that the user will be passed to mysqld so that it runs
+         # as 'user' (crucial e.g. if log-bin=/some_other_path/
+         # where a chown of datadir won't help)
+-        user=`parse_arg "$arg"` ;;
++      --user=*) user=`parse_arg "$arg"` ;;
++      --group=*) group=`parse_arg "$arg"` ;;
+       --skip-name-resolve) ip_only=1 ;;
+       --verbose) verbose=1 ;; # Obsolete
+       --rpm) in_rpm=1 ;;
+@@ -360,7 +366,12 @@
+   fi
+   if test -w / -a ! -z "$user"
+   then
+-    chown $user $dir
++    if test -z "$group"
++    then
++      chown $user $dir
++    else
++      chown $user:$group $dir
++    fi
+   fi
+ done
+ 
+@@ -369,6 +380,11 @@
+   args="$args --user=$user"
+ fi
+ 
++if test -n "$group"
++then
++  args="$args --group=$group"
++fi
++
+ # When doing a "cross bootstrap" install, no reference to the current
+ # host should be added to the system tables.  So we filter out any
+ # lines which contain the current host name.
--- mysql-install_db-quiet.patch.orig
+++ mysql-install_db-quiet.patch
@@ -1,18 +1,30 @@
---- scripts/mysql_install_db.sh.orig
-+++ scripts/mysql_install_db.sh
-@@ -296,10 +296,11 @@ then
-     fi
-   fi
- 
+--- scripts/mysql_install_db.sh	2008-11-24 14:41:54.000000000 +0100
++++ scripts/mysql_install_db.sh	2008-11-24 15:46:58.000000000 +0100
+@@ -392,9 +392,10 @@
+ # the screen.
+ if test "$cross_bootstrap" -eq 0 && test -z "$srcdir"
+ then
 -  s_echo
 -  s_echo "To start mysqld at boot time you have to copy"
 -  s_echo "support-files/mysql.server to the right place for your system"
--  s_echo
 +# Output disabled, since the SUSE RPM comes with an init script installed
-+#  s_echo ""
++#  s_echo
 +#  s_echo "To start mysqld at boot time you have to copy"
 +#  s_echo "support-files/mysql.server to the right place for your system"
-+#  s_echo
  
-   if test "$windows" -eq 0
+   echo
+   echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
+@@ -416,10 +417,10 @@
    then
+     echo
+     echo "You can start the MySQL daemon with:"
+-    echo "cd $basedir ; $bindir/mysqld_safe &"
++    echo "rcmysql start"
+     echo
+-    echo "You can test the MySQL daemon with mysql-test-run.pl"
+-    echo "cd $basedir/mysql-test ; perl mysql-test-run.pl"
++    echo "You can test the MySQL daemon with mysql-test package"
++#   echo "cd $basedir/mysql-test ; perl mysql-test-run.pl"
+   fi
+ 
+   echo
--- mysql.changes.orig
+++ mysql.changes
@@ -1,4 +1,144 @@
 -------------------------------------------------------------------
+Tue Apr  7 18:33:16 CEST 2009 - mhrusecky@suse.cz
+
+- Merging with development version of MySQL 5.1
+  - following changes were committed since 
+    Mon Oct  1 19:55:46 CEST 2007 when package development was
+    branched
+    * Fri Apr  3 16:05:02 CEST 2009 - mhrusecky@suse.cz
+      - better fix for rc status
+      - my_safe_process moved to %_bindir
+    * Thu Apr  2 18:41:08 CEST 2009 - mhrusecky@suse.cz
+      - updated to 5.1.33, see
+        http://dev.mysql.com/doc/refman/5.1/en/news-5-1-33.html
+      - fixed path dependent build of scripts
+    * Tue Mar 17 19:10:09 CET 2009 - mhrusecky@suse.cz
+      - localstatedir is back to /var/lib/mysql as it is used as 
+        default value for datadir
+      - fixed upgrade using datadir
+    * Tue Mar 17 18:23:35 CET 2009 - mhrusecky@suse.cz
+      - mysql_install_db now uses group option too
+      - log file migrated to /var/log
+    * Thu Mar 12 18:07:24 CET 2009 - mhrusecky@suse.cz
+      - Fixing mysql-test so it can be installed in 
+        /usr/share/mysql-test
+    * Mon Mar  9 20:17:32 CET 2009 - mhrusecky@suse.cz
+      - Adjusting suse-test-run as there is no longer mysql-Max
+        package
+    * Fri Mar  6 15:59:40 CET 2009 - mhrusecky@suse.cz
+      - updated to 5.1.32, see
+        http://dev.mysql.com/doc/refman/5.1/en/news-5-1-32.html
+      - mysql-5.1.31-test-allowed-packets.patch no longer needed 
+        as it was fixed upstream
+    * Tue Mar  3 19:53:11 CET 2009 - mhrusecky@suse.cz
+      - moving tmp and socket/pidfiles directories to the better 
+        location
+    * Mon Mar  2 14:40:19 CET 2009 - mhrusecky@suse.cz
+      - dropping mysql-storage-plugins package (now part of mysql 
+        base package)
+    * Fri Feb 27 16:04:57 CET 2009 - mhrusecky@suse.cz
+      - fixed main.variables-big test
+    * Thu Feb 26 17:48:51 CET 2009 - mhrusecky@suse.cz
+      - fixed federated plugin to avoid versioning
+      - fixed main.mysqlbinlog_row_big test
+      - fixed dependencies and other things because of dropped 
+        mysql-Max
+    * Mon Feb 23 17:28:38 CET 2009 - mhrusecky@suse.cz
+      - updated to 5.1.31, see
+        http://dev.mysql.com/doc/refman/5.1/en/news-5-1-31.html
+        * mysql-5.1.30-test-daemon-sbin.patch no longer needed as 
+          something better was accepted upstream
+        * mysql-openssl-test.patch is already in upstream too
+    * Mon Feb 23 15:25:22 CET 2009 - mhrusecky@suse.cz
+      - dropping unused rc.mysql file
+      - fixed status detection
+    * Fri Feb 20 15:06:22 CET 2009 - mhrusecky@suse.cz
+      - innodb support compiled as a static part of MySQL
+      - getting rid of sysconfig
+    * Tue Jan 20 18:39:38 CET 2009 - mhrusecky@suse.cz
+      - automatic plugins loading
+    * Mon Jan  5 18:34:40 CET 2009 - mhrusecky@suse.cz
+      - init script checks for relative paths (bnc#463586)
+    * Mon Dec  8 17:27:29  CET 2008 - mhrusecky@suse.cz
+      - updated to 5.1.30, see
+        http://dev.mysql.com/doc/refman/5.1/en/news-5-1-28.html
+        http://dev.mysql.com/doc/refman/5.1/en/news-5-1-29.html
+        http://dev.mysql.com/doc/refman/5.1/en/news-5-1-30.html
+      - indentation in rc scripts fixed (bnc#435519)
+      - more comments and minor fixes in spec file
+      - using symlinks for mysql-test-run and mtr as these are the 
+        same files and they needs some patching
+      - fixed some of the automatic tests
+      - dropping some patches which are no longer used
+    * Thu Sep 25 12:05:46 CEST 2008 - mmarek@suse.cz
+      - merged init script changes from the 5.0 package
+    * Wed Jul 30 14:57:46 CEST 2008 - mmarek@suse.cz
+      - updated to 5.1.26-rc, see
+        http://dev.mysql.com/doc/refman/5.1/en/news-5-1-26.html
+    * Fri Jul  4 12:58:41 CEST 2008 - mmarek@suse.cz
+      - updated to 5.1.25-rc, for changes see
+        http://dev.mysql.com/doc/refman/5.1/en/news-5-1-24.html
+        http://dev.mysql.com/doc/refman/5.1/en/news-5-1-25.html
+    * Fri Mar 14 14:19:36 CET 2008 - mmarek@suse.cz
+      - fixed mysqld_multi.patch (bnc#371000)
+    * Fri Mar 14 13:31:01 CET 2008 - mmarek@suse.cz
+      - add 'user = mysql' to mysqld_multi example groups
+    * Fri Mar 14 09:06:11 CET 2008 - mmarek@suse.cz
+      - dropped README.SUSE (bnc#357634)
+      - moved mysql_upgrade to the server package (bnc#366820)
+    * Thu Mar 13 17:29:32 CET 2008 - mmarek@suse.cz
+      - adjusted license tags
+    * Wed Mar 12 18:48:52 CET 2008 - mmarek@suse.cz
+      - finally convert err-log to log-error in my.cnf
+    * Wed Mar 12 17:58:03 CET 2008 - mmarek@suse.cz
+      - shortened the comment in sysconfig.mysql, a detailed
+        description or HOWTO can be added to a README (created a 
+        draft)
+    * Wed Mar 12 16:03:16 CET 2008 - mmarek@suse.cz
+      - don't preinstall /var/lib/mysql-databases, create datadirs
+        in mysqld_multi on first startup insteal
+    * Tue Mar 11 13:38:33 CET 2008 - mmarek@suse.cz
+      - updated to 5.1.23-rc
+        * fixes CVE-2007-5970
+        * for other changes see
+          http://dev.mysql.com/doc/refman/5.1/en/news-5-1-23.html
+    * Tue Feb 12 12:00:00 CET 2008 - richard@radoeka.nl
+      - Added multi database support by
+        o updating /etc/init.d/mysql, it has now 2 legs the existing 
+          one to start a single database, and a new one to start and 
+          stop multiple database.
+        o Added a sysconfig variable
+        o Added a directory /var/lib/mysql-databases to hold 
+          databases,
+        o Updated /etc/my.cnf with some examples database 
+          configurations
+    * Fri Nov  9 15:51:08 CET 2007 - mmarek@suse.cz
+      - removed the sles9 workaround that's not needed anymore and 
+        breaks sles9 builds instead
+    * Wed Oct 10 22:30:44 CEST 2007 - mmarek@suse.cz
+      - merged the standard and Max server packages
+      - example, csv and federated storage engines are packaged in
+        mysql-storage-plugins
+      - build the NDB cluster:
+        * mysql-ndb-storage
+        * mysql-ndb-management
+        * mysql-ndb-tools
+        * mysql-ndb-extra
+      - removed libmysqlclient static libraries and .la files
+      - moved libmysqlclient and libmysqld to %%_libdir, %%_libdir/mysql
+        will only be used for the server plugins
+    * Mon Oct  1 19:55:46 CEST 2007 - mmarek@suse.cz
+      - initial 5.1 packaging (5.1.22-rc)
+        * ported the 5.0 spec file to make it build at least
+        * highlights from the "What's New" list
+         (http://dev.mysql.com/doc/refman/5.1/en/mysql-nutshell.html):
+         - table partitioning
+         - plugin API
+         - event scheduler
+         - basic XML functions (ExtractValue() and UpdateXML())
+         - mysqlslap load emulator
+
+-------------------------------------------------------------------
 Mon Mar 30 01:05:45 CEST 2009 - crrodriguez@suse.de
 
 - configure flag --with-pic is not really used for libmysqld.a
--- mysql.spec.orig
+++ mysql.spec
@@ -1,59 +1,74 @@
 #
-# spec file for package mysql (Version 5.0.67)
+# spec file for package mysql (Version 5.0.45)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
 #
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 # norootforbuild
 
-
 Name:           mysql
 BuildRequires:  gcc-c++ ncurses-devel openssl-devel procps pwdutils readline-devel tcpd-devel zlib-devel
+%if ( 0%{?sles_version} < 9 ) || ( 0%{?sles_version} > 10 )
+BuildRequires:  fdupes
+%endif
 License:        GPL v2 only
 Group:          Productivity/Databases/Servers
-Version:        5.0.67
-Release:        16
+Version:        5.1.33
+Release:        0
 # required by rcmysql
-Requires:       mysql-client = %{version}
-# bug437293
-%ifarch ppc64
-Obsoletes:      mysql-shared-64bit
-Obsoletes:      mysql-64bit
-%endif
-#
+Requires:       mysql-client = %{version} perl-base
 Url:            http://www.mysql.com
 Summary:        A True Multiuser, Multithreaded SQL Database Server
-PreReq:         /usr/sbin/useradd /usr/sbin/groupadd %install_info_prereq %fillup_prereq %insserv_prereq coreutils sed grep
+PreReq:         /usr/sbin/useradd /usr/sbin/groupadd %install_info_prereq %insserv_prereq coreutils sed grep
+Recommends:     logrotate
+Obsoletes:	mysql-Max <= %{version}
+Provides:	mysql-Max = %{version}
 Source:         mysql-%{version}.tar.bz2
-Source1:        rc.mysql
 Source3:        README.debug
 Source4:        suse-test-run
 Source5:        mysql.SuSEfirewall2
-Source6:        sysconfig.mysql
 Source7:        rc.mysql-multi
+# Polishing default config file
 Patch2:         mysql-cnf.patch
 Patch3:         mysql-multi-configuration.patch
+# Adds option to set group to something else similarly to the user settings
 Patch4:         mysql-group.patch
+# Warning about initscript in mysql_install_db disabled, since the SUSE RPM comes with an init script installed
 Patch5:         mysql-install_db-quiet.patch
+# Checks flush-logs exit status in support-files/mysql-log-rotate.sh
 Patch7:         mysql-logrotate.patch
+# Adds reload funcionality to mysqld_multi.sh perl script and adds --datadir support
 Patch8:         mysqld_multi.patch
-Patch11:        mysql-5.0.67-compiler-warnings.patch
+# Fixes some warnings (critical according to the RPM lint)
+Patch11:        mysql-5.1.29-compiler-warnings.patch
+# Disables failure on one test during update and improves error message during update a little bit
 Patch13:        mysql_upgrade-exit-status.patch
-Patch15:        mysql-vpath.patch
-Patch16:        mysql-5.0.67-mysql_config.patch
-Patch17:        mysql-5.0.67-CVE-2008-2079.patch
-Patch18:        mysql-5.0.67-mysql_install_db-localhost.patch
+# Check in configure script for readline uses variable instead of relative path now
+#   (maybe safer, shouldn't affect functionality, maybe it can be dropped)
+Patch15:        mysql-5.1.23-vpath.patch
+# Changes pkglib_LIBRARIES into lib_LIBRARIES in libmysql
+Patch18:        libmysql-no-pkglibdir.patch
+# Adds option -avoid-version to LDFLAGS for plugins blackhole, archive and example
+Patch19:        mysql-plugins-avoid-version.patch
+# This patch loads plugins by default if there is no settings regarding plugins.
+Patch23:	mysql-enable-plugins.patch
+# Really ugly patch which fixes federated to work as a plugin. We should get rid of this asap.
+Patch24:        mysql-5.1.30-federated-workaround.patch
+# PATCH-FIX-UPSTREAM mysql-5.1.31-shebang.patch [] mhrusecky@suse.cz -- adds mising shebangs
+Patch25:        mysql-5.1.31-shebang.patch
+# PATCH-FIX-UPSTREAM mysql-5.1.31-test-variables-big.patch [upstream bug #38811] -- different way to test whether server crashed
+# http://bugs.mysql.com/bug.php?id=38811
+Patch27:        mysql-5.1.31-test-variables-big.patch
+# PATCH-FIX-SUSE mysql-5.1.32-myslq-test.patch mhrusecky@suse.cz -- installs tests into datadir not into prefix
+Patch28:        mysql-5.1.32-myslq-test.patch
+# PATCH-FIX-UPSTREAM mysql-5.1.33-scripts-paths.patch [need more testing before submiting] mhrusecky@suse.cz -- fixes build of scripts when compilation occurs somewhere else
+Patch29:	mysql-5.1.33-scripts-paths.patch
+# PATCH-FIX-SUSE mysql-5.1.33-safe-process-in-bin.patch mhrusecky@suse.cz -- this will let us move one binary to /usr/bin instead of /usr/share/mysql-test/...
+Patch30:	mysql-5.1.33-safe-process-in-bin.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -90,17 +105,11 @@ Authors:
 %package -n libmysqlclient-devel
 # mysql-devel was last used in openSUSE 10.2
 Provides:       mysql-devel = %version-%release
-Obsoletes:      mysql-devel <= 5.0.26
-Requires:       libmysqlclient15 = %version libmysqlclient_r15 = %version glibc-devel zlib-devel openssl-devel
+Obsoletes:      mysql-devel < %version
+Requires:       libmysqlclient16 = %version libmysqlclient_r16 = %version glibc-devel zlib-devel openssl-devel
 Summary:        MySQL Development Header Files and Libraries
 License:        GPL v2 only; with additional permissions: EXCEPTIONS-CLIENT
 Group:          Development/Libraries/C and C++
-# bug437293
-%ifarch ppc64
-Obsoletes:      mysql-shared-64bit
-Obsoletes:      mysql-64bit
-%endif
-#
 
 %description -n libmysqlclient-devel
 This package contains the development header files and libraries
@@ -113,8 +122,18 @@ Authors:
     Michael Widenius <monty@mysql.com>
     David Axmark <davida@mysql.com>
 
+%package -n libmysqld-devel
+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
 Summary:        MySQL Client
 Group:          Productivity/Databases/Clients
 
@@ -147,24 +166,12 @@ Authors:
     Michael Widenius <monty@mysql.com>
     David Axmark <davida@mysql.com>
 
-%package -n libmysqlclient15
+%package -n libmysqlclient16
 Summary:        MySQL Shared Libraries
 License:        GPL v2 only; with additional permissions: EXCEPTIONS-CLIENT
 Group:          Development/Libraries/Other
-# bug437293
-%ifarch ppc64
-Obsoletes:      mysql-shared-64bit
-Obsoletes:      mysql-64bit
-%endif
-#
-# make sure libmysqlclient15 replaces the 5.0.x versions of mysql-shared,
-# but can coexist with 4.x versions of mysql-shared
-# libmysqlclient_r15 will then be pulled in when needed
-# *** this has to be removed when the package name changes ***
-Provides:       mysql-shared = %version
-Obsoletes:      mysql-shared >= 5.0
 
-%description -n libmysqlclient15
+%description -n libmysqlclient16
 This package contains the shared libraries (.so) which certain
 languages and applications need to dynamically load and use MySQL.
 
@@ -175,18 +182,12 @@ Authors:
     Michael Widenius <monty@mysql.com>
     David Axmark <davida@mysql.com>
 
-%package -n libmysqlclient_r15
+%package -n libmysqlclient_r16
 Summary:        MySQL Shared Libraries
 License:        GPL v2 only; with additional permissions: EXCEPTIONS-CLIENT
 Group:          Development/Libraries/Other
-# bug437293
-%ifarch ppc64
-Obsoletes:      mysql-shared-64bit
-Obsoletes:      mysql-64bit
-%endif
-#
 
-%description -n libmysqlclient_r15
+%description -n libmysqlclient_r16
 This package contains the shared libraries (.so) which certain
 languages and applications need to dynamically load and use MySQL.
 
@@ -197,32 +198,13 @@ Authors:
     Michael Widenius <monty@mysql.com>
     David Axmark <davida@mysql.com>
 
-%package Max
-License:        GPL v2 only
-Summary:        MySQL - Server with Berkeley DB
-Group:          Productivity/Databases/Servers
-Requires:       mysql = %{version}
-
-%description Max
-An optional MySQL server binary that supports features such as
-transactional tables. To make use of these features, just install this
-package in addition to the MySQL package.
-
-
-
-Authors:
---------
-    Michael Widenius <monty@mysql.com>
-    David Axmark <davida@mysql.com>
-
 %package debug
-License:        GPL v2 only
 Summary:        MySQL server with debug options turned on
 Group:          Productivity/Databases/Servers
 Requires:       mysql = %{version}
 
 %description debug
-A version of the mysql-Max server that has some debug code turned on.
+A version of the mysql server that has some debug code turned on.
 It should be only used to track down problems with the standard
 servers. Note that merely installing this package won't replace the
 standard server. Read /usr/share/doc/packages/mysql/README.debug for
@@ -236,16 +218,15 @@ Authors:
     David Axmark <davida@mysql.com>
 
 %package test
-License:        GPL v2 only
 Summary:        MySQL testsuite
 Group:          Productivity/Databases/Servers
-Requires:       mysql = %{version} mysql-client = %{version} perl-DBD-mysql
+Requires:       mysql = %{version} mysql-client = %{version} perl-DBD-mysql mysql-tools = %{version} mysql-bench = %{version}
+Recommends:     mysql-ndb-storage = %{version} mysql-ndb-tools = %{version} mysql-ndb-management = %{version}
 
 %description test
 This package contains the MySQL test scripts and data.
 
-To run the testsuite, run /usr/share/mysql-test/suse-test-run (or
-suse-test-run-Max for the mysql-Max package).
+To run the testsuite, run /usr/share/mysql-test/suse-test-run.
 
 
 
@@ -255,7 +236,6 @@ Authors:
     David Axmark <davida@mysql.com>
 
 %package tools
-License:        GPL v2 only
 Summary:        MySQL tools
 Group:          Productivity/Databases/Servers
 Requires:       perl-DBD-mysql
@@ -273,40 +253,79 @@ Authors:
     Michael Widenius <monty@mysql.com>
     David Axmark <davida@mysql.com>
 
+%package ndb-storage
+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
+Summary:        MySQL - ndbcluster storage engine management
+Group:          Productivity/Databases/Servers
+
+%description ndb-management
+This package contains ndbcluster storage engine management.
+It is necessary to have this package installed on at least 
+one computer in the cluster.
+
+
+%package ndb-tools
+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
+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
+%setup -q -n mysql-%version
 cp %_sourcedir/suse-test-run .
-%patch2
+%patch2 -p1
 %patch3
-%patch4
+%patch4 -p1
 %patch5
 %patch7
 %patch8
 %patch11
 %patch13
 %patch15
-%patch16
-%patch17
 %patch18
-# 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
-# these are generated in the builddir, remove the pregenerated files to
-# avoid accidentaly using them
-rm innobase/ib_config.h scripts/mysqlbug bdb/Makefile
+%patch19
+%patch23
+%patch24
+%patch25 -p1
+%patch27
+%patch28
+%patch29
+%patch30
+# remove unneeded manpages ('make install' basically installs everything under
+# man/*)
+rm man/mysqlman.1        # dummy fallback manpage
+rm man/mysql.server.1    # init script, not installed in our rpm
+rm man/make_win_*.1      # windows build scripts
+rm man/comp_err.1        # built-time utility
+# 5.1 Carrier Grade Edition only / still under development as of 5.1.22
+rm man/ndbd_redo_log_reader.1
+
+# breaks VPATH builds when in sourcedir, is generated in the builddirs
+rm sql/sql_builtin.cc
+sed -i 's|@localstatedir@|/var/log|' support-files/mysql-log-rotate.sh
 
 %build
-%if 0%{?suse_version} < 1000
-# on sles9 autoreconf fails otherwise
-cp /usr/share/libtool/ltmain.sh innobase/
-%endif
 autoreconf -f -i
-# For some platforms the berkeley DB backend does not work.
-export BERKELEY="with"
-%ifarch ppc ppc64 s390 s390x mips alpha x86_64 sparc hppa
-export BERKELEY="without"
-%endif
-# Make the compile a function, since we do it thrice
+# Make the compile a function, since we do multiple builds
 BuildMySQL() {
 	# The --enable-assembler simply does nothing on systems that do not
 	# support assembler speedups.
@@ -315,7 +334,7 @@ BuildMySQL() {
 	pushd _build$suffix
 	export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DUNDEF_HAVE_INITGROUPS -DFORCE_INIT_OF_VARS -fno-strict-aliasing"
 	export CXXFLAGS="$CFLAGS -fno-exceptions -fno-rtti"
-	../configure --disable-static --with-pic\
+	../configure \
 		--enable-assembler \
 		--without-readline \
 		--enable-large-files \
@@ -327,23 +346,32 @@ BuildMySQL() {
 		--prefix=%{_prefix} \
 		--sysconfdir=/etc \
 		--with-mysqld-user=mysql \
-		--with-isam \
+		--with-mysqld-group=mysql \
 		--without-debug \
 		--datadir=/usr/share \
 		--includedir=/usr/include \
 		--with-extra-charsets=complex \
-		--with-unix-socket-path=/var/lib/mysql/mysql.sock \
+		--with-unix-socket-path=/var/run/mysql/mysql.sock \
 		--enable-thread-safe-client \
 		--with-comment="SUSE MySQL RPM" \
 		--with-libwrap \
 		--with-server-suffix=$suffix \
-		--with-big-tables \
+		--with-ssl=/usr \
+		--with-plugin-myisammgr \
+		--with-ndbcluster \
+		--with-plugins=partition,csv,heap,myisam,ndbcluster,innobase \
 		HOSTNAME="/bin/hostname -f" \
 		"$@"
 	# Add this for MyISAM RAID support:
 	# --with-raid
 	# benchdir does not fit in above model. Fix when we make a separate package
-	make %{?jobs:-j%jobs} benchdir=%buildroot/usr/share/sql-bench
+%ifarch s390 s390x
+	# The atomic stuff doesn't work the way mySQL wants to use it
+	# on s390, and s390x, so we have to make sure, that pthreads
+	# mutexes are being used.
+	sed -i '/HAVE_ATOMIC_ADD/d; /HAVE_ATOMIC_SUB/d' config.h
+%endif
+	make %{?jobs:-j%jobs}
 	nm --numeric-sort sql/mysqld > sql/mysqld.sym
 	# needed for make check, which is not VPATH aware
 	# copy the files unconditionally so that manual 'make check' after
@@ -356,77 +384,35 @@ BuildMySQL() {
 %endif
 	popd
 }
-# Build the client, extra tools, libraries and mysqld-max
-BuildMySQL "-max" --with-server-suffix=-Max \
-		--${BERKELEY}-berkeley-db \
-		--with-openssl \
-		--with-innodb \
-		--with-embedded-server \
-		--with-extra-tools \
-		--with-archive-storage-engine \
-		--with-csv-storage-engine \
-		--with-example-storage-engine \
-		--with-blackhole-storage-engine \
-		--with-federated-storage-engine
-# safeguard: don't use distributed pregenerated files instead of generated ones
-find _build-max/ -type f -printf '%%P\n' | grep -v '^mysql-test' | sort >_t1
-find . -type f -printf '%%P\n' | sort >_t2
-join _t[12] | {
-	err=0
-	while read f; do
-		if ! cmp "$f" _build-max/"$f"; then
-			err=1;
-		fi
-	done
-	if test "$err" = "1"; then
-		echo "%buildsubdir/ seems to contain pregenerated distributed files"
-		echo "that are different from generated files in %buildsubdir/_build-max/."
-		echo "Better remove the distributed files in %%prep to avoid using these during build."
-	fi
-	exit $err
-} || exit
-rm _t[12]
-# build mysqld-debug (speed up normal build by skipping tests/ and client/)
-BuildMySQL "-debug" --with-server-suffix=-debug \
-		--${BERKELEY}-berkeley-db \
-		--with-openssl \
-		--with-innodb \
-		--with-debug \
-		--without-extra-tools \
-		--without-embedded-server \
-		--with-csv-storage-engine \
-		--with-example-storage-engine \
-		--with-blackhole-storage-engine \
-		--with-federated-storage-engine
-# Now build the standard mysqld
-BuildMySQL "" \
-		--without-berkeley-db \
-		--without-openssl \
-		--with-innodb \
-		--without-extra-tools \
-		--without-embedded-server
+# Build the client, extra tools, libraries
+BuildMySQL "" --with-embedded-server
+# build mysqld-debug
+BuildMySQL "-debug" --with-debug --without-embedded-server
 
 %install
-# install client, extra tools, libraries and mysql-max
-make -C _build-max install DESTDIR=%buildroot benchdir_root=/usr/share/
-mv %buildroot/usr/sbin/mysqld %buildroot/usr/sbin/mysqld-max
-install -m 644 _build-max/sql/mysqld.sym \
-	%buildroot%{_libdir}/mysql/mysqld-max.sym
-# install the debug server
+# install the debug server first, so that we don't overwrite the standard
+# /usr/sbin/mysqld
+mkdir -p %buildroot%_libdir/mysql
 make -C _build-debug/sql install DESTDIR=%buildroot
 mv %buildroot/usr/sbin/mysqld %buildroot/usr/sbin/mysqld-debug
 install -m 644 _build-debug/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld-debug.sym
-# install the standard server
-# (this must be the last one, otherwise /usr/sbin/mysqld would get overwritten)
-make -C _build/sql install DESTDIR=%buildroot
+
+# install the client, extra tools, libraries and the standard server
+make -C _build install DESTDIR=%buildroot benchdir_root=/usr/share/
 install -m 644 _build/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld.sym
-# move the shared libs directly to %_libdir
-pushd %buildroot%{_libdir}/mysql
-	for f in libmysqlclient*.so*; do
-		mv "$f" ..
-		ln -s ../"$f"
-	done
-popd
+
+# remove most static libs (FIXME: don't build them at all...)
+rm -f %buildroot%_libdir/libmysqlclient*a
+rm -f %buildroot%_libdir/mysql/*.a %buildroot%_libdir/mysql/*.la
+rm -f %buildroot%_libdir/mysql/plugin/*a
+# XXX: package these? The ndb tools are linked statically atm
+rm -f %buildroot%_libdir/mysql/libndbclient.*
+rm -f %{buildroot}/usr/share/mysql-test/mysql-test-run  
+rm -f %{buildroot}/usr/share/mysql-test/mtr  
+ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mtr  
+ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mysql-test-run 
+mv %{buildroot}/usr/share/mysql-test/lib/My/SafeProcess/my_safe_process %{buildroot}%{_bindir}
+
 # generate filelist for binaries and their manpages (easier than enumerating
 # all the binaries and manapages manually, esp. when there are new manpages in
 # each release)
@@ -437,9 +423,8 @@ filelist()
 	for i; do
 		if test -e usr/sbin/"$i"; then
 			echo /usr/sbin/"$i"
-		else
-			# if it doesn't exist, rpmbuild will fail after
-			# %%install
+		fi
+		if test -e usr/bin/"$i"; then
 			echo /usr/bin/"$i"
 		fi
 		if ls usr/share/man/*/"$i".[1-9]* >/dev/null 2>&1; then
@@ -450,11 +435,16 @@ filelist()
 }
 filelist innochecksum my_print_defaults myisam_ftdump myisamchk myisamlog myisampack mysql_fix_extensions mysql_fix_privilege_tables mysql_install_db mysql_secure_installation mysql_upgrade mysqlbug mysqld mysqld_multi mysqld_safe mysqlbinlog mysqldumpslow mysqlmanager resolve_stack_dump resolveip >mysql.files
 filelist mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow >mysql-client.files
-filelist comp_err mysql_config >libmysqlclient-devel.files
-filelist mysql_client_test mysql_client_test_embedded mysql_waitpid mysqltest mysqltest_embedded mysqltestmanager mysqltestmanager-pwgen mysqltestmanagerc >mysql-test.files
+filelist mysql_config >libmysqlclient-devel.files
+filelist mysqlslap >mysql-bench.files
+filelist mysql_client_test mysql_client_test_embedded mysql_waitpid mysqltest mysqltest_embedded >mysql-test.files
 # all binaries that don't need to be in a "default" install (mysql.rpm +
 # mysql-client.rpm)
-filelist msql2mysql mysql_convert_table_format mysql_explain_log mysql_find_rows mysql_setpermission mysql_tableinfo mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace >mysql-tools.files
+filelist msql2mysql mysql_convert_table_format mysql_find_rows mysql_setpermission mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace >mysql-tools.files
+filelist ndbd ndbmtd >mysql-ndb-storage.files
+filelist ndb_mgmd >mysql-ndb-management.files
+filelist ndb_{config,desc,error_reporter,mgm,print_backup_file,print_schema_file,print_sys_file,restore,select_all,select_count,show_tables,size.pl,test_platform,waiter} >mysql-ndb-tools.files
+filelist ndb_{cpcd,delete_all,drop_index,drop_table} >mysql-ndb-extra.files
 ### files not installed by make install
 # Create directory structure
 DOCS=(COPYING README EXCEPTIONS-CLIENT %_sourcedir/README.debug)
@@ -462,32 +452,38 @@ DOCDIR=%buildroot%_defaultdocdir/%name
 install -d -m 755 ${DOCDIR}
 install -d -m 755 %buildroot/etc/logrotate.d
 install -d -m 755 %buildroot/etc/init.d
-install -d -m 755 %buildroot/var/lib/mysql
 install -m 644 _build/support-files/mysql-log-rotate %buildroot/etc/logrotate.d/mysql
 install -m 660 _build/support-files/my-medium.cnf %buildroot/etc/my.cnf
 install -m 640 scripts/mysqlaccess.conf %buildroot/etc/mysqlaccess.conf
 install -m 644 "${DOCS[@]}" ${DOCDIR}
 install -m 755 %_sourcedir/rc.mysql-multi %buildroot/etc/init.d/mysql
 ln -sf ../../etc/init.d/mysql %buildroot/usr/sbin/rcmysql
-install -m 755 -d %buildroot/var/lib/mysql/.tmp
 # this is used by the init script
-install -m 700 -d %buildroot/var/lib/mysql/.protected
+install -m 755 -d %buildroot/var/run/mysql
 # SuSEfirewall service description
 install -D -m 644 %_sourcedir/mysql.SuSEfirewall2 \
 	%buildroot/etc/sysconfig/SuSEfirewall2.d/services/mysql
 # testsuite
+mkdir -p %buildroot/usr/share/mysql-test/
 install -m 755 suse-test-run %buildroot/usr/share/mysql-test/
-ln -s suse-test-run %buildroot/usr/share/mysql-test/suse-test-run-max
 # XXX this should go under /var/..., but some tests get confused by a symlink
 # var -> ../../../var/...
 #ln -sf ../../../var/lib/mysql/mysql-test %buildroot/usr/share/mysql-test/var
 mkdir %buildroot/usr/share/mysql-test/var
-# Install the /etc/sysconfig/mysql file
-mkdir -p %buildroot/var/adm/fillup-templates
-install -m 700 %_sourcedir/sysconfig.mysql ${RPM_BUILD_ROOT}/var/adm/fillup-templates
-# not needed, replaced by mysql_upgrade.c
-rm %buildroot/usr/bin/mysql_upgrade_shell
-find %{buildroot} -type f -name "*.la" -exec %{__rm} -fv {} +
+
+# Final fixes
+find %buildroot/usr/share/mysql-test -name '*.orig' -delete
+
+%if ( 0%{?sles_version} < 9 ) || ( 0%{?sles_version} > 10 )
+%fdupes -s %buildroot/usr/share/mysql-test
+%endif
+
+dos2unixConversion() {
+	%{__sed} -i 's/\r//g' "$1"
+}
+for i in `grep -Rl '\r' %buildroot/usr/share/sql-bench`; do
+	dos2unixConversion "$i"
+done
 
 %pre
 /usr/sbin/groupadd -r mysql >/dev/null 2>/dev/null || :
@@ -511,29 +507,31 @@ cp -a $olddir $newdir || echo "Error whi
 fi
 
 %post
-touch /var/lib/mysql/.run-mysql_upgrade
-%{fillup_and_insserv mysql}
+if [ -d /var/lib/mysql ]; then
+	touch /var/lib/mysql/.run-mysql_upgrade
+	chown -R mysql:mysql /var/lib/mysql
+fi
 %install_info --info-dir=%{_infodir} %{_infodir}/mysql.info.gz
-chown -R mysql:mysql /var/lib/mysql
-# users usually look into /var/log for logfiles
-# doing this in %%build wouldn't pass brp-symlink
-# also we don't want to overwrite existing files (actaully sth like %%ghost)
-ln -s ../lib/mysql/mysqld.log /var/log/mysqld.log 2>/dev/null || :
+if [ -f /var/lib/mysql/mysqld.log ]; then
+	[ -s /var/log/mysqld.log ] && rm -f /var/log/mysqld.log
+	if [ -f /var/log/mysqld.log ]; then
+		echo "Log files inconsistency, please merge following files manually:"
+		echo "   /var/lib/mysql/mysqld.log"
+		echo "   /var/log/mysqld.log"
+	else
+		mv /var/lib/mysql/mysqld.log /var/log/mysqld.log
+	fi
+fi
 # err-log was renamed to log-error
 if grep -q '^err-log' /etc/my.cnf; then
 	sed -i 's/^err-log/log-error/' /etc/my.cnf
 fi
 
-%post Max
-touch /var/lib/mysql/.run-mysql_upgrade
-
-%post -n libmysqlclient15 -p /sbin/ldconfig
-
-%post -n libmysqlclient_r15 -p /sbin/ldconfig
+%post -n libmysqlclient16 -p /sbin/ldconfig
+%postun -n libmysqlclient16 -p /sbin/ldconfig
 
-%postun -n libmysqlclient15 -p /sbin/ldconfig
-
-%postun -n libmysqlclient_r15 -p /sbin/ldconfig
+%post -n libmysqlclient_r16 -p /sbin/ldconfig
+%postun -n libmysqlclient_r16 -p /sbin/ldconfig
 
 %preun
 %stop_on_removal mysql
@@ -555,12 +553,12 @@ rm -rf %buildroot
 /etc/init.d/mysql
 /usr/sbin/rcmysql
 /usr/share/mysql/
-%attr(755,mysql,mysql)/var/lib/mysql
-%attr(700,mysql,mysql)/var/lib/mysql/.protected
+%dir %attr(755,mysql,mysql)/var/run/mysql
 %dir %{_libdir}/mysql
 %{_libdir}/mysql/mysqld.sym
-%{_localstatedir}/adm/fillup-templates/sysconfig.mysql
-/etc/sysconfig/SuSEfirewall2.d/services/mysql
+%config /etc/sysconfig/SuSEfirewall2.d/services/mysql
+%dir %_libdir/mysql/plugin
+%_libdir/mysql/plugin/ha_*
 
 %files client -f mysql-client.files
 %defattr(-, root, root)
@@ -569,31 +567,25 @@ rm -rf %buildroot
 %files -n libmysqlclient-devel -f libmysqlclient-devel.files
 %defattr(-, root, root)
 /usr/include/mysql
-%dir %{_libdir}/mysql
-%{_libdir}/mysql/*.a
 %{_libdir}/libmysqlclient.so
 %{_libdir}/libmysqlclient_r.so
-%{_libdir}/mysql/libmysqlclient.so
-%{_libdir}/mysql/libmysqlclient_r.so
+/usr/share/aclocal/mysql.m4
+
+%files -n libmysqld-devel
+%defattr(-,root,root)
+%_libdir/libmysqld.a
 
-%files bench
+%files bench -f mysql-bench.files
 %defattr(-, root, root)
 /usr/share/sql-bench
 
-%files -n libmysqlclient15
+%files -n libmysqlclient16
 %defattr(-, root, root)
 %{_libdir}/libmysqlclient.so.*
-%{_libdir}/mysql/libmysqlclient.so.*
 
-%files -n libmysqlclient_r15
+%files -n libmysqlclient_r16
 %defattr(-, root, root)
 %{_libdir}/libmysqlclient_r.so.*
-%{_libdir}/mysql/libmysqlclient_r.so.*
-
-%files Max
-%defattr(-, root, root)
-/usr/sbin/mysqld-max
-%{_libdir}/mysql/mysqld-max.sym
 
 %files debug
 %defattr(-, root, root)
@@ -602,120 +594,59 @@ rm -rf %buildroot
 
 %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
+%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 ndb-storage -f mysql-ndb-storage.files
+
+%files ndb-management -f mysql-ndb-management.files
+
+%files ndb-tools -f mysql-ndb-tools.files
+
+%files ndb-extra -f mysql-ndb-extra.files
+
 %changelog
-* Mon Mar 30 2009 crrodriguez@suse.de
-- configure flag --with-pic is not really used for libmysqld.a
-  restore -fPIC in CFLAGS
-* Tue Mar 03 2009 crrodriguez@suse.de
-- use --disable-static, note that this will only
-  remove static libraries that have shared counterparts, those
-  in static form only remain available as usual (saves around 6MB)
-- remove "la" files
-* Wed Jan 07 2009 olh@suse.de
-- obsolete old -XXbit packages (bnc#437293)
-* Thu Oct 23 2008 mmarek@suse.cz
-- fix mysql_install_db when the hostname is 'localhost'
-  (bnc#429618, mysql#35754)
-* Thu Sep 25 2008 mmarek@suse.cz
-- build -max and -debug with --with-big-tables and archive, csv,
-  example, blackhole and federated engines to match the binary
-  builds provided by MySQL (bnc#427384)
-* Fri Sep 12 2008 mmarek@suse.cz
-- better fix for CVE-2008-2079 (bnc#425079, mysql#32167)
-* Fri Sep 12 2008 mmarek@suse.de
-- remove no longer needed s390 workaround
-* Tue Sep 02 2008 mmarek@suse.cz
-- fix mysql_config --libs output (bnc#420313, mysql#39175)
-* Mon Aug 25 2008 mmarek@suse.cz
-- updated to 5.0.67, for changes see
-  http://dev.mysql.com/doc/refman/5.0/en/releasenotes-cs-5-0-67.html
-* Mon Aug 18 2008 mmarek@suse.de
-- add Required-Stop: $network $remote_fs to the init script
-* Fri May 30 2008 mmarek@suse.cz
-- fix a race in rcmysql restart between the old mysql removing it's
-  pid file and exiting - use checkproc -p (bnc#359522, bnc#332530,
-  [#395710])
-* Thu May 22 2008 mmarek@suse.cz
-- increase timeout in rcmysql stop, should fix failed restarts
-  (bnc#359522, bnc#332530)
-* Mon May 19 2008 mmarek@suse.cz
-- fixed a privilege bypass with DATA/INDEX DIRECTORY
-  (bnc#387746, mysql#32167, CVE-2008-2079)
-* Thu Apr 10 2008 ro@suse.de
-- added baselibs.conf file to build xxbit packages
-  for multilib support
-* Fri Mar 14 2008 mmarek@suse.cz
-- fixed mysqld_multi.patch (bnc#371000)
-* Fri Mar 14 2008 mmarek@suse.cz
-- add 'user = mysql' to mysqld_multi example groups
-* Fri Mar 14 2008 mmarek@suse.cz
-- synced with server:database:mysql51
-- dropped README.SUSE (bnc#357634)
-- moved mysql_upgrade to the server package (bnc#366820)
-- adjusted license tags
-- finally convert err-log to log-error in my.cnf
+* Tue Feb 12 2008 - richard@radoeka.nl
 - Added multi database support by
   o updating /etc/init.d/mysql, it has now 2 legs the existing one to start
-  a single database, and a new one to start and stop multiple database.
+    a single database, and a new one to start and stop multiple database.
   o Added a sysconfig variable
+  o Added a directory /var/lib/mysql-databases to hold databases,
   o Updated /etc/my.cnf with some examples database configurations
-  (Done by Richard Bos, minor edits by me, bnc#353120)
-* Tue Feb 26 2008 mmarek@suse.cz
-- updated to 5.0.51a
-  * incorporates previous security fixes
-* Fri Jan 04 2008 mmarek@suse.cz
-- updated to 5.0.51
-  * statements that contain unclosed /*-comments now are rejected
-  with a syntax error [mysql#28779]
-  * server parser performance improvements [mysql#30625,
-  mysql#30237]
-  * security fix: CVE-2007-5969 / mysql#32111
-  * for a full list of changes, see
-  http://dev.mysql.com/doc/refman/5.0/en/releasenotes-cs-5-0-51.html
-- fixed CVE-2007-6303 / mysql#29908
-- fixed CVE-2007-6304 / mysql#29801
-- fixed several testsuite failures
-  (mybug25359.patch, mybug32458.patch, mybug33050.patch)
-* Wed Dec 26 2007 crrodriguez@suse.de
-- fix library-without-ldconfig-postun
-* Thu Nov 08 2007 mmarek@suse.cz
-- avoid using distributed pregenerated files instead of
-  files generated in the builddirs
-* Fri Aug 31 2007 mmarek@suse.cz
+* Fri Aug 31 2007 - mmarek@suse.cz
 - make sure mysql-shared is replaced by libmysqlclient15 when
   updating from 10.1 or 10.2 [#306556]
-* Wed Aug 29 2007 mmarek@suse.cz
+* Wed Aug 29 2007 - mmarek@suse.cz
 - fix for http://bugs.mysql.com/30069
   (thanks to Richard Guenther)
-* Tue Aug 21 2007 mmarek@suse.cz
+* Tue Aug 21 2007 - mmarek@suse.cz
 - make TMPDIR relative to datadir= setting in /etc/my.cnf
 - add a hint about changing datadir to rcmysql [#285076]
-* Fri Jul 27 2007 mmarek@suse.cz
+* Fri Jul 27 2007 - mmarek@suse.cz
 - updated to 5.0.45, for changes see
   http://dev.mysql.com/doc/refman/5.0/en/releasenotes-cs-5-0-45.html
-* Mon Jul 02 2007 mmarek@suse.cz
+* Mon Jul 02 2007 - mmarek@suse.cz
 - mysql_upgrade: don't fail if the db is already up-to-date
   [#287209] (mysql_upgrade-exit-status.patch)
-* Mon Jun 04 2007 mmarek@suse.cz
+* Mon Jun 04 2007 - mmarek@suse.cz
 - updated the mysql-test package (there are still some failures
   that don't occur during build-time tests)
 - use a new version of the mysql_upgrade program, which finally
   handles errors from /usr/bin/mysql correctly
-* Fri Jun 01 2007 mmarek@suse.cz
+* Fri Jun 01 2007 - mmarek@suse.cz
 - fixed build for older distributions in the buildservice
-* Tue May 29 2007 mmarek@suse.de
+* Tue May 29 2007 - mmarek@suse.de
 - run ldconfig in %%post of library packages
 - don't copy example my.cnf files to /usr/share/doc (they're
   already installed in /usr/share/mysql
 - fixed libmysqlclient-devel dependencies
-* Mon May 28 2007 mmarek@suse.cz
+* Mon May 28 2007 - mmarek@suse.cz
 - updated to 5.0.41, for changes see
   http://dev.mysql.com/doc/refman/5.0/en/releasenotes-cs-5-0-37.html
   http://dev.mysql.com/doc/refman/5.0/en/releasenotes-cs-5-0-41.html
@@ -726,7 +657,7 @@ rm -rf %buildroot
 - increased rcmysql start timeout to 30 seconds, don't return
   failure if mysql doesn't start early enough (except for update
   case) [#273938]
-* Thu Mar 29 2007 mmarek@suse.de
+* Thu Mar 29 2007 - mmarek@suse.de
 - BuildRequires fixes:
   + ncurses-devel
   + zlib-devel
@@ -735,10 +666,10 @@ rm -rf %buildroot
   + use sed instead of ex in the s390 workaround
 - build with -DFORCE_INIT_OF_VARS to get rid of some uninitialized
   variable warnings
-* Mon Mar 12 2007 mmarek@suse.cz
+* Mon Mar 12 2007 - mmarek@suse.cz
 - added openssl-devel to Requires: of mysql-devel to fix build of
   packages using mysql-devel
-* Thu Feb 22 2007 mmarek@suse.cz
+* Thu Feb 22 2007 - mmarek@suse.cz
 - updated to 5.0.33, see
   http://dev.mysql.com/doc/refman/5.0/en/releasenotes-cs-5-0-33.html
   for a list of changes
@@ -762,33 +693,33 @@ rm -rf %buildroot
 - build the client and libraries only once to save build time
   (mysql-build-only-server.patch)
 - cleaned up spec file
-* Mon Jan 22 2007 mmarek@suse.cz
+* Mon Jan 22 2007 - mmarek@suse.cz
 - silence some gcc warnings (compiler-warnings.patch)
-* Wed Jan 03 2007 mmarek@suse.cz
+* Wed Jan 03 2007 - mmarek@suse.cz
 - mysql-devel doesn't need mysql-client [#231010]
-* Tue Dec 19 2006 mmarek@suse.cz
+* Tue Dec 19 2006 - mmarek@suse.cz
 - updated to 5.0.27
   * includes the fix for http://bugs.mysql.com/bug.php?id=23427
 - fixed build with tar-1.16
 - fixed small typo in README.SuSE, renamed to README.SUSE [#226716]
-* Thu Nov 23 2006 mmarek@suse.de
+* Thu Nov 23 2006 - mmarek@suse.de
 - don't run killproc in rcmysql to avoid sending SIGKILL if
   possible [#223209]
-* Wed Nov 15 2006 mmarek@suse.de
+* Wed Nov 15 2006 - mmarek@suse.de
 - create user mysql with shell /bin/false, because 'su mysql' is
   not needed anymore (see bug #57071)
-* Wed Nov 15 2006 mmarek@suse.cz
+* Wed Nov 15 2006 - mmarek@suse.cz
 - use /var/lib/mysql/.tmp instead of /var/lib/mysql/tmp to avoid
   collision with a database named 'tmp' [#221188]
-* Tue Nov 14 2006 mmarek@suse.cz
+* Tue Nov 14 2006 - mmarek@suse.cz
 - use upstream patch for the varbinary upgrade problem (fixes the
   problem in the REPAIR TABLE implementation, not in the mysqlcheck
   program)
   [#188134, http://bugs.mysql.com/bug.php?id=19371]
-* Tue Oct 31 2006 mmarek@suse.cz
+* Tue Oct 31 2006 - mmarek@suse.cz
 - fixed another binary incompatibility in mysql-shared
   [http://bugs.mysql.com/bug.php?id=23427] (mybug23427.patch)
-* Thu Oct 19 2006 pnemec@suse.cz
+* Thu Oct 19 2006 - pnemec@suse.cz
 - updated to 5.0.26
   * fixes security bugs CVE-2006-4226 and CVE-2006-4227
   * Ctrl-C in the mysql CLI client tries to kill the current
@@ -811,19 +742,19 @@ rm -rf %buildroot
   the mysql database
   * lots of bugfixes
 - new patch uninitialized_variable.patch
-* Mon Oct 16 2006 mmarek@suse.cz
+* Mon Oct 16 2006 - mmarek@suse.cz
 - The ISAM storage engine is no longer supported, update the
   warning in rc.mysql.
-* Mon Oct 02 2006 mmarek@suse.cz
+* Mon Oct 02 2006 - mmarek@suse.cz
 - updated to version 5.0.24a
   * fixes a binary incompatibility of mysql-shared introduced in
   5.0.24
   * fixes a buffer overflow caused by statements with long DEFINER
   clause
   * fixes crash when closing temporary tables
-* Mon Sep 11 2006 joeshaw@suse.de
+* Mon Sep 11 2006 - joeshaw@suse.de
 - Add the libmysqld static libraries to the devel package.
-* Wed Aug 16 2006 mmarek@suse.cz
+* Wed Aug 16 2006 - mmarek@suse.cz
 - updated to version 5.0.24
   * added the --ssl-verify-server-cert option to MySQL client
   programs and MYSQL_OPT_SSL_VERIFY_SERVER_CERT for
@@ -837,10 +768,10 @@ rm -rf %buildroot
   * bug fixes
 - dropped obsolete CVE-2006-0903.patch and pick_args.patch,
   added my_libwrap.patch [http://bugs.mysql.com/18246]
-* Tue Aug 01 2006 mmarek@suse.cz
+* Tue Aug 01 2006 - mmarek@suse.cz
 - removed Recommends: from mysql-debug, it doesn't work on older
   dists
-* Mon Jul 31 2006 mmarek@suse.cz
+* Mon Jul 31 2006 - mmarek@suse.cz
 - created a new mysql-debug package compiled with --with-debug
   and removed the --with debug rpmbuild option
 - fixed --core-file option to really work when the server is
@@ -850,18 +781,18 @@ rm -rf %buildroot
 - cleaned up rc.mysql a bit
 - the server depends on a minimal mysql-client version to make
   sure a recent mysqlcheck is available for rc.mysql
-* Mon Jul 31 2006 mmarek@suse.cz
+* Mon Jul 31 2006 - mmarek@suse.cz
 - fixed some leaks and overflos in varbinary-upgrade.patch
-* Fri Jul 21 2006 mmarek@suse.cz
+* Fri Jul 21 2006 - mmarek@suse.cz
 - workaround an incompatibility with pre-5.0 varbinary fields:
   update the .frm file and remove trailing zeros and spaces
   in 'mysqlcheck --check-upgrade'
   [#188134, http://bugs.mysql.com/bug.php?id=19371]
   (varbinary-upgrade.patch)
-* Fri Jun 30 2006 mmarek@suse.cz
+* Fri Jun 30 2006 - mmarek@suse.cz
 - use --skip-networking when running the server with
   --skip-grant-tables in rcmysql (problem reported by Lenz Grimmer)
-* Mon Jun 19 2006 mmarek@suse.cz
+* Mon Jun 19 2006 - mmarek@suse.cz
 - updated to 5.0.22
   * new mysql_upgrade script for easies upgrades from previous
   versions
@@ -873,94 +804,94 @@ rm -rf %buildroot
 - the testsuite can be run in %%build again (run
   rpmbuild --with testsuite ... mysql.spec)
 - dropped patches: lib64.patch, sql_parse.patch
-* Thu Jun 01 2006 mmarek@suse.cz
+* Thu Jun 01 2006 - mmarek@suse.cz
 - build as user
-* Wed May 03 2006 mmarek@suse.cz
+* Wed May 03 2006 - mmarek@suse.cz
 - fix buffer overflow and and reading uninitialized memory using
   the COM_TABLE_DUMP protocol command (fix from the 5.0.21 release)
   [#172155] (sql_parse.patch)
-* Tue Apr 04 2006 mmarek@suse.cz
+* Tue Apr 04 2006 - mmarek@suse.cz
 - don't allow \0 in SQL even in comments
   [#163157] (CVE-2006-0903.patch)
-* Mon Mar 27 2006 mmarek@suse.cz
+* Mon Mar 27 2006 - mmarek@suse.cz
 - require mysql-shared = %%version in mysql-devel
-* Tue Mar 07 2006 mmarek@suse.cz
+* Tue Mar 07 2006 - mmarek@suse.cz
 - mail error message and explanation in logrotote script
   [#155341] (logrotate.patch)
-* Mon Mar 06 2006 mmarek@suse.cz
+* Mon Mar 06 2006 - mmarek@suse.cz
 - make err-log option work again
 - put a symlink to the logfile into /var/log
   [#155341] (4x-compat.patch)
-* Tue Jan 31 2006 mmarek@suse.cz
+* Tue Jan 31 2006 - mmarek@suse.cz
 - run mysql_fix_privilege_tables.sql when upgrading from 4.1
   [#146739]
-* Wed Jan 25 2006 mls@suse.de
+* Wed Jan 25 2006 - mls@suse.de
 - converted neededforbuild to BuildRequires
-* Tue Jan 10 2006 mmarek@suse.cz
+* Tue Jan 10 2006 - mmarek@suse.cz
 - created a new package mysql-test
 - removed unnecessary %%suse_update_config
-* Mon Jan 02 2006 mmarek@suse.cz
+* Mon Jan 02 2006 - mmarek@suse.cz
 - update to 5.0.18
-* Tue Dec 06 2005 mmarek@suse.cz
+* Tue Dec 06 2005 - mmarek@suse.cz
 - update to 5.0.16
-* Thu Dec 01 2005 mmarek@suse.cz
+* Thu Dec 01 2005 - mmarek@suse.cz
 - try postadal's update in BETA
-* Tue Oct 25 2005 postadal@suse.cz
+* Tue Oct 25 2005 - postadal@suse.cz
 - updated to version 5.0.15 [#119929]
 - removed obsoleted buffer-overflow.patch
 - fixed gcc issue
-* Thu Sep 01 2005 pnemec@suse.cz
+* Thu Sep 01 2005 - pnemec@suse.cz
 - fixed bug #95729 : set $TMPDIR to /var/lib/mysql/tmp
-* Tue Aug 30 2005 lmuelle@suse.de
+* Tue Aug 30 2005 - lmuelle@suse.de
 - Use MySQL for any output of the init script and add a space at each line we
   output.
-* Tue Jul 26 2005 postadal@suse.cz
+* Tue Jul 26 2005 - postadal@suse.cz
 - updated to version 4.1.13
 - removed obsoleted sentinel.patch
 - added glibc-devel zlib-devel to devel requires
-* Fri May 20 2005 mcihar@suse.cz
+* Fri May 20 2005 - mcihar@suse.cz
 - update to 4.1.12 (fixes tmp race, bug #84740)
-* Fri Apr 22 2005 mcihar@suse.cz
+* Fri Apr 22 2005 - mcihar@suse.cz
 - fix buffer overflow in test
-* Thu Apr 21 2005 tcrhak@suse.de
+* Thu Apr 21 2005 - tcrhak@suse.de
 - use $datadir when initializing a new database (bug #63707)
-* Wed Apr 06 2005 mcihar@suse.cz
+* Wed Apr 06 2005 - mcihar@suse.cz
 - update to 4.1.11
 - compile against readline (bug #75901)
-* Sun Apr 03 2005 aj@suse.de
+* Sun Apr 03 2005 - aj@suse.de
 - Fix GCC 4 warning.
-* Fri Apr 01 2005 mcihar@suse.cz
+* Fri Apr 01 2005 - mcihar@suse.cz
 - enable ISAM engine (bug #75320)
 - warn about existing ISAM tables (bug #75320)
 - fix init script to update MySQL tables on upgrade (bug #75321)
-* Thu Mar 10 2005 mcihar@suse.cz
+* Thu Mar 10 2005 - mcihar@suse.cz
 - update to 4.1.10a (bug #71788)
-* Tue Feb 15 2005 mcihar@suse.cz
+* Tue Feb 15 2005 - mcihar@suse.cz
 - update to 4.1.10 (bug #50825)
-* Thu Feb 10 2005 mcihar@suse.cz
+* Thu Feb 10 2005 - mcihar@suse.cz
 - disable actually test also for second build
-* Tue Feb 08 2005 mcihar@suse.cz
+* Tue Feb 08 2005 - mcihar@suse.cz
 - remove tests at all, these timeout in autobuild and work okay when
   building manyally
-* Fri Feb 04 2005 mcihar@suse.cz
+* Fri Feb 04 2005 - mcihar@suse.cz
 - increase test timeout not to fail so often
-* Mon Jan 24 2005 mcihar@suse.cz
+* Mon Jan 24 2005 - mcihar@suse.cz
 - update to 4.1.9
 - normal version now also supports InnoDB as well as original MySQL packages
 - update mysql tables on server start if needed
-* Fri Sep 17 2004 ro@suse.de
+* Fri Sep 17 2004 - ro@suse.de
 - added symlinks for libmysqlclient_r also in libdir/mysql
-* Fri Sep 17 2004 tcrhak@suse.cz
+* Fri Sep 17 2004 - tcrhak@suse.cz
 - added symlink libmysqlclient_r.so -> libmysqlclient_r.so.12.0.0
   to the file list of mysql-devel (bug #44700)
-* Fri Sep 10 2004 tcrhak@suse.cz
+* Fri Sep 10 2004 - tcrhak@suse.cz
 - update to 4.0.21
-* Thu Sep 02 2004 tcrhak@suse.cz
+* Thu Sep 02 2004 - tcrhak@suse.cz
 - do not use /var/adm/notify for notification mails (bug #44357)
 - updated README.SuSE (bug #44332)
 - be more verbose in the initial welcome message of mysql_install_db
   (also bug #44332)
-* Thu Aug 19 2004 tcrhak@suse.cz
+* Thu Aug 19 2004 - tcrhak@suse.cz
 - update to version 4.0.20
 - use group 'mysql' instead of 'daemon' for mysqld (bug #42071)
 - fixed a lib64 issue in mysql_config
@@ -968,53 +899,53 @@ rm -rf %buildroot
 - fixed a typo in rcmysql (bug #41055)
 - fix in order not to use initgroups() (caused segfault when used
   with ldap, bug #39798)
-* Fri Apr 02 2004 tcrhak@suse.cz
+* Fri Apr 02 2004 - tcrhak@suse.cz
 - fixed tmp race in mysqlbug (bug #37115)
-* Wed Mar 31 2004 tcrhak@suse.cz
+* Wed Mar 31 2004 - tcrhak@suse.cz
 - mysql: added dependency on perl-DBD-mysql (bug #36500)
 - fixed timezone.test (patch timezone)
-* Sat Mar 27 2004 ro@suse.de
+* Sat Mar 27 2004 - ro@suse.de
 - mysql-bench: replace perl-Msql-Mysql-modules by perl-DBD-mysql
   in requires
-* Wed Mar 17 2004 tcrhak@suse.cz
+* Wed Mar 17 2004 - tcrhak@suse.cz
 - use -f when running hostname in mysql_install_db (bug #36060)
-* Fri Feb 20 2004 tcrhak@suse.cz
+* Fri Feb 20 2004 - tcrhak@suse.cz
 - added /usr/bin/myisam_ftdump to filelist
 - updated manual.pdf to the latest version (2004-02-20)
-* Wed Feb 18 2004 tcrhak@suse.cz
+* Wed Feb 18 2004 - tcrhak@suse.cz
 - update to version 4.0.18
-* Fri Feb 06 2004 kukuk@suse.de
+* Fri Feb 06 2004 - kukuk@suse.de
 - Compile with -fno-strict-aliasing
-* Wed Oct 29 2003 tcrhak@suse.cz
+* Wed Oct 29 2003 - tcrhak@suse.cz
 - use socket to detect the start of mysqld instead
   of 'mysqladmin ping' again [bug #31605]
-* Tue Sep 16 2003 tcrhak@suse.cz
+* Tue Sep 16 2003 - tcrhak@suse.cz
 - fixed the postrotate script [bug #30985]
-* Mon Sep 15 2003 tcrhak@suse.cz
+* Mon Sep 15 2003 - tcrhak@suse.cz
 - fixed bogus 'start failed' reporting [bug #30210]
-* Thu Sep 11 2003 tcrhak@suse.cz
+* Thu Sep 11 2003 - tcrhak@suse.cz
 - update to version 4.0.15
-* Thu Aug 28 2003 meissner@suse.de
+* Thu Aug 28 2003 - meissner@suse.de
 - Readded ppc/ppc64 mutex patch.
-* Mon Aug 25 2003 tcrhak@suse.cz
+* Mon Aug 25 2003 - tcrhak@suse.cz
 - updated to version 4.0.14
 - added patch overflow
 - added macros %%stop_on_removal and %%restart_on_update
 - updated the pdf manual to version 2003-08-22
-* Fri May 30 2003 tcrhak@suse.cz
+* Fri May 30 2003 - tcrhak@suse.cz
 - fixed installed unpacked files
-* Fri May 16 2003 tcrhak@suse.cz
+* Fri May 16 2003 - tcrhak@suse.cz
 - update to version 4.0.12
 - require mysql-client in the main package (needed for logrotate)
 - use mysqladmin ping in logrotate script
 - commented out log_bin in my.cnf (my-medium.cnf) (bug #26716)
-* Thu Apr 24 2003 ro@suse.de
+* Thu Apr 24 2003 - ro@suse.de
 - fix install_info --delete call and move from preun to postun
-* Fri Mar 07 2003 kukuk@suse.de
+* Fri Mar 07 2003 - kukuk@suse.de
 - Fix useradd options
-* Sun Feb 23 2003 tcrhak@suse.cz
+* Sun Feb 23 2003 - tcrhak@suse.cz
 - added %%fillup_prereq and %%insserv_prereq [bug #24039]
-* Fri Feb 14 2003 tcrhak@suse.cz
+* Fri Feb 14 2003 - tcrhak@suse.cz
 - updated to version 3.23.55
 - updated the pdf manual to version 2002-07-26
 - fixed script mysql_install_db to use mysql-max if present
@@ -1022,15 +953,15 @@ rm -rf %buildroot
   uncommented prior to starting mysqld )
 - on start-up, detach from the terminal [bug #18440]
 - added %%install_info macros
-* Fri Jan 17 2003 bg@suse.de
+* Fri Jan 17 2003 - bg@suse.de
 - Disabled berkeley db backend for hppa
-* Mon Dec 02 2002 ro@suse.de
+* Mon Dec 02 2002 - ro@suse.de
 - include errno.h
-* Tue Sep 17 2002 ro@suse.de
+* Tue Sep 17 2002 - ro@suse.de
 - removed bogus self-provides
-* Sat Aug 24 2002 kukuk@suse.de
+* Sat Aug 24 2002 - kukuk@suse.de
 - Disabled berkeley db backend for SPARC
-* Mon Aug 19 2002 bk@suse.de
+* Mon Aug 19 2002 - bk@suse.de
 - Update to 3.23.52, which is a bugfix release for 3.23.51. Fixes (trimmed):
   o Fixed security bug when having an empty database name in the user.db table.
   o Changed initialisation of RND() to make it less predicatable.
@@ -1050,20 +981,20 @@ rm -rf %buildroot
   o Fixed possible problem in replication when doing DROP DATABASE on a database
   with InnoDB tables.
 - add fileutils to PreReq and use echo instead of cat.
-* Mon Aug 12 2002 max@suse.de
+* Mon Aug 12 2002 - max@suse.de
 - Using pthread mutexes instead of atomic_* on s390 and s390x,
   because mysql casts &int to (atomic_t *) when calling the atomic
   functions which breaks the alignment constraints of atomic_t.
-* Tue Jul 23 2002 kukuk@suse.de
+* Tue Jul 23 2002 - kukuk@suse.de
 - Fix useradd call
-* Mon Jul 22 2002 kukuk@suse.de
+* Mon Jul 22 2002 - kukuk@suse.de
 - Create user mysql
-* Mon Jul 22 2002 max@suse.de
+* Mon Jul 22 2002 - max@suse.de
 - New version: 3.23.51.
 - Init script doesn't source /etc/rc.config anymore [#17122].
 - Disabled berkeley db backend for alpha and x86_64 as well.
 - Still breaks on s390x, and x86_64.
-* Fri Jun 14 2002 meissner@suse.de
+* Fri Jun 14 2002 - meissner@suse.de
 - Reenabled make test.
 - Rerun auto* tools so libtool works on ppc64.
 - Do not use the berkeley DB backend on s390,s390x,ppc,ppc64,axp,mips
@@ -1071,14 +1002,14 @@ rm -rf %buildroot
 - Use generic AC_SYS_LARGEFILE macro.
 - Do not use asm/atomic stuff on ppc64 (long vs int problem).
 - Use CONFIG_SMP for other asm/atomic stuff instead of __SMP__.
-* Mon May 27 2002 meissner@suse.de
+* Mon May 27 2002 - meissner@suse.de
 - Disabled make test for x86_64 for now.
 - More %%_lib fixes, packaged libmysqlclient.so symlink into devel, the
   rest *.so.* into shared.
-* Wed Apr 24 2002 meissner@suse.de
+* Wed Apr 24 2002 - meissner@suse.de
 - started x86_64 work. Implemented required fast mutex,
   now only the test suite fail.
-* Fri Feb 15 2002 grimmer@suse.de
+* Fri Feb 15 2002 - grimmer@suse.de
 - Update to 3.23.48 (bugfixes) - MySQL 3.23 is now considered
   STABLE!
   * Fixed bug in complicated join with const tables
@@ -1089,19 +1020,19 @@ rm -rf %buildroot
   /var/lib/mysql/<hostname>.log to /var/lib/mysql/mysqld.log and
   is properly rotated by logrotate
 - updated README.SuSE
-* Wed Jan 30 2002 grimmer@suse.de
+* Wed Jan 30 2002 - grimmer@suse.de
 - Update to 3.23.47 (bugfixes) - see the following URLs for the
   full list of changes:
   http://www.mysql.com/doc/N/e/News-3.23.47.html
 - re-enabled and adjusted inline-patch
 - use libdir and prefix macros in configure call
-* Thu Dec 20 2001 grimmer@suse.de
+* Thu Dec 20 2001 - grimmer@suse.de
 - added /etc/logrotate.d/mysql
 - added log-rotate.patch to fit SuSEs logrotating better
 - added debugging symbols and /usr/bin/resolve_stack_dump
 - reworked installation section in spec file (create all
   directories first)
-* Mon Dec 17 2001 grimmer@suse.de
+* Mon Dec 17 2001 - grimmer@suse.de
 - Update to 3.23.46 (bugfixes) - see the following URLs for the
   full list of changes:
   http://www.mysql.com/doc/N/e/News-3.23.45.html
@@ -1114,14 +1045,14 @@ rm -rf %buildroot
 - removed START_MYSQL rc.config entry for SuSE Linux 8.0, adapted
   spec file to reflect this change
 - updated README.SuSE
-* Wed Nov 21 2001 grimmer@suse.de
+* Wed Nov 21 2001 - grimmer@suse.de
 - added check for "socket=" variable in function "parse_arguments"
   in the mysql init script (thanks to Aivo Kalu and Peter Marschall
   for spotting this) - the init script would issue a "failed"
   notice, if the socket variable had been changed to a different
   path than /var/lib/mysql/mysql.sock in /etc/my.cnf even though
   the MySQL daemon would be up and running [#12411]
-* Thu Nov 15 2001 grimmer@suse.de
+* Thu Nov 15 2001 - grimmer@suse.de
 - Update to 3.23.44 (bugfixes) - see the following URLs for the
   full list of changes:
   http://www.mysql.com/doc/N/e/News-3.23.43.html
@@ -1133,12 +1064,12 @@ rm -rf %buildroot
 - disabled inline patch (not required anymore)
 - Install /etc/mysqlaccess.conf with permissions set to "640"
   instead of "755" [#10871]
-* Mon Oct 01 2001 schwab@suse.de
+* Mon Oct 01 2001 - schwab@suse.de
 - Add patch to allow compilation even if the compiler decides to
   not actually inline the two largest inline functions,
   page_dir_slot_check() and btr_search_check_guess().
 - Don't run automake, fix the extra dependency instead.
-* Mon Sep 17 2001 grimmer@suse.de
+* Mon Sep 17 2001 - grimmer@suse.de
 - Update to 3.23.42 (bugfixes) - the following bugs were fixed:
   * Fixed problem when using LOCK TABLES and BDB tables.
   * Fixed problem with REPAIR TABLE on MyISAM tables with row
@@ -1174,10 +1105,10 @@ rm -rf %buildroot
   also works on Unix.
   * Fixed that automatic rollback that is done when thread end
   doesn't lock other threads.
-* Tue Aug 14 2001 grimmer@suse.de
+* Tue Aug 14 2001 - grimmer@suse.de
 - Update to 3.23.41 (bugfixes, see the changelog at
   http://www.mysql.com/doc/N/e/News-3.23.41.html for details)
-* Mon Jul 30 2001 grimmer@suse.de
+* Mon Jul 30 2001 - grimmer@suse.de
 - Update to 3.23.40 (see the changelogs at
   http://www.mysql.com/doc/N/e/News-3.23.x.html for details)
 - spec file: added mysql-Max subpackage that includes all the
@@ -1194,12 +1125,12 @@ rm -rf %buildroot
 - spec file: corrected URLs
 - manual.pdf: update to current version
 - README.SuSE: updated to document the above changes
-* Fri May 04 2001 grimmer@suse.de
+* Fri May 04 2001 - grimmer@suse.de
 - Fixed a nasty bug when updating after the database files
   have been copied to the new location, but the old ones have
   not been removed (#7692) - thanks to Jochen Schulz
   <jschulz1@gwdg.de> for spotting this one.
-* Sat Apr 28 2001 grimmer@suse.de
+* Sat Apr 28 2001 - grimmer@suse.de
 - Update to 3.23.37 (bugfixes, see
   http://www.mysql.com/doc/N/e/News-3.23.37.html for full
   changelog)
@@ -1208,7 +1139,7 @@ rm -rf %buildroot
   fixes for bug [#6876] and [#6840]
 - we currently do not enable MySQL-Max, since it is still
   considered beta (http://www.mysql.com/downloads/mysql-max-3.23.html)
-* Thu Apr 12 2001 grimmer@suse.de
+* Thu Apr 12 2001 - grimmer@suse.de
 - Update to 3.23.36 (bugfix and security release)
   full Changelogs for Changes between 3.23.33 and 3.23.36 are here:
   http://www.mysql.com/doc/N/e/News-3.23.36.html
@@ -1218,7 +1149,7 @@ rm -rf %buildroot
 - added more man pages to file list
 - reworked README.SuSE
 - added automated testing to spec file
-* Thu Mar 08 2001 grimmer@suse.de
+* Thu Mar 08 2001 - grimmer@suse.de
 - Update to 3.23.33 (bugfix release, see
   http://www.mysql.com/doc/N/e/News-3.23.33.html for a complete
   list of changes)
@@ -1229,7 +1160,7 @@ rm -rf %buildroot
 - added some comments about replication and BerkeleyDB code to
   README.SuSE
 - marked init script as config file in spec file
-* Tue Jan 23 2001 grimmer@suse.de
+* Tue Jan 23 2001 - grimmer@suse.de
 - Update to 3.23.32 - stable release including security fixes
   for the SHOW GRANTS statement and a remote buffer overflow
   (Bugtraq ID 2262)
@@ -1238,25 +1169,25 @@ rm -rf %buildroot
 - added --without-berkeley-db to the configure options
   (according to the release notes, Berkeley DB support and
   replication have not been exhaustively tested yet)
-* Wed Jan 10 2001 grimmer@suse.de
+* Wed Jan 10 2001 - grimmer@suse.de
 - Update to 3.23.30-gamma (bugfix-release)
 - added manual.pdf as a separate file
 - removed verbosity flag from cp-command in preinstall section
-* Fri Dec 22 2000 grimmer@suse.de
+* Fri Dec 22 2000 - grimmer@suse.de
 - fixed initial startup in init script (correct ownerships of
   the mysql datadir before starting mysqld using "chown")
 - added different mysql sample configurations to directory "cnf"
   in the documentation directory
 - use my-medium.cnf as default configuration /etc/my.cnf
-* Mon Dec 18 2000 grimmer@suse.de
+* Mon Dec 18 2000 - grimmer@suse.de
 - fixed packaging of mysql-bench (file list was empty)
-* Fri Dec 15 2000 grimmer@suse.de
+* Fri Dec 15 2000 - grimmer@suse.de
 - init script fixes (added $remote_fs to Required-Start,
   check if /usr/sbin/mysqld exists)
 - README.SuSE updates
-* Fri Dec 01 2000 ro@suse.de
+* Fri Dec 01 2000 - ro@suse.de
 - added static libs to devel package
-* Mon Nov 27 2000 grimmer@suse.de
+* Mon Nov 27 2000 - grimmer@suse.de
 - update to 3.23.28-gamma (considered stable enough by Monty)
 - added --with-extra-charsets=complex
 - database files are now located below /var/lib/mysql
@@ -1267,12 +1198,12 @@ rm -rf %buildroot
 - removed AGREEMENT since mysql is GPL now
 - removed README.SuSE, rc.config.mysql and rc.mysql from patch
   and added them as additional source files instead
-* Fri Nov 10 2000 grimmer@suse.de
+* Fri Nov 10 2000 - grimmer@suse.de
 - added a symlink /usr/lib/mysql/libmysqlclient.so ->
   ../libmysqlclient.so.6.0.0 to make libtool happy
-* Mon Nov 06 2000 grimmer@suse.de
+* Mon Nov 06 2000 - grimmer@suse.de
 - fixed Requires: for mysql-bench (mysql-perl -> perl-Msql-Mysql-modules)
-* Thu Nov 02 2000 grimmer@suse.de
+* Thu Nov 02 2000 - grimmer@suse.de
 - switched to long package names:
   mysqclnt -> mysql-client
   mysqldev -> mysql-devel
@@ -1282,23 +1213,23 @@ rm -rf %buildroot
   separate packages (perl-Msql-Mysql-modules and perl-Data-ShowTable)
 - finally use BuildRoot
 - updated README.SuSE to reflect changes
-* Wed Aug 23 2000 ro@suse.de
+* Wed Aug 23 2000 - ro@suse.de
 - fixed perl path
-* Fri Jul 21 2000 grimmer@suse.de
+* Fri Jul 21 2000 - grimmer@suse.de
 - corrected removal of comment - bash does not like
   empty if-statements...
-* Thu Jul 13 2000 grimmer@suse.de
+* Thu Jul 13 2000 - grimmer@suse.de
 - added missing "-" to parameter "hostname --fqdn" in
   scripts/mysql_install_db.sh (BUG#3383)
 - removed comment from scripts/mysql_install_db.sh about
   needing to install an init script, since we supply this already
-* Wed Jul 05 2000 grimmer@suse.de
+* Wed Jul 05 2000 - grimmer@suse.de
 - removed DBI perl module from subpackage mysqperl (is in a
   separate package "perl_dbi" now) and adjusted file list
   (BUG#3173)
-* Wed May 24 2000 uli@suse.de
+* Wed May 24 2000 - uli@suse.de
 - moved docs to /usr/share
-* Fri May 05 2000 freitag@suse.de
+* Fri May 05 2000 - freitag@suse.de
 - Security change requested by a feedback mail - sets initially
   a full qualified hostname and notifies the user to change the
   two root passwords and not only one.
@@ -1306,9 +1237,9 @@ rm -rf %buildroot
 - added --host=%%{_host} to configure call due to suspicious libtool
   probs
 - /usr/doc/packages replaced by %%{_defaultdocdir}
-* Sat Apr 08 2000 bk@suse.de
+* Sat Apr 08 2000 - bk@suse.de
 - added suse update config macro
-* Wed Feb 23 2000 grimmer@suse.de
+* Wed Feb 23 2000 - grimmer@suse.de
 - Update to 3.22.32
 - created subpackage "mysqllib" which contains shared libs only
 - created subpackage "mysqperl" which contains the perl modules
@@ -1318,60 +1249,60 @@ rm -rf %buildroot
   and init script modified
 - removed SuSE Linux version from AGREEMENT
 - updated README.SuSE to reflect changes
-* Fri Feb 11 2000 grimmer@suse.de
+* Fri Feb 11 2000 - grimmer@suse.de
 - added security patch from monty@tcx.se (password authentication)
-* Thu Jan 13 2000 grimmer@suse.de
+* Thu Jan 13 2000 - grimmer@suse.de
 - update to 3.22.30 (security fix for GRANT privileges)
 - now uses version macro in spec file
-* Fri Jan 07 2000 grimmer@suse.de
+* Fri Jan 07 2000 - grimmer@suse.de
 - update to 3.22.29
 - updated Msql-Mysql-modules to 1.2210 and removed obsolete patch
 - changed RPM Group of mysqldev to Development/Libraries
 - corrected paths in mysqlaccess
-* Thu Oct 28 1999 grimmer@suse.de
+* Thu Oct 28 1999 - grimmer@suse.de
 - update to 3.22.27
 - updated Msql-Mysql-modules to 1.2209
 - fixed check for ownership of installed db in specfile
-* Mon Oct 25 1999 grimmer@suse.de
+* Mon Oct 25 1999 - grimmer@suse.de
 - update to 3.22.26a
 - now runs as user "mysql" (resolved Bug #371)
 - now uses /etc/my.cnf
 - updated perl-modules (DBI, Msql-Mysql-modules)
 - moved long names from PAC-file to specfile (Provides:)
 - misc minor corrections/updates (specfile, init-script...)
-* Mon Aug 30 1999 grimmer@suse.de
+* Mon Aug 30 1999 - grimmer@suse.de
 - added bugfix for Alpha (TEXT and BLOB were broken)
 - modified configure-call in spec
 - added long aliases to PAC-files
-* Tue Jul 13 1999 grimmer@suse.de
+* Tue Jul 13 1999 - grimmer@suse.de
 - update to 3.22.25
 - updated perl-modules (DBI, Msql-Mysql-modules)
 - moved libs (mysqlclient.so et al) from /usr/lib/mysql to /usr/lib
 - minor corrections (README.SuSE, init-Script)
-* Thu May 20 1999 ro@suse.de
+* Thu May 20 1999 - ro@suse.de
 - activate assembler parts only on x86
-* Wed Apr 28 1999 grimmer@suse.de
+* Wed Apr 28 1999 - grimmer@suse.de
 - added missing perl module (Mysql.pm)
 - added missing perl package (Data-Showtable)
-* Tue Apr 06 1999 ro@suse.de
+* Tue Apr 06 1999 - ro@suse.de
 - update to 3.22.21
 - split into subpackages (mysql, mysqclnt, mysqldev, mysqbnch)
 - re-added perl-modules
 - updated init-Script
 - /etc/mysql.passwd is now obsolete
-* Fri Dec 11 1998 grimmer@suse.de
+* Fri Dec 11 1998 - grimmer@suse.de
 - updated init-Script
-* Sun Nov 29 1998 bs@suse.de
+* Sun Nov 29 1998 - bs@suse.de
 - fixed pathes for perl modules.
 - remove symlinks before creating them.
-* Fri Nov 27 1998 ro@suse.de
+* Fri Nov 27 1998 - ro@suse.de
 - adapted paths to old perl
 - this version should not have been in stable
-* Tue Nov 24 1998 grimmer@suse.de
+* Tue Nov 24 1998 - grimmer@suse.de
 - added /usr/doc/packages/AGREEMENT
-* Tue Nov 17 1998 ro@suse.de
+* Tue Nov 17 1998 - ro@suse.de
 - adapted paths to perl5.005_02
-* Wed Nov 11 1998 ro@suse.de
+* Wed Nov 11 1998 - ro@suse.de
 - added libgpp to neededforbuild
-* Mon Nov 09 1998 grimmer@suse.de
+* Mon Nov 09 1998 - grimmer@suse.de
 - New Package (Version 3.21.33b)
--- rc.mysql-multi.orig
+++ rc.mysql-multi
@@ -49,13 +49,20 @@ rc_reset
 # with force-reload (in case signalling is not supported) are
 # considered a success.
 
+# Check for the location of initscript
+if [ "`echo "$0" | grep "^\."`" ] || [ "`echo "$0" | grep "^[^/].*/"`" ]; then
+	MYSELF="`pwd`/$0"
+else
+	MYSELF="$0"
+fi
+
 parse_arguments() {
   for arg do
     case "$arg" in
-      --basedir=*)  basedir=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
-      --datadir=*)  datadir=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
+      --basedir=*)  basedir=`echo "$arg"  | sed -e 's/^[^=]*=//'` ;;
+      --datadir=*)  datadir=`echo "$arg"  | sed -e 's/^[^=]*=//'` ;;
       --pid-file=*) pid_file=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
-	  --socket=*)   socket=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
+      --socket=*)   socket=`echo "$arg"   | sed -e 's/^[^=]*=//'` ;;
     esac
   done
 }
@@ -88,7 +95,7 @@ kill_mysql ()
 	fi
 	test -L "/proc/$pid/exe" || return 7
 	exe=`readlink "/proc/$pid/exe"` || return 4
-	test "$exe" = "$MYSQLD" || return 7
+	test "`echo "$exe" | grep "^$MYSQLD"`" || return 7
 	kill -STOP "$pid"
 	kill -TERM "$pid" || return 4 # suboptimal
 	kill -CONT "$pid"
@@ -101,8 +108,15 @@ kill_mysql ()
 	return 1
 }
 
-# Read the value of:
-# MYSQLD_MULTI
+# Helper function which can end with any status
+set_return_value() {
+	return $1
+}
+
+# Check if we want to run multiple instances.
+[[ "`cat /etc/my.cnf | sed -n -e 's|#.*||' -e 's|\[mysqld[0-9]\+\]|yes|p'`" ]] && MYSQLD_MULTI=yes
+
+# This was old way how to specify this, left for backward compatibility.
 [[ -f /etc/sysconfig/mysql ]] && . /etc/sysconfig/mysql
 
 if [[ "$MYSQLD_MULTI" == "yes" ]]; then
@@ -143,7 +157,7 @@ if [[ "$MYSQLD_MULTI" == "yes" ]]; then
   	## Stop the service and if this succeeds (i.e. the 
   	## service was running before), start it again.
   	## Note: try-restart is not (yet) part of LSB (as of 0.7.5)
-  	$0 status >/dev/null &&  $0 restart
+  	"$MYSELF" status >/dev/null &&  "$MYSELF" restart
 
   	# Remember status and be quiet
   	rc_status
@@ -151,8 +165,8 @@ if [[ "$MYSQLD_MULTI" == "yes" ]]; then
 
       restart|force-reload)
   	echo "Restarting service multi MySQL "
-  	$0 stop
-  	$0 start
+  	"$MYSELF" stop
+  	"$MYSELF" start
 
   	rc_status
   	;;
@@ -175,7 +189,7 @@ if [[ "$MYSQLD_MULTI" == "yes" ]]; then
   	;;
 
       *)
-  	echo "Usage: $0 {start|stop|status|reload|restart|try-restart|force-reload}"
+  	echo "Usage: $MYSELF {start|stop|status|reload|restart|try-restart|force-reload}"
   	exit 1
   	;;
   esac
@@ -209,19 +223,14 @@ else
 	datadir=/var/lib/mysql
 	mysql_daemon_user=mysql
 	mysql_daemon_group=mysql
-	pid_file=/var/lib/mysql/mysqld.pid
-	socket=/var/lib/mysql/mysql.sock
+	pid_file=/var/run/mysql/mysqld.pid
+	socket=/var/run/mysql/mysql.sock
 	print_defaults=/usr/bin/my_print_defaults
 
 	mode=$1 # start or stop
 
 	parse_arguments `$print_defaults $defaults mysqld mysql_server`
-	export TMPDIR=$datadir/.tmp
-	if ! test -d "$TMPDIR"; then
-		mkdir "$TMPDIR"
-		chown mysql:mysql "$TMPDIR"
-		chmod 755 "$TMPDIR"
-	fi
+	export TMPDIR=/var/tmp/mysql
 
 	# Safeguard (relative paths, core dumps..)
 	cd $basedir
@@ -229,9 +238,19 @@ else
 	case "$1" in
 	    start)
 		# exit gracefully, if we are already running
-		$0 status >/dev/null && echo -n "Starting service MySQL " && \
+		"$MYSELF" status >/dev/null && echo -n "Starting service MySQL " && \
 		rc_status -v && rc_exit
 
+		# prepare tmp dir
+		rm -rf "$TMPDIR"
+		mkdir -p "$TMPDIR"
+		chown mysql:mysql "$TMPDIR"
+		chmod 755 "$TMPDIR"
+		[ "`ls -ld "$TMPDIR" | grep "^drwxr-xr-x[[:blank:]]\+[0-9]\+[[:blank:]]\+$mysql_daemon_user[[:blank:]]\+$mysql_daemon_group[[:blank:]]\+.*"`" ] || {
+			echo "Can't create secure $TMPDIR"
+			rc_failed; rc_status -v; rc_exit;
+		}
+
 		# Test, if safe_mysqld actually exists
 		SAFE_MYSQLD=/usr/bin/mysqld_safe
 		test -x $SAFE_MYSQLD || {
@@ -259,7 +278,7 @@ else
 		fi
 
 		# check for ISAM tables
-		tables=`find $datadir -name '*.ISM' | sed "s@$datadir/*@@; s@.ISM@@; s@/@.@;"`
+		tables=`find $datadir -name '*.ISM' 2> /dev/null | sed "s@$datadir/*@@; s@.ISM@@; s@/@.@;"`
 		if test "$tables" ; then
 			echo
 			echo "Some tables still use ISAM format, which is NO LONGER SUPPORTED"
@@ -271,12 +290,12 @@ else
 			echo
 		fi
 		# check for bdb tables
-		tables=`find $datadir -name '*.db' | sed "s@$datadir/*@@; s@.db@@; s@/@.@;"`
+		tables=`find $datadir -name '*.db' 2> /dev/null | sed "s@$datadir/*@@; s@.db@@; s@/@.@;"`
 		if test -n "$tables" ; then
 			echo
-			echo "Some tables still use BerkeleyDB format, please convert them to something "
-			echo "else. BerkeleyDB support will be dropped in future releases. "
-			echo "You can use mysql_convert_table_format script to do this conversion. "
+			echo "Some tables still use BerkeleyDB format, which is NO LONGER SUPPORTED"
+			echo "since mysql 5.1. To use these tables, you would need to open them"
+			echo "from an older mysql server and convert to something better (eg. MyISAM)."
 			echo
 			echo "Tables using BerkeleyDB are: "
 			echo "  $tables "
@@ -299,12 +318,20 @@ else
 			# us to run mysql_upgrade, we start a full-featured server with
 			# --skip-grant-tables and restict access to it by unix
 			# permissions of the named socket
-			protected=$datadir/.protected
+			protected=/var/run/mysql/protected
+			rm -rf $protected
+			mkdir -p $protected
 			chown $mysql_daemon_user:$mysql_daemon_group $protected
 			chmod 700 $protected
+			[ "`ls -ld $protected | grep "^drwx------[[:blank:]]\+[0-9]\+[[:blank:]]\+$mysql_daemon_user[[:blank:]]\+$mysql_daemon_group[[:blank:]]\+.*"`" ] || {
+				echo "Can't create secure $protected"
+				rc_failed; rc_status -v; rc_exit;
+			}
+
 			$SAFE_MYSQLD \
 				--mysqld=${MYSQLD#/usr/sbin/} \
 				$debug_flags \
+				--datadir=$datadir \
 				--skip-grant-tables \
 				--skip-networking \
 				--user=$mysql_daemon_user \
@@ -322,15 +349,15 @@ else
 				rc_exit;
 			}
 			killproc -p $protected/mysqld.pid -TERM $MYSQLD
+			rm -rf $protected
 			# Fix ownerships and permissions for $datadir
 			chmod 755 $datadir
 			chown -R $mysql_daemon_user:$mysql_daemon_group $datadir
 			rm -f $datadir/.run-mysql_upgrade \
 			$datadir/{update-stamp-*,mysql/stamp-4.1} # used in the past
-		if test -f $datadir/mysql/stamp-4.1 ; then
-			rm $datadir/mysql/stamp-4.1
-		fi
-
+			if test -f $datadir/mysql/stamp-4.1 ; then
+				rm $datadir/mysql/stamp-4.1
+			fi
 		fi
 
 		echo -n "Starting service MySQL "
@@ -355,6 +382,7 @@ else
 	    stop)
 		echo -n "Shutting down service MySQL "
 		kill_mysql
+		rm -rf "$TMPDIR"
 
 		# Remember status and be verbose
 		rc_status -v
@@ -364,7 +392,7 @@ else
 		## Stop the service and if this succeeds (i.e. the 
 		## service was running before), start it again.
 		## Note: try-restart is not (yet) part of LSB (as of 0.7.5)
-		$0 status >/dev/null &&  $0 restart
+		"$MYSELF" status >/dev/null &&  "$MYSELF" restart
 
 		# Remember status and be quiet
 		rc_status
@@ -372,8 +400,8 @@ else
 
 	    restart|force-reload)
 		echo "Restarting service MySQL "
-		$0 stop
-		$0 start
+		"$MYSELF" stop
+		"$MYSELF" start
 
 		rc_status
 		;;
@@ -396,13 +424,38 @@ else
 		# 2 - service dead, but /var/lock/ lock file exists
 		# 3 - service not running
 
-		# NOTE: checkproc returns LSB compliant status values.
-		checkproc -p $pid_file $MYSQLD
+		# NOTE: checkproc returns LSB compliant status values,
+		#       but it checks for running binary first and only
+		#       if it doesn't find running process with proper
+		#       name it checks pidfile. So we can't use it because
+		#       akonadi runs it's own database.
+		# checkproc -p $pid_file $MYSQLD
+		if [ -f "$pid_file" ]; then
+			if ! [ -e /proc/version ]; then
+				mount -n -t proc proc /proc
+				test -e /proc/version || set_return_value 100
+			fi
+			if [ -d "/proc/`cat $pid_file`" ]; then
+				if exe=`readlink "/proc/$pid/exe"`; then
+					if [ "`echo "$exe" | grep "^$MYSQLD"`" ]; then
+						set_return_value 0
+					else
+						set_return_value 1
+					fi
+				else
+					set_return_value 100
+				fi
+			else
+				set_return_value 1
+			fi
+		else
+			set_return_value 3
+		fi
 		rc_status -v
 		;;
 
 	    *)
-		echo "Usage: $0 {start|stop|status|reload|restart|try-restart|force-reload}"
+		echo "Usage: $MYSELF {start|stop|status|reload|restart|try-restart|force-reload}"
 		exit 1
 		;;
 	esac
--- suse-test-run.orig
+++ suse-test-run
@@ -4,7 +4,6 @@
 
 my $id = getpwnam("mysql") or die "can't find user \"mysql\": $!";
 my $dir = "/usr/share/mysql-test/";
-my $binary = "/usr/sbin/mysqld";
 
 if ($< == 0) {
 	($<, $>) = ($id, $id);
@@ -13,10 +12,6 @@ if ($< == 0) {
 	}
 }
 
-if ($0 =~ /\/suse-test-run-max$/i) {
-	$binary .= "-max";
-}
-
 chdir($dir) or die "can't cd to $dir: $!";
-exec("./mysql-test-run.pl", "--master-binary=$binary", "--slave-binary=$binary", "--big-test", @ARGV);
+exec("./mysql-test-run.pl", "--big-test", @ARGV);
 die "can't execute mysql-test-run.pl: $!";

Places

File project.diff of Package mysql (Revision a196835cc1b1a49e0b14ab1ba1ad83fc)

Places