Merge with MySQL 5.1.55

- Fixed some issues with partitions and connection_string, which also fixed lp:716890 "Pre- and post-recovery crash in Aria"
- Fixed wrong assert in Aria

Now need to merge with latest xtradb before pushing 

sql/ha_partition.cc:
  Ensure that m_ordered_rec_buffer is not freed before close.
sql/mysqld.cc:
  Changed to use opt_stack_trace instead of opt_pstack.
  Removed references to pstack
sql/partition_element.h:
  Ensure that connect_string is initialized
storage/maria/ma_key_recover.c:
  Fixed wrong assert

19 files changed, 136 insertions, 505 deletions

diff --git a/support-files/Makefile.am b/support-files/Makefile.am
index f6500e82be0..7be2a846c14 100644
--- a/support-files/Makefile.am
+++ b/support-files/Makefile.am
@@ -1,11 +1,11 @@
 # Copyright (C) 2000-2006 MySQL AB, 2008-2010 Sun Microsystems, Inc.
 #
-# This library is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
 # License as published by the Free Software Foundation; version 2
 # of the License.
 #
-# This library is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Library General Public License for more details.
diff --git a/support-files/RHEL4-SElinux/Makefile.am b/support-files/RHEL4-SElinux/Makefile.am
index d2143a5285c..2f9a12ea0c5 100644
--- a/support-files/RHEL4-SElinux/Makefile.am
+++ b/support-files/RHEL4-SElinux/Makefile.am
@@ -1,11 +1,11 @@
 # Copyright (C) 2000-2001, 2003-2006 MySQL AB
 #
-# This library is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
 # License as published by the Free Software Foundation; version 2
 # of the License.
 #
-# This library is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Library General Public License for more details.
diff --git a/support-files/SCO/INSTALL.sh b/support-files/SCO/INSTALL.sh
deleted file mode 100755
index 979f33f3f06..00000000000
--- a/support-files/SCO/INSTALL.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# search & check GNU patch
-PATCH="gpatch"
-$PATCH --version || PATCH="patch"
-$PATCH --version || exit
-
-
-if /usr/bin/test ! -e PKG/stamp-pre ; then
-  grep VERSION configure | head -1 | sed 's/VERSION=//' > ./PKG/version
-  touch PKG/stamp-pre
-fi
-
-if /usr/bin/test ! -e PKG/stamp-patch ; then
- ${PATCH} -p0 < ./PKG/patch
- touch PKG/stamp-patch
-fi
-
-if /usr/bin/test ! -e PKG/stamp-compile ; then
-sh ./PKG/compile.sh ujis
-touch PKG/stamp-compile
-
-sh ./PKG/doc.sh ujis
-
-fi
-
-
-cd PKG
-sh mkpkg.sh ujis
diff --git a/support-files/SCO/compile.sh b/support-files/SCO/compile.sh
deleted file mode 100644
index 5281ccde02d..00000000000
--- a/support-files/SCO/compile.sh
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/sh
-# GNU ncurses
-
-# search & check GNU make
-GMAKE="gmake"
-$GMAKE --version || GMAKE="make"
-$GMAKE --version || exit
-
-MAKE=$GMAKE
-export MAKE
-
-CC=gcc
-CFLAGS="-O6 -fomit-frame-pointer"
-CXX=gcc
-CXXFLAGS="-O6 -fomit-frame-pointer -felide-constructors  -fno-exceptions -fno-rtti"
-# LDFLAGS="-static"
-LD=gcc
-
-export CC
-export CXX
-export LD
-export CFLAGS
-export CXXFLAGS
-# export LDFLAGS
-# Solaris don't have libpthread.a.
-
-if [ "x$1" = "x" ]; then
-  echo " please set character set"
-  exit
-fi
-
-CHAR="$1"
-case "$1" in
- [uU]*)
-   CHAR=ujis
-   ;;
- [sS]*)
-   CHAR=sjis
-   ;;
-esac
- 
-#---------------
-P=`pwd`
-
-if [ -f Makefile ] ; then
-    ${GMAKE} distclean
-fi
-
-for i in bin sbin include man share/doc/mysql mysql-data
-do
-  /usr/bin/mkdir -p PKG/tmp-${CHAR}/usr/local/${i}
-done
-/usr/bin/mkdir -p PKG/tmp-${CHAR}/etc/init.d
-
-#----------------------------
-./configure \
-   --prefix=/usr/local \
-   --libexecdir=/usr/local/sbin \
-   --sbindir=/usr/local/sbin \
-   --localstatedir=/usr/local/mysql-data \
-   --with-charset=${CHAR} \
-   --with-extra-charsets=all \
-   --with-raid \
-   --without-docs \
-   --without-bench \
-   --without-perl \
-   --with-gcc \
-   --with-mysqld-ldflags="-static" \
-   --with-client-ldflags="-static" \
-   --with-named-curses-libs=/usr/local/lib/libncurses.a \
-   --with-mysqld-user=mysql
-
-#   --with-berkeley-db-includes=/usr/local/include/db3 \
-#   --with-berkeley-db-libs=/usr/local/lib/libdb3.a \
-#   --with-low-memory
-
-${GMAKE}
-${GMAKE} install DESTDIR=${P}/PKG/tmp-${CHAR}
-
-v=`grep '^SHARED_LIB_VERSION' configure.in | sed 's@SHARED_LIB_VERSION@@' | sed -e 's@=@@' -e 's@:@ @g' | awk '{print $1}'`
-km="libmysqlclient.so.$v"
-export km
-
-(cd ${P}/PKG/tmp-${CHAR}/usr/local/lib/mysql/ ; \
-  for i in libmysqlclient* ; do \
-    if /usr/bin/test ! -L $i ; then \
-        mv $i ../ ; ln -sf ../$i ; \
-    fi ; \
-  done ; \
-  k=`ls libmysqlclient.so.*.*.*` ; \
-  cd .. ; \
-  if /usr/bin/test ! -z libmysqlclient.so ; then \
-      ln -sf $k libmysqlclient.so ;
-  fi ; \
-  if /usr/bin/test ! -z $km ; then \
-      ln -sf $k $km ;
-  fi ; \
-)
-
-#
-(cd ${P}/PKG/tmp-${CHAR}/usr/local/bin ; strip * )
-(cd ${P}/PKG/tmp-${CHAR}/usr/local/sbin ; strip * )
diff --git a/support-files/SCO/doc.sh b/support-files/SCO/doc.sh
deleted file mode 100644
index 9ef17166a6f..00000000000
--- a/support-files/SCO/doc.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-CHAR="$1"
-case "$1" in 
- [uU]*) 
-   CHAR=ujis 
-   ;; 
- [sS]*) 
-   CHAR=sjis 
-   ;; 
-esac 
-
-cp -r Docs/* PKG/tmp-${CHAR}/usr/local/share/doc/mysql/
-cp INSTALL-SOURCE* COPYING* MIRRORS README* PKG/tmp-${CHAR}/usr/local/share/doc/mysql/
-
-cd PKG/tmp-${CHAR}/usr/local/share/doc/mysql/
-gzip *.txt *.texi *.info *.pdf
diff --git a/support-files/SCO/mkpkg.sh b/support-files/SCO/mkpkg.sh
deleted file mode 100644
index 5a38113138d..00000000000
--- a/support-files/SCO/mkpkg.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-if [ "x$1" = "x" ]; then
-  echo " please set charset"
-  exit
-fi
-
-CHAR="$1"
-case "$1" in
- [uU]*)
-   CHAR=ujis ; CH=uj
-   ;;
- [sS]*)
-   CHAR=sjis ; CH=sj
-   ;;
-esac
-
-#-------------------
-DIR=`pwd`
-
-VERSION=`cat version`
-
-T=`uname -p`
-
-sed -e "s/@CHAR1@/${CH}/" \
-	 -e "s/@CHAR2@/${CHAR}/" \
-	-e "s/@VERSION@/${VERSION}/" \
-	-e "s/@TYPE@/${T}/" \
-	pkginfo.ini > pkginfo.${CHAR}
-
-sed -e "s,@DIR@,${DIR},g" \
-	-e "s,@PKGINFO@,${DIR}/pkginfo.${CHAR}," \
-	prototype.ini > prototype.${CHAR}
-
-INIT="tmp-${CHAR}/etc/init.d/mysql"
-cp ../support-files/mysql.server $INIT
-chmod 755 $INIT
-
-(cd tmp-${CHAR}; \
-chown root etc usr ; \
-chgrp sys etc usr ;\
-chmod 755 usr etc; \
-chgrp sys etc/init.d ; \
-chmod 755 etc/init.d ; \
-find . -print|pkgproto >> ../prototype.${CHAR})
-
-pkgmk -o -f prototype.${CHAR} -r ${DIR}/tmp-${CHAR}
diff --git a/support-files/SCO/patch b/support-files/SCO/patch
deleted file mode 100644
index 373eb8518c6..00000000000
--- a/support-files/SCO/patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- scripts/safe_mysqld.sh.orig	Sat Sep  2 17:28:26 2000
-+++ scripts/safe_mysqld.sh	Sat Sep  2 17:31:19 2000
-@@ -89,10 +89,10 @@
- 
- 
- NOHUP_NICENESS=`nohup nice`
--if test $? -ne 0 || test x"$NOHUP_NICENESS" = x0 || test ! nice --1 echo foo > /dev/null 2>&1; then
-+if test $? -ne 0 || test x"$NOHUP_NICENESS" = x0 || test ! nice -1 echo foo > /dev/null 2>&1; then
-   NOHUP_NICENESS="nohup"
- else
--  NOHUP_NICENESS="nice --$NOHUP_NICENESS nohup"
-+  NOHUP_NICENESS="nice -$NOHUP_NICENESS nohup"
- fi
- 
- export MYSQL_UNIX_PORT
-@@ -163,7 +163,8 @@
-     # The only thing is ps x => redhat 5 gives warnings when using ps -x.
-     # kill -9 is used or the process won't react on the kill.
-     numofproces=`ps xa | grep -v "grep" | grep -c $ledir/mysqld`
--    echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log
-+    echo | tee -a $err_log
-+    echo "Number of processes running now: $numofproces" | tee -a $err_log
-     I=1
-     while test "$I" -le "$numofproces"
-     do 
-@@ -185,4 +186,6 @@
-   echo "`date +'%y%m%d %H:%M:%S  mysqld restarted'`" | tee -a $err_log
- done
- 
--echo -e "`date +'%y%m%d %H:%M:%S  mysqld ended\n'`" | tee -a $err_log
-+echo | tee -a $err_log
-+echo "`date +'%y%m%d %H:%M:%S  mysqld ended'`" | tee -a $err_log
-+echo | tee -a $err_log
---- support-files/mysql.server.sh.orig	Sat Sep  2 17:35:56 2000
-+++ support-files/mysql.server.sh	Sat Sep  2 17:36:35 2000
-@@ -23,6 +23,9 @@
- mysql_daemon_user=@MYSQLD_USER@
- export PATH
- 
-+## your options...
-+OPT=""
-+
- mode=$1
- 
- if test -w /             # determine if we should look at the root config file
-@@ -82,8 +85,9 @@
-     then
-       # Give extra arguments to mysqld with the my.cnf file. This script may
-       # be overwritten at next upgrade.
--      $bindir/safe_mysqld \
--	--user=$mysql_daemon_user --datadir=$datadir --pid-file=$pid_file --log=$log_file  &
-+      $bindir/safe_mysqld $OPT \
-+	--user=$mysql_daemon_user --datadir=$datadir --pid-file=$pid_file &
-+# --log=$log_file  &
-     else
-       echo "Can't execute $bindir/safe_mysqld"
-     fi
---- configure.orig	Sat Sep  2 17:54:03 2000
-+++ configure	Sat Sep  2 17:54:18 2000
-@@ -202,7 +202,7 @@
-   --with-charset=CHARSET  use CHARSET by default (one of: big5 cp1251 cp1257
-                           croat czech danish dec8 dos estonia euc_kr gb2312 gbk
-                           german1 greek hebrew hp8 hungarian koi8_ru koi8_ukr
--                          latin1 latin2 swe7 usa7 win1250 win1251 win1251ukr
-+                          latin1 latin2 swe7 usa7 win1250 win1251ukr
-                           ujis sjis tis620; default is latin1)"
- ac_help="$ac_help
-   --with-extra-charsets=cs1,cs2
-@@ -8843,7 +8843,7 @@
- 
- # Choose a character set
- 
--CHARSETS_AVAILABLE="big5 cp1251 cp1257 croat czech danish dec8 dos estonia euc_kr gb2312 gbk german1 greek hebrew hp8 hungarian koi8_ru koi8_ukr latin1 latin2 swe7 usa7 win1250 win1251 win1251ukr ujis sjis tis620"
-+CHARSETS_AVAILABLE="big5 cp1251 cp1257 croat czech danish dec8 dos estonia euc_kr gb2312 gbk german1 greek hebrew hp8 hungarian koi8_ru koi8_ukr latin1 latin2 swe7 usa7 win1250 win1251ukr ujis sjis tis620"
- DEFAULT_CHARSET=latin1
- 
- # Check whether --with-charset or --without-charset was given.
---- configure.in.orig	Sat Sep  2 17:53:57 2000
-+++ configure.in	Sat Sep  2 17:54:36 2000
-@@ -1517,14 +1517,14 @@
- dnl or other special handling, you must also create
- dnl strings/ctype-$charset_name.c
- 
--CHARSETS_AVAILABLE="big5 cp1251 cp1257 croat czech danish dec8 dos estonia euc_kr gb2312 gbk german1 greek hebrew hp8 hungarian koi8_ru koi8_ukr latin1 latin2 swe7 usa7 win1250 win1251 win1251ukr ujis sjis tis620"
-+CHARSETS_AVAILABLE="big5 cp1251 cp1257 croat czech danish dec8 dos estonia euc_kr gb2312 gbk german1 greek hebrew hp8 hungarian koi8_ru koi8_ukr latin1 latin2 swe7 usa7 win1250 win1251ukr ujis sjis tis620"
- DEFAULT_CHARSET=latin1
- 
- AC_ARG_WITH(charset,
-   [  --with-charset=CHARSET  use CHARSET by default (one of: big5 cp1251 cp1257
-                           croat czech danish dec8 dos estonia euc_kr gb2312 gbk
-                           german1 greek hebrew hp8 hungarian koi8_ru koi8_ukr
--                          latin1 latin2 swe7 usa7 win1250 win1251 win1251ukr
-+                          latin1 latin2 swe7 usa7 win1250 win1251ukr
-                           ujis sjis tis620; default is latin1)],
-   [default_charset="$withval"],
-   [default_charset="$DEFAULT_CHARSET"])
diff --git a/support-files/SCO/pkginfo.ini b/support-files/SCO/pkginfo.ini
deleted file mode 100644
index 13b8b6adb09..00000000000
--- a/support-files/SCO/pkginfo.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-PKG=MySQL
-NAME=MySQL
-ARCH=@TYPE@
-VERSION=@VERSION@
-CATEGORY=utility
-VENDOR=TcX DataKonsult AB, Detron HB and MySQL AB
-BASEDIR=/
-CLASSES=none
diff --git a/support-files/SCO/postinstall b/support-files/SCO/postinstall
deleted file mode 100644
index 2e199b9af82..00000000000
--- a/support-files/SCO/postinstall
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-PATH=/usr/local/sbin:/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/ucb:/usr/ccs/bin
-LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib
-export PATH
-export LD_LIBRARY_PATH
-
-D0="/usr/local/mysql-data"
-D="${D0}/mysql"
-
-DOFIX=0
-
-if /usr/bin/test ! -f ${D}/tables_priv.frm -a -d ${D} ; then
-  DOFIX=1
-fi
-
-if [ ! -d ${D} ]; then
-  DOFIX=2
-  /usr/local/bin/mysql_install_db
-fi
-
-  chown -R mysql $D0
-  chgrp -R mysql $D0
-
-if /usr/bin/test $DOFIX -eq 1 ; then
-  /etc/init.d/mysql start
-  /usr/local/bin/mysql_fix_privilege_tables
-else
-  /etc/init.d/mysql start || true
-fi
diff --git a/support-files/SCO/preinstall b/support-files/SCO/preinstall
deleted file mode 100644
index c1175561a99..00000000000
--- a/support-files/SCO/preinstall
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/ucb:/usr/ccs/bin
-LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib
-export PATH
-export LD_LIBRARY_PATH
-
-if /usr/bin/test -x /etc/init.d/mysql ; then
- /etc/init.d/mysql stop || true
-fi
-
-#----- user check
-P=`grep mysql /etc/passwd`
-G=`grep mysql /etc/group`
-
-if /usr/bin/test "x$G" = "x" ; then
-  /usr/sbin/groupadd mysql
-fi
-if /usr/bin/test "x$P" = "x" ; then
-  /usr/sbin/useradd -g mysql -d /usr/local/mysql-data -s /bin/false mysql  
-fi
diff --git a/support-files/SCO/preremove b/support-files/SCO/preremove
deleted file mode 100644
index a89648431c1..00000000000
--- a/support-files/SCO/preremove
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-PATH=/usr/local/sbin:/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/ucb:/usr/ccs/bin
-LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib
-export PATH
-export LD_LIBRARY_PATH
-
-pid=`/usr/bin/ps -e | /usr/bin/grep mysqld |  /usr/bin/sed -e 's/^  *//' -e 's/ .*//'`
-[ "$pid" != "" ] && /usr/local/bin/mysqladmin shutdown
-
-#---
-#/usr/ucb/echo -n "Remove DATA Directory (All data expire) [Y/N]? "
-#read I
-I=No
-
-case "$I" in
-Y*|y*)
-	/usr/ucb/echo -n "Removing MySQL DATA ALL..."
-	rm -rf /usr/local/mysql-data
-	echo "done."
-	;;
-*)
-	echo "not purge DATA directory"
-	;;
-esac;
diff --git a/support-files/SCO/prototype.ini b/support-files/SCO/prototype.ini
deleted file mode 100644
index ca88bb67a90..00000000000
--- a/support-files/SCO/prototype.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-i pkginfo=@PKGINFO@
-i postinstall=@DIR@/postinstall
-i preinstall=@DIR@/preinstall
-i preremove=@DIR@/preremove
diff --git a/support-files/SCO/version b/support-files/SCO/version
deleted file mode 100644
index f9dc296b71b..00000000000
--- a/support-files/SCO/version
+++ /dev/null
@@ -1 +0,0 @@
-3.23.23-beta
diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh
index 27ef0e5cc07..896b139273b 100644
--- a/support-files/my-huge.cnf.sh
+++ b/support-files/my-huge.cnf.sh
@@ -1,13 +1,15 @@
-# Example MySQL config file for very large systems.
+# Example MariaDB config file for very large systems.
 #
 # This is for a large system with memory of 1G-2G where the system runs mainly
-# MySQL.
+# MariaDB.
 #
-# You can copy this file to
-# /etc/my.cnf to set global options,
-# mysql-data-dir/my.cnf to set server-specific options (in this
-# installation this directory is @localstatedir@) or
-# ~/.my.cnf to set user-specific options.
+# MariaDB programs look for option files in a set of
+# locations which depend on the deployment platform.
+# You can copy this option file to one of those
+# locations. For information about these locations, do:
+# 'my_print_defaults --help' and see what is printed under
+# Default options are read from the following files in the given order:
+# More information at: http://dev.mysql.com/doc/mysql/en/option-files.html
 #
 # In this file, you can use all long options that a program supports.
 # If you want to know which options a program supports, run the program
@@ -38,6 +40,9 @@ query_cache_size = 32M
 # Try number of CPU's*2 for thread_concurrency
 thread_concurrency = 8
 
+# Point the following paths to a dedicated disk
+#tmpdir		= /tmp/
+
 # Don't listen on a TCP/IP port at all. This can be a security enhancement,
 # if all processes that need to connect to mysqld run on the same host.
 # All interaction with mysqld must be made via Unix sockets or named pipes.
@@ -113,14 +118,10 @@ server-id	= 1
 # binary logging format - mixed recommended 
 #binlog_format=mixed
 
-# Point the following paths to different dedicated disks
-#tmpdir		= /tmp/		
-#log-update 	= /path-to-dedicated-directory/hostname
-
 # Uncomment the following if you are using InnoDB tables
-#innodb_data_home_dir = @localstatedir@/
+#innodb_data_home_dir = @localstatedir@
 #innodb_data_file_path = ibdata1:2000M;ibdata2:10M:autoextend
-#innodb_log_group_home_dir = @localstatedir@/
+o#innodb_log_group_home_dir = @localstatedir@
 # You can set .._buffer_pool_size up to 50 - 80 %
 # of RAM but beware of setting memory usage too high
 #innodb_buffer_pool_size = 384M
diff --git a/support-files/my-innodb-heavy-4G.cnf.sh b/support-files/my-innodb-heavy-4G.cnf.sh
index da2b35b8950..7cc88e2bb12 100644
--- a/support-files/my-innodb-heavy-4G.cnf.sh
+++ b/support-files/my-innodb-heavy-4G.cnf.sh
@@ -4,14 +4,17 @@
 #END CONFIG INFO
 
 #
-# This is a MySQL example config file for systems with 4GB of memory
-# running mostly MySQL using InnoDB only tables and performing complex
+# This is a MariaDB example config file for systems with 4GB of memory
+# running mostly MariaDB using InnoDB only tables and performing complex
 # queries with few connections.
 # 
-# You can copy this file to /etc/my.cnf to set global options,
-# mysql-data-dir/my.cnf to set server-specific options 
-# (@localstatedir@ for this installation) or to
-# ~/.my.cnf to set user-specific options.
+# MariaDB programs look for option files in a set of
+# locations which depend on the deployment platform.
+# You can copy this option file to one of those
+# locations. For information about these locations, do:
+# 'my_print_defaults --help' and see what is printed under
+# Default options are read from the following files in the given order:
+# More information at: http://dev.mysql.com/doc/mysql/en/option-files.html
 #
 # In this file, you can use all long options that a program supports.
 # If you want to know which options a program supports, run the program
@@ -22,11 +25,11 @@
 #
 
 #
-# The following options will be read by MySQL client applications.
-# Note that only client applications shipped by MySQL are guaranteed
-# to read this section. If you want your own MySQL client program to
+# The following options will be read by MariaDB client applications.
+# Note that only client applications shipped by MariaDB are guaranteed
+# to read this section. If you want your own MariaDB client program to
 # honor these values, you need to specify it as an option during the
-# MySQL client library initialization.
+# MariaDB client library initialization.
 #
 [client]
 #password	= [your_password]
@@ -36,7 +39,7 @@ socket		= @MYSQL_UNIX_ADDR@
 # *** Application-specific options follow here ***
 
 #
-# The MySQL server
+# The MariaDB server
 #
 [mysqld]
 
@@ -45,7 +48,7 @@ port		= @MYSQL_TCP_PORT@
 socket		= @MYSQL_UNIX_ADDR@
 
 # back_log is the number of connections the operating system can keep in
-# the listen queue, before the MySQL connection manager thread has
+# the listen queue, before the MariaDB connection manager thread has
 # processed them. If you have a very high connection rate and experience
 # "connection refused" errors, you might need to increase this value.
 # Check your OS documentation for the maximum value of this parameter.
@@ -61,14 +64,14 @@ back_log = 50
 # (via the "enable-named-pipe" option) will render mysqld useless!
 #skip-networking
 
-# The maximum amount of concurrent sessions the MySQL server will
+# The maximum amount of concurrent sessions the MariaDB server will
 # allow. One of these connections will be reserved for a user with
 # SUPER privileges to allow the administrator to login even if the
 # connection limit has been reached.
 max_connections = 100
 
 # Maximum amount of errors allowed per host. If this limit is reached,
-# the host will be blocked from connecting to the MySQL server until
+# the host will be blocked from connecting to the MariaDB server until
 # "FLUSH HOSTS" has been run or the server was restarted. Invalid
 # passwords and other errors during the connect phase result in
 # increasing this value. See the "Aborted_connects" status variable for
@@ -170,7 +173,7 @@ query_cache_limit = 2M
 ft_min_word_len = 4
 
 # If your system supports the memlock() function call, you might want to
-# enable this option while running MySQL to keep it locked in memory and
+# enable this option while running MariaDB to keep it locked in memory and
 # to avoid potential swapping out in case of high memory pressure. Good
 # for performance.
 #memlock
@@ -180,7 +183,7 @@ ft_min_word_len = 4
 default-storage-engine = MYISAM
 
 # Thread stack size to use. This amount of memory is always reserved at
-# connection time. MySQL itself usually needs no more than 64K of
+# connection time. MariaDB itself usually needs no more than 64K of
 # memory, while if you use your own stack hungry UDF functions or your
 # OS requires more stack for some operations, you might need to set this
 # to a higher value.
@@ -215,7 +218,7 @@ binlog_format=mixed
 #log
 
 # Print warnings to the error log file.  If you have any problem with
-# MySQL you should enable logging of warnings and examine the error log
+# MariaDB you should enable logging of warnings and examine the error log
 # for possible explanations. 
 #log_warnings
 
@@ -228,7 +231,7 @@ slow_query_log
 
 # All queries taking more than this amount of time (in seconds) will be
 # trated as slow. Do not use "1" as a value here, as this will result in
-# even very fast queries being logged from time to time (as MySQL
+# even very fast queries being logged from time to time (as MariaDB
 # currently measures time with second accuracy only).
 long_query_time = 2
 
@@ -241,13 +244,11 @@ long_query_time = 2
 # be used in a round-robin fashion.
 #tmpdir = /tmp
 
-
 # ***  Replication related settings 
 
-
 # Unique server identification number between 1 and 2^32-1. This value
 # is required for both master and slave hosts. It defaults to 1 if
-# "master-host" is not set, but will MySQL will not function as a master
+# "master-host" is not set, but will MariaDB will not function as a master
 # if it is omitted.
 server-id = 1
 
@@ -328,13 +329,13 @@ key_buffer_size = 32M
 # This buffer is allocated when a bulk insert is detected.
 bulk_insert_buffer_size = 64M
 
-# This buffer is allocated when MySQL needs to rebuild the index in
+# This buffer is allocated when MariaDB needs to rebuild the index in
 # REPAIR, OPTIMIZE, ALTER table statements as well as in LOAD DATA INFILE
 # into an empty table. It is allocated per thread so be careful with
 # large settings.
 myisam_sort_buffer_size = 128M
 
-# The maximum size of the temporary file MySQL is allowed to use while
+# The maximum size of the temporary file MariaDB is allowed to use while
 # recreating the index (during REPAIR, ALTER TABLE or LOAD DATA INFILE.
 # If the file-size would be bigger than this, the index will be created
 # through the key cache (which is slower).
@@ -350,7 +351,7 @@ myisam_recover
 
 # *** INNODB Specific options ***
 
-# Use this option if you have a MySQL server with InnoDB support enabled
+# Use this option if you have a MariaDB server with InnoDB support enabled
 # but you do not plan to use it. This will save memory and disk space
 # and speed up some things.
 #skip-innodb
@@ -381,7 +382,7 @@ innodb_buffer_pool_size = 2G
 innodb_data_file_path = ibdata1:10M:autoextend
 
 # Set this option if you would like the InnoDB tablespace files to be
-# stored in another location. By default this is the MySQL datadir.
+# stored in another location. By default this is the MariaDB datadir.
 #innodb_data_home_dir = <directory>
 
 # Number of IO threads to use for async IO operations. This value is
@@ -431,7 +432,7 @@ innodb_log_file_size = 256M
 # enough.
 innodb_log_files_in_group = 3
 
-# Location of the InnoDB log files. Default is the MySQL datadir. You
+# Location of the InnoDB log files. Default is the MariaDB datadir. You
 # may wish to point it to a dedicated hard drive or a RAID1 volume for
 # improved performance
 #innodb_log_group_home_dir
diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh
index 812009136f1..6f8dab0b0e2 100644
--- a/support-files/my-large.cnf.sh
+++ b/support-files/my-large.cnf.sh
@@ -1,19 +1,21 @@
-# Example MySQL config file for large systems.
+# Example MariaDB config file for large systems.
 #
 # This is for a large system with memory = 512M where the system runs mainly
-# MySQL.
+# MariaDB.
 #
-# You can copy this file to
-# /etc/my.cnf to set global options,
-# mysql-data-dir/my.cnf to set server-specific options (in this
-# installation this directory is @localstatedir@) or
-# ~/.my.cnf to set user-specific options.
+# MariaDB programs look for option files in a set of
+# locations which depend on the deployment platform.
+# You can copy this option file to one of those
+# locations. For information about these locations, do:
+# 'my_print_defaults --help' and see what is printed under
+# Default options are read from the following files in the given order:
+# More information at: http://dev.mysql.com/doc/mysql/en/option-files.html
 #
 # In this file, you can use all long options that a program supports.
 # If you want to know which options a program supports, run the program
 # with the "--help" option.
 
-# The following options will be passed to all MySQL clients
+# The following options will be passed to all MariaDB clients
 [client]
 #password	= your_password
 port		= @MYSQL_TCP_PORT@
@@ -21,7 +23,7 @@ socket		= @MYSQL_UNIX_ADDR@
 
 # Here follows entries for some specific programs
 
-# The MySQL server
+# The MariaDB server
 [mysqld]
 port		= @MYSQL_TCP_PORT@
 socket		= @MYSQL_UNIX_ADDR@
@@ -38,6 +40,9 @@ query_cache_size= 16M
 # Try number of CPU's*2 for thread_concurrency
 thread_concurrency = 8
 
+# Point the following paths to different dedicated disks
+#tmpdir		= /tmp/
+
 # Don't listen on a TCP/IP port at all. This can be a security enhancement,
 # if all processes that need to connect to mysqld run on the same host.
 # All interaction with mysqld must be made via Unix sockets or named pipes.
@@ -113,14 +118,10 @@ server-id	= 1
 # binary logging - not required for slaves, but recommended
 #log-bin=mysql-bin
 
-# Point the following paths to different dedicated disks
-#tmpdir		= /tmp/		
-#log-update 	= /path-to-dedicated-directory/hostname
-
 # Uncomment the following if you are using InnoDB tables
-#innodb_data_home_dir = @localstatedir@/
+#innodb_data_home_dir = @localstatedir@
 #innodb_data_file_path = ibdata1:10M:autoextend
-#innodb_log_group_home_dir = @localstatedir@/
+#innodb_log_group_home_dir = @localstatedir@
 # You can set .._buffer_pool_size up to 50 - 80 %
 # of RAM but beware of setting memory usage too high
 #innodb_buffer_pool_size = 256M
diff --git a/support-files/my-medium.cnf.sh b/support-files/my-medium.cnf.sh
index 8fd62eaf958..19ab8dfb151 100644
--- a/support-files/my-medium.cnf.sh
+++ b/support-files/my-medium.cnf.sh
@@ -1,20 +1,22 @@
-# Example MySQL config file for medium systems.
+# Example MariaDB config file for medium systems.
 #
-# This is for a system with little memory (32M - 64M) where MySQL plays
-# an important part, or systems up to 128M where MySQL is used together with
+# This is for a system with little memory (32M - 64M) where MariaDB plays
+# an important part, or systems up to 128M where MariaDB is used together with
 # other programs (such as a web server)
 #
-# You can copy this file to
-# /etc/my.cnf to set global options,
-# mysql-data-dir/my.cnf to set server-specific options (in this
-# installation this directory is @localstatedir@) or
-# ~/.my.cnf to set user-specific options.
+# MariaDB programs look for option files in a set of
+# locations which depend on the deployment platform.
+# You can copy this option file to one of those
+# locations. For information about these locations, do:
+# 'my_print_defaults --help' and see what is printed under
+# Default options are read from the following files in the given order:
+# More information at: http://dev.mysql.com/doc/mysql/en/option-files.html
 #
 # In this file, you can use all long options that a program supports.
 # If you want to know which options a program supports, run the program
 # with the "--help" option.
 
-# The following options will be passed to all MySQL clients
+# The following options will be passed to all MariaDB clients
 [client]
 #password	= your_password
 port		= @MYSQL_TCP_PORT@
@@ -22,7 +24,7 @@ socket		= @MYSQL_UNIX_ADDR@
 
 # Here follows entries for some specific programs
 
-# The MySQL server
+# The MariaDB server
 [mysqld]
 port		= @MYSQL_TCP_PORT@
 socket		= @MYSQL_UNIX_ADDR@
@@ -36,6 +38,9 @@ read_buffer_size = 256K
 read_rnd_buffer_size = 512K
 myisam_sort_buffer_size = 8M
 
+# Point the following paths to different dedicated disks
+#tmpdir		= /tmp/
+
 # Don't listen on a TCP/IP port at all. This can be a security enhancement,
 # if all processes that need to connect to mysqld run on the same host.
 # All interaction with mysqld must be made via Unix sockets or named pipes.
@@ -111,14 +116,10 @@ server-id	= 1
 # binary logging - not required for slaves, but recommended
 #log-bin=mysql-bin
 
-# Point the following paths to different dedicated disks
-#tmpdir		= /tmp/		
-#log-update 	= /path-to-dedicated-directory/hostname
-
 # Uncomment the following if you are using InnoDB tables
-#innodb_data_home_dir = @localstatedir@/
+#innodb_data_home_dir = @localstatedir@
 #innodb_data_file_path = ibdata1:10M:autoextend
-#innodb_log_group_home_dir = @localstatedir@/
+#innodb_log_group_home_dir = @localstatedir@
 # You can set .._buffer_pool_size up to 50 - 80 %
 # of RAM but beware of setting memory usage too high
 #innodb_buffer_pool_size = 16M
diff --git a/support-files/my-small.cnf.sh b/support-files/my-small.cnf.sh
index c0a86ae9671..7d1adaaafde 100644
--- a/support-files/my-small.cnf.sh
+++ b/support-files/my-small.cnf.sh
@@ -4,11 +4,11 @@
 # from time to time and it's important that the mysqld daemon
 # doesn't use much resources.
 #
-# You can copy this file to
-# /etc/my.cnf to set global options,
-# mysql-data-dir/my.cnf to set server-specific options (in this
-# installation this directory is @localstatedir@) or
-# ~/.my.cnf to set user-specific options.
+# MySQL programs look for option files in a set of
+# locations which depend on the deployment platform.
+# You can copy this option file to one of those
+# locations. For information about these locations, see:
+# http://dev.mysql.com/doc/mysql/en/option-files.html
 #
 # In this file, you can use all long options that a program supports.
 # If you want to know which options a program supports, run the program
@@ -52,9 +52,9 @@ server-id	= 1
 #binlog_format=mixed
 
 # Uncomment the following if you are using InnoDB tables
-#innodb_data_home_dir = @localstatedir@/
+#innodb_data_home_dir = @localstatedir@
 #innodb_data_file_path = ibdata1:10M:autoextend
-#innodb_log_group_home_dir = @localstatedir@/
+#innodb_log_group_home_dir = @localstatedir@
 # You can set .._buffer_pool_size up to 50 - 80 %
 # of RAM but beware of setting memory usage too high
 #innodb_buffer_pool_size = 16M
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 63ae93a313b..0b826fe66a2 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -1,4 +1,4 @@
-# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2010, Oracle and/or its affiliates.
 # Copyright (c) 2010 Monty Program Ab
 #
 # This program is free software; you can redistribute it and/or modify
@@ -23,7 +23,7 @@
 # change these, has to be exactly as is.
 %define mysql_old_vendor	MySQL AB
 %define mysql_vendor_2		Sun Microsystems, Inc.
-%define mysql_vendor		Oracle and/or its affiliates
+%define mysql_vendor		Oracle and/or its affiliates & Monty Program Ab
 
 %define mysql_version @VERSION@
 
@@ -140,14 +140,14 @@
 ##############################################################################
 
 Name:		MySQL
-Summary:	MySQL: a very fast and reliable SQL database server
+Summary:	MariaDB: a very fast and reliable SQL database server
 Group:		Applications/Databases
 Version:	@MYSQL_U_SCORE_VERSION@
 Release:	%{release}
-License:	Copyright 2000-2008 MySQL AB, @MYSQL_COPYRIGHT_YEAR@ %{mysql_vendor}  All rights reserved.  Use is subject to license terms.  Under %{mysql_license} license as shown in the Description field.
-Source:		http://www.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz
-URL:		http://www.mysql.com/
-Packager:	%{mysql_vendor} Product Engineering Team <build@mysql.com>
+License:	Copyright 2000-2008 MySQL AB, @MYSQL_COPYRIGHT_YEAR@ %{mysql_vendor}   Use is subject to license terms.  Under %{mysql_license} license as shown in the Description field.
+Source:		http://http://askmonty.org/wiki/MariaDB:Download
+URL:		http://www.askmonty.org/
+Packager:	Monty Program Ab
 Vendor:		%{mysql_vendor}
 Provides:	msqlormysql MySQL-server mysql
 BuildRequires: ncurses-devel
@@ -159,51 +159,53 @@ BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 
 # From the manual
 %description
-The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
-and robust SQL (Structured Query Language) database server. MySQL Server
-is intended for mission-critical, heavy-load production systems as well
-as for embedding into mass-deployed software. MySQL is a trademark of
-%{mysql_vendor}
+The MariaDB(TM) software delivers a very fast, multi-threaded,
+multi-user, and robust SQL (Structured Query Language) database server
+that is binary compatible with MySQL(TM). MariaDB Server is intended
+for mission-critical, heavy-load production systems as well as for
+embedding into mass-deployed software.
 
-Copyright 2000-2008 MySQL AB, @MYSQL_COPYRIGHT_YEAR@ %{mysql_vendor}  All rights reserved.
+MariaDB is a trademark of Monty Program Ab.
+
+Copyright 2000-2008 MySQL AB, @MYSQL_COPYRIGHT_YEAR@ %{mysql_vendor} 
 Use is subject to license terms.
 
 This software comes with ABSOLUTELY NO WARRANTY. This is free software,
 and you are welcome to modify and redistribute it under the GPL license.
 
-The MySQL web site (http://www.mysql.com/) provides the latest
-news and information about the MySQL software. Also please see the
-documentation and the manual for more information.
+The MariaDB web sites (http://askmonty.org && http://mariadb.org/)
+provides the latest news and information about the MariaDB
+software.
 
 ##############################################################################
 # Sub package definition
 ##############################################################################
 
 %package server
-Summary:	MySQL: a very fast and reliable SQL database server
+Summary:	MariaDB: a very fast and reliable SQL database server
 Group:		Applications/Databases
 Requires: coreutils grep procps /usr/sbin/useradd /usr/sbin/groupadd /sbin/chkconfig
 Provides:	msqlormysql mysql-server mysql MySQL
 Obsoletes:	MySQL mysql mysql-server
 
 %description server
-The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
-and robust SQL (Structured Query Language) database server. MySQL Server
-is intended for mission-critical, heavy-load production systems as well
-as for embedding into mass-deployed software. MySQL is a trademark of
-%{mysql_vendor}
+The MariaDB(TM) software delivers a very fast, multi-threaded,
+multi-user, and robust SQL (Structured Query Language) database server
+that is binary compatible with MySQL(TM). MariaDB Server is intended
+for mission-critical, heavy-load production systems as well as for
+embedding into mass-deployed software.
 
-Copyright 2000-2008 MySQL AB, @MYSQL_COPYRIGHT_YEAR@ %{mysql_vendor}  All rights reserved.
+Copyright 2000-2008 MySQL AB, @MYSQL_COPYRIGHT_YEAR@ %{mysql_vendor} 
 Use is subject to license terms.
 
 This software comes with ABSOLUTELY NO WARRANTY. This is free software,
 and you are welcome to modify and redistribute it under the GPL license.
 
-The MySQL web site (http://www.mysql.com/) provides the latest
-news and information about the MySQL software. Also please see the
-documentation and the manual for more information.
+The MariaDB web sites (http://askmonty.org && http://mariadb.org/)
+provides the latest news and information about the MariaDB
+software.
 
-This package includes the MySQL server binary
+This package includes the MariaDB server binary
 %if %{INNODB_BUILD}
 (configured including InnoDB)
 %endif
@@ -221,7 +223,8 @@ Obsoletes: mysql-client
 Provides: mysql-client
 
 %description client
-This package contains the standard MySQL clients and administration tools.
+This package contains the standard MariaDB & MySQL clients and
+administration tools.
 
 %{see_base}
 
@@ -229,7 +232,7 @@ This package contains the standard MySQL clients and administration tools.
 
 %if %{CLUSTER_BUILD}
 %package ndb-storage
-Summary:	MySQL - ndbcluster storage engine
+Summary:	MariaDB - ndbcluster storage engine
 Group:		Applications/Databases
 
 %description ndb-storage
@@ -242,7 +245,7 @@ computers that should store ndbcluster table data.
 # ------------------------------------------------------------------------------
 
 %package ndb-management
-Summary:	MySQL - ndbcluster storage engine management
+Summary:	MariaDB - ndbcluster storage engine management
 Group:		Applications/Databases
 
 %description ndb-management
@@ -255,7 +258,7 @@ one computer in the cluster.
 # ------------------------------------------------------------------------------
 
 %package ndb-tools
-Summary:	MySQL - ndbcluster storage engine basic tools
+Summary:	MariaDB - ndbcluster storage engine basic tools
 Group:		Applications/Databases
 
 %description ndb-tools
@@ -266,7 +269,7 @@ This package contains ndbcluster storage engine basic tools.
 # ------------------------------------------------------------------------------
 
 %package ndb-extra
-Summary:	MySQL - ndbcluster storage engine extra tools
+Summary:	MariaDB - ndbcluster storage engine extra tools
 Group:		Applications/Databases
 
 %description ndb-extra
@@ -280,40 +283,40 @@ They should be used with caution.
 
 %package test
 Requires: %{name}-client perl
-Summary: MySQL - Test suite
+Summary: MariaDB - Test suite
 Group: Applications/Databases
 Provides: mysql-test
 Obsoletes: mysql-bench mysql-test
 AutoReqProv: no
 
 %description test
-This package contains the MySQL regression test suite.
+This package contains the MariaDB regression test suite.
 
 %{see_base}
 
 # ------------------------------------------------------------------------------
 
 %package devel
-Summary: MySQL - Development header files and libraries
+Summary: MariaDB - Development header files and libraries
 Group: Applications/Databases
 Provides: mysql-devel
 Obsoletes: mysql-devel
 
 %description devel
 This package contains the development header files and libraries
-necessary to develop MySQL client applications.
+necessary to develop MariaDB client applications.
 
 %{see_base}
 
 # ------------------------------------------------------------------------------
 
 %package shared
-Summary: MySQL - Shared libraries
+Summary: MariaDB - Shared libraries
 Group: Applications/Databases
 
 %description shared
 This package contains the shared libraries (*.so*) which certain
-languages and applications need to dynamically load and use MySQL.
+languages and applications need to dynamically load and use MariaDB.
 
 # ------------------------------------------------------------------------------
 
@@ -321,19 +324,19 @@ languages and applications need to dynamically load and use MySQL.
 
 %package embedded
 Requires: %{name}-devel
-Summary: MySQL - embedded library
+Summary: MariaDB - embedded library
 Group: Applications/Databases
 Obsoletes: mysql-embedded
 
 %description embedded
-This package contains the MySQL server as an embedded library.
+This package contains the MariaDB server as an embedded library.
 
-The embedded MySQL server library makes it possible to run a
-full-featured MySQL server inside the client application.
+The embedded MariaDB server library makes it possible to run a
+full-featured MariaDB server inside the client application.
 The main benefits are increased speed and more simple management
 for embedded applications.
 
-The API is identical for the embedded MySQL version and the
+The API is identical for the embedded MariaDB version and the
 client/server version.
 
 %{see_base}
@@ -703,7 +706,8 @@ A manual upgrade is required.
 - Run the 'mysql_upgrade' program
 
 This is a brief description of the upgrade process.  Important details
-can be found in the MySQL manual, in the Upgrading section.
+can be found in the MySQL manual, in the Upgrading section and in the
+MariaDB knowledge base at http://www.askmonty.org
 ******************************************************************
 HERE
     exit 1
@@ -1162,6 +1166,9 @@ fi
 ##############################################################################
 %changelog
 
+* Sun Feb 20 2011 Monty
+ Updated texts to include information about MariaDB
+
 * Tue Jun 15 2010 Joerg Bruehe <joerg.bruehe@sun.com>
 
 - Change the behaviour on upgrade: