Merge lp:~ourdelta-core/ourdelta/ourdelta-5.0.86 into lp:~ourdelta-core/ourdelta/trunk015fmt

[Arjen Lentz]

[Arjen Lentz (arjen-lentz)]

review: Approve

=== modified file 'bakery/autobake-bintar.sh'
--- bakery/autobake-bintar.sh	2009-03-25 12:54:42 +0000
+++ bakery/autobake-bintar.sh	2009-10-01 11:15:32 +0000
@@ -2,7 +2,7 @@
 # 
 # Welcome to the OurDelta bakery.
 # 2008-11-01
-# Peter Lieverdink <[e-mail]>
+# Peter Lieverdink <[e-mail]>
 # Arjen Lentz <[e-mail]>
 #
 
@@ -81,7 +81,13 @@
 #
 source .ourdelta-version
 
+# for tarball naming
 OURDELTA_VERSION_STRING="${UPSTREAM}-d${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}${REPO_VERSION}-$(uname -o | cut -d '/' -f 2)-$(uname -m)"
+# for configure (shows up in SHOW GLOBAL VARIABLES LIKE 'version_%')
+SERVER_SUFFIX="-d${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}"
+SERVER_COMMENT="(OurDelta - http://ourdelta.org/)"
+SYSTEM_TYPE="$(uname -o)"
+MACHINE_TYPE="$(uname -m)"
 
 
 case `gcc -dumpmachine` in
@@ -107,9 +113,10 @@
         --libexecdir=\"${INSTALLROOT}/bin\" \
         --localstatedir=\"${INSTALLROOT}/data\" \
 	\
-        --with-server-suffix=\"-${OURDELTA_VERSION_STRING}\" \
-        --with-comment=\"(OurDelta - http://ourdelta.org/)\" \
-        --with-system-type=\"linux-gnu\" \
+        --with-server-suffix=\"${SERVER_SUFFIX}\" \
+        --with-comment=\"${SERVER_COMMENT}\" \
+        --with-system-type=\"${SYSTEM_TYPE}\" \
+        --with-machine-type=\"${MACHINE_TYPE}\" \
         \
         --enable-shared \
         --enable-static \
@@ -150,6 +157,6 @@
 tar cfz "${BUILD_BASE_DIR}/mysql-${OURDELTA_VERSION_STRING}.tar.gz" "mysql-${OURDELTA_VERSION_STRING}" && rm -fr "mysql-${OURDELTA_VERSION_STRING}"
 popd
 
-chown -R openquery:oq "${BUILD_BASE_DIR}"
+chown -R openquery:openquery "${BUILD_BASE_DIR}"
 
 # end of autobake script

=== modified file 'bakery/autobake-centos.sh'
--- bakery/autobake-centos.sh	2009-03-25 12:54:42 +0000
+++ bakery/autobake-centos.sh	2009-10-01 11:15:32 +0000
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # Welcome to the OurDelta bakery (CentOS edition)
-# Arjen Lentz <[e-mail]>
+# Arjen Lentz <[e-mail]>
 
 
 # Exit immediately on any error

=== modified file 'bakery/autobake-deb.sh'
--- bakery/autobake-deb.sh	2009-03-25 12:54:42 +0000
+++ bakery/autobake-deb.sh	2009-10-01 11:15:32 +0000
@@ -2,14 +2,19 @@
 # 
 # Welcome to the OurDelta bakery.
 # 2008-11-01
-# Peter Lieverdink <[e-mail]>
-# Arjen Lentz <[e-mail]>
+# Peter Lieverdink <[e-mail]>
+# Arjen Lentz <[e-mail]>
 #
 
 # Should whine about packages this script depends on...
 # they are not necessarily build-depends for upstream mysql.
 # E.g: devscripts, fakeroot, bzr, readlink
 
+# Source our shared util functions.
+#
+BAKERY_BASE_DIR="$(dirname $(readlink -f ${0}))"
+source ${BAKERY_BASE_DIR}/util/util.sh
+
 # Exit immediately on any error
 set -e
 
@@ -20,7 +25,7 @@
 BUILD_BASE_DIR="$(pwd)/build-temp-$$"
 DEB_POOL_BASE="/srv/shared/deb-pool"
 
-export DEB_BUILD_OPTIONS="nocheck"
+export DEB_BUILD_OPTIONS="fulltest"
 
 if [ ! $# -eq 1 ]; then
 	echo "Usage: $0 [tarball]"
@@ -60,6 +65,7 @@
 #
 echo "Going to build ${SOURCE_DIR} in ${BUILD_BASE_DIR}"
 
+
 # Unpack tarball in our build base dir.
 #
 # test -d ${BUILD_BASE_DIR} && rm -fr ${BUILD_BASE_DIR}
@@ -83,16 +89,23 @@
 # Set symlinks for build files in the debian dir, so we avoid adding AppArmor on Debian.
 DISTRO="$(lsb_release -si)"
 echo "Copying distribution specific build files for ${DISTRO}"
-DISTROFILES="control mysql-server-5.0.postinst rules mysql-server-5.0.dirs mysql-server-5.0.postrm mysql-server-5.0.files mysql-server-5.0.preinst"
+DISTROFILES="control mysql-server-5.0.dirs mysql-server-5.0.files mysql-server-5.0.postinst mysql-server-5.0.postrm mysql-server-5.0.preinst mysql-server-5.0.README.Debian mysql-server-core-5.0.files rules"
 for distrofile in ${DISTROFILES}; do
-  rm -f "./debian/${distrofile}" && cp -a "./debian/dist/${DISTRO}/${distrofile}" "./debian/${distrofile}";
+  rm -f "./debian/${distrofile}";
+  if [ -e "./debian/dist/${DISTRO}/${distrofile}" ]; then
+	cp -a "./debian/dist/${DISTRO}/${distrofile}" "./debian/${distrofile}"
+  fi
 done;
 
 # Adjust changelog, add new version.
 #
+# Due to versioning malarkey on Ubuntu Jaunty and higher, we may need a workaround.
+echo "Checking if we need a special version prefix"
+VERSIONFIX="$(${BAKERY_BASE_DIR}/util/versionfix.sh)"
+
 echo "Incrementing changelog and starting build scripts"
 CODENAME="$(lsb_release -c | cut -d: -f2 | sed 's/\s//g')"
-dch -b -D ${CODENAME} -v "${UPSTREAM}-d${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}${REPO_VERSION}" "Automatic build with OurDelta patchset ${PATCHLEVEL} (including Sphinx storage engine)."
+dch -b -D ${CODENAME} -v "${VERSIONFIX}${UPSTREAM}-d${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}${REPO_VERSION}" "Automatic build with OurDelta patchset ${PATCHLEVEL} (including Sphinx storage engine)."
 
 echo "Creating package version ${UPSTREAM}-d${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}${REPO_VERSION} ... "
 

=== modified file 'bakery/debian-5.0/additions/debian-start.inc.sh'
--- bakery/debian-5.0/additions/debian-start.inc.sh	2008-10-20 22:54:11 +0000
+++ bakery/debian-5.0/additions/debian-start.inc.sh	2009-10-01 11:15:32 +0000
@@ -18,10 +18,10 @@
   tempfile=`tempfile`
   # We have to use xargs in this case, because a for loop barfs on the 
   # spaces in the thing to be looped over. 
-  LC_ALL=C $MYSQL --skip-column-names --batch -e  '
-      select concat("select count(*) into @discard from `",
-                    TABLE_SCHEMA, "`.`", TABLE_NAME, "`") 
-      from information_schema.TABLES where ENGINE="MyISAM"' | \
+  LC_ALL=C $MYSQL --skip-column-names --batch -e  "
+      SELECT CONCAT('SELECT COUNT(*) INTO @discard FROM \`',
+                    TABLE_SCHEMA, '\`.\`', TABLE_NAME, '\`' )
+      FROM information_schema.TABLES WHERE ENGINE='MyISAM'" | \
     xargs -i $MYSQL --skip-column-names --silent --batch \
                     --force -e "{}" >$tempfile 
   if [ -s $tempfile ]; then

=== modified file 'bakery/debian-5.0/apparmor-profile'
--- bakery/debian-5.0/apparmor-profile	2009-03-18 08:38:57 +0000
+++ bakery/debian-5.0/apparmor-profile	2009-10-01 11:15:32 +0000
@@ -7,11 +7,14 @@
   #include <abstractions/nameservice>
   #include <abstractions/user-tmp>
   #include <abstractions/mysql>
+  #include <abstractions/winbind>
 
   capability dac_override,
+  capability sys_resource,
   capability setgid,
   capability setuid,
-  capability sys_resource,
+
+  network tcp,
 
   /etc/hosts.allow r,
   /etc/hosts.deny r,
@@ -22,6 +25,9 @@
   /etc/mysql/my.cnf r,
   /usr/sbin/mysqld mr,
   /usr/share/mysql/** r,
+  /usr/share/mysql-test/var/** rwk,
+  /var/log/mysql.log rw,
+  /var/log/mysql.err rw,
   /var/lib/mysql/ r,
   /var/lib/mysql/** rwk,
   /var/log/mysql/ r,

=== modified file 'bakery/debian-5.0/changelog'
--- bakery/debian-5.0/changelog	2008-10-20 22:54:11 +0000
+++ bakery/debian-5.0/changelog	2009-10-01 11:15:32 +0000
@@ -1,83 +1,73 @@
-mysql-dfsg-5.0 (5.0.67-d5ourdelta1) hardy; urgency=low
-
-  * Automatic build with Percona patch set and Sphinx storage engine.
-
- -- Peter Lieverdink <[e-mail]>  Mon, 06 Oct 2008 15:43:08 +1100
-
-mysql-dfsg-5.0 (5.0.67-0ubuntu6) intrepid; urgency=low
-
-  * Clean up mysql apparmor profile. (LP: #270663) 
-
- -- Chuck Short <[e-mail]>  Thu, 18 Sep 2008 09:37:56 -0400
-
-mysql-dfsg-5.0 (5.0.67-0ubuntu5) intrepid; urgency=low
-
-  * Add 91_ubuntu_buildd_testfailures.dpatch: disable tests that fail
-    randomly only on the amd64 buildd.
-
- -- Kees Cook <[e-mail]>  Thu, 28 Aug 2008 09:39:05 -0700
-
-mysql-dfsg-5.0 (5.0.67-0ubuntu4) intrepid; urgency=low
-
-  * Revert 99_incease_test_timeout.dpatch, and try upstream fixes for
-    random test failures as 90_upstream_bug_23921.dpatch (see
-    http://bugs.mysql.com/bug.php?id=23921).  Fixes random build failures.
-  * Revert PIE hardening -- subselect test kills running server on i386.
-
- -- Kees Cook <[e-mail]>  Wed, 27 Aug 2008 11:09:34 -0700
-
-mysql-dfsg-5.0 (5.0.67-0ubuntu3) intrepid; urgency=low
-
-  * debian/patches/99_incease_test_timeout.dpatch: Increase the timeout
-    time for mysql-tests in build.
-
- -- Chuck Short <[e-mail]>  Tue, 26 Aug 2008 10:57:12 -0400
-
-mysql-dfsg-5.0 (5.0.67-0ubuntu2) intrepid; urgency=low
-
-  * debian/{control,rules}: enable PIE hardening
-
- -- Kees Cook <[e-mail]>  Mon, 25 Aug 2008 13:53:36 -0700
-
-mysql-dfsg-5.0 (5.0.67-0ubuntu1) intrepid; urgency=low
-
-  * debian/control:
-    - Set maintainer to Ubuntu Core dev. Move Debian maintainer to
-      XSBC-Original-Maintainer.
-    - Add a mysql-doc-5.0 as a Suggest to mysql-client-5.0 mysql-server-5.0
-      andd libmsqlclient15-dev
-    - Prepend XS-Original- to Vcs-{Browser,Svn}.
-    - Fix man page conflicts with mysql-doc-5.0 when upgrading from gutsy
-      for mysql-server-5.0, mysql-client-5.0 and libmysqlclient15-dev
-      packages.
-    - Replaces and Conflicts apparmor-profiles << 2.1+1075-0ubuntu4 to allow
-      proper upgrades from gutsy.
-    - Lower "mailx from a Recommends to a Suggests, which is pulling in
-      exim4 on all installs of mysql-server. (LP: #259477).
-  * debian/rules:
-    - Apply same configuration options on lpia as for i386.
-    - Replace --with-comment="Debian" --with-comment="Ubuntu".
-  * debian/additions/my.cnf:
-    - Add note about the "/etc/mysql/conf.d" directory in my.cnf.
-    - Add warning about apparmor (LP: #201799)
-  * Follow ApparmorProfileMigration and force apparmor complain mode on some
-    upgrades (LP: #203531)
-    - debian/control: Recommends apparmor >= 2.1+1075-0ubuntu6
-    - debian/mysql-server-5.0.dirs: add etc/apparmor.d/force-complain
-    - debian/mysql-server-5.0.preinst: create symlink for force-complain/
-      on pre-feisty upgrades, upgrades where apparmor-profiles profile is
-      unchanged (ie non-enforcing) and upgrades where the profile doesn't
-      exist.
-    - debian/mysql-server-5.0.postrm: remove symlink in force-complain/ on
-      purge.
-   * Dropped debian/patches/58-disable-ndb-backup-print.dpatch, no 
-     longer needed.
-   * Dropped debian/patches/93_fix_user_setup_on_localhost.dpatch. use
-     Debian's instead.
-
- -- Chuck Short <[e-mail]>  Fri, 22 Aug 2008 10:49:54 -0400
-
-mysql-dfsg-5.0 (5.0.67-1) UNRELEASED; urgency=low
+mysql-dfsg-5.0 (5.0.86-d9-ourdelta) jaunty; urgency=low
+
+  * Automatic build with OurDelta patches.
+  * upstream Ubuntu 5.0.75 build mods also included.
+
+ -- Arjen Lentz <[e-mail]>  Mon, 28 Sep 2009 15:47:12 +1000
+
+mysql-dfsg-5.0 (5.0.84-1) unstable; urgency=low
+
+  * New upstream release.
+  * Update patches:
+    + debian/patches/60_disabled_tests.dpatch
+
+ -- Norbert Tretkowski <[e-mail]>  Fri, 24 Jul 2009 18:05:11 +0200
+
+mysql-dfsg-5.0 (5.0.83-1) unstable; urgency=low
+
+  * New upstream release.
+  * Update patches:
+    + debian/patches/45_warn-CLI-passwords.dpatch (closes: #536548)
+    + debian/patches/60_disabled_tests.dpatch
+
+ -- Norbert Tretkowski <[e-mail]>  Sat, 18 Jul 2009 08:18:53 +0200
+
+mysql-dfsg-5.0 (5.0.81-1) unstable; urgency=low
+
+  * New upstream release.
+  * Remove patches:
+    + debian/patches/63_update_ssl_certs.dpatch
+
+ -- Norbert Tretkowski <[e-mail]>  Mon, 04 May 2009 18:53:05 +0200
+
+mysql-dfsg-5.0 (5.0.77-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Norbert Tretkowski <[e-mail]>  Tue, 17 Feb 2009 18:42:46 +0100
+
+mysql-dfsg-5.0 (5.0.75-1) unstable; urgency=low
+
+  * New upstream release.
+  * Update patches:
+    + debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch
+  * Remove patches:
+    + debian/patches/50_fix_agg_functions.dpatch
+
+ -- Norbert Tretkowski <[e-mail]>  Mon, 22 Dec 2008 11:01:38 +0100
+
+mysql-dfsg-5.0 (5.0.67-3) unstable; urgency=low
+
+  * Really apply patch from 5.0.74 to fix check for non-aggregated columns
+    in queries.
+
+ -- Norbert Tretkowski <[e-mail]>  Tue, 16 Dec 2008 07:19:23 +0100
+
+mysql-dfsg-5.0 (5.0.67-2) unstable; urgency=low
+
+  * New patch from 5.0.74 to fix check for non-aggregated columns in queries.
+    (closes: #505179, #505181)
+  * Add patch from Dan Munckton:
+    + Clearly indicate that we do not support running multiple instances
+      of mysqld by duplicating the init script.
+      (closes: #314785, #324834, #435165, #444216)
+    + Properly parameterize all existing references to the mysql config
+      file (/etc/mysql/my.cnf).
+  * Really fix FTBFS if build twice in a row. (closes: #442684)
+
+ -- Norbert Tretkowski <[e-mail]>  Sun, 14 Dec 2008 10:12:30 +0100
+
+mysql-dfsg-5.0 (5.0.67-1) unstable; urgency=low
 
   * New upstream release.
   * Update patches:
@@ -93,11 +83,114 @@
     + debian/patches/56_fix_order_by.dpatch
     + debian/patches/57_fix_mysql_replication.dpatch
     + debian/patches/58_disable-ndb-backup-print.dpatch
+    + debian/patches/59_fix_relay_logs_corruption.dpatch
+    + debian/patches/60_rpl_test_failure.dpatch
     + debian/patches/90_upstreamdebiandir.dpatch
     + debian/patches/91_SECURITY_CVE-2007-5925.dpatch
     + debian/patches/92_SECURITY_CVE-2008-2079.dpatch
-
- -- Norbert Tretkowski <[e-mail]>  Sun, 10 Aug 2008 07:55:41 +0200
+    + debian/patches/93_SECURITY_CVE-2008-3963.dpatch
+  * Fix FTBFS if build twice in a row. (closes: #442684)
+
+ -- Norbert Tretkowski <[e-mail]>  Sun, 02 Nov 2008 13:51:50 +0100
+
+mysql-dfsg-5.0 (5.0.51a-24) testing-proposed-updates; urgency=low
+
+  * Update SSL certificates, and re-enable SSL related tests when running
+    the testsuite.
+
+ -- Norbert Tretkowski <[e-mail]>  Tue, 03 Feb 2009 15:40:47 +0100
+
+mysql-dfsg-5.0 (5.0.51a-23) testing-proposed-updates; urgency=medium
+
+  * Reset debconf password variable root_password_again immediately after
+    using it. (closes: #513262)
+  * Disable SSL related tests when running the testsuite until MySQL bug
+    #42366 gets fixed.
+
+ -- Norbert Tretkowski <[e-mail]>  Thu, 29 Jan 2009 14:07:32 +0100
+
+mysql-dfsg-5.0 (5.0.51a-22) testing-proposed-updates; urgency=low
+
+  * New patch 10_mysql_secure_installation.dpatch to fix failure on passwords
+    which need quoting. (closes: #511929)
+  * New patch 62_delete_with_self-join.dpatch from 5.0.54 to fix MyISAM
+    storage engine error (134) doing delete with self-join. (closes: #512651)
+
+ -- Norbert Tretkowski <[e-mail]>  Sun, 25 Jan 2009 10:02:35 +0100
+
+mysql-dfsg-5.0 (5.0.51a-21) testing-proposed-updates; urgency=low
+
+  * Ask for MySQL root password at high priority, because otherwise all
+    default installations will miss this question, thanks to Thijs Kinkhorst
+    for the patch. (closes: #510875)
+  * Do not fail checking tables when using sql-mode ansi-quotes, thanks to
+    Renato Alves for the patch. (closes: #507049)
+
+ -- Norbert Tretkowski <[e-mail]>  Fri, 09 Jan 2009 10:24:23 +0100
+
+mysql-dfsg-5.0 (5.0.51a-20) testing-proposed-updates; urgency=low
+
+  * New patch 60_fix_leap_seconds.dpatch from 5.0.74 to return leap second
+    values with a time part that ends with :59:59. (closes: #510177)
+
+ -- Norbert Tretkowski <[e-mail]>  Tue, 30 Dec 2008 10:32:46 +0100
+
+mysql-dfsg-5.0 (5.0.51a-19) testing-proposed-updates; urgency=low
+
+  * New patch 50_fix_mysqldump2.dpatch from 5.0.60 to fix dumping databases
+    from mysql 4.0 server. (closes: #507789)
+  * Do not create a guest account during bootstrap. (closes: #463704)
+
+ -- Norbert Tretkowski <[e-mail]>  Thu, 04 Dec 2008 23:07:19 +0100
+
+mysql-dfsg-5.0 (5.0.51a-18) testing-proposed-updates; urgency=high
+
+  * SECURITY:
+    Fix for CVE-2008-4098: Inadequate validation of paths used in DATA
+    DIRECTORY and INDEX DIRECTORY clauses of CREATE TABLE statements enabled
+    attackers to write to tables in other databases to which they could not
+    ordinarily have access.
+
+ -- Devin Carraway <[e-mail]>  Tue, 25 Nov 2008 05:38:45 +0000
+
+mysql-dfsg-5.0 (5.0.51a-17) testing-proposed-updates; urgency=low
+
+  * Do not use commented out passwords from debian.cnf. (closes: #453820)
+  * Update watch file to recognize releases > 5.0.45.
+
+ -- Norbert Tretkowski <[e-mail]>  Sun, 02 Nov 2008 13:31:32 +0100
+
+mysql-dfsg-5.0 (5.0.51a-16) unstable; urgency=low
+
+  * New patch 60_rpl_test_failure.dpatch from 5.0.54 to fix a race condition
+    with the rpl_packet test in some cases. (closes: #501413)
+
+ -- Norbert Tretkowski <[e-mail]>  Thu, 09 Oct 2008 08:50:43 +0200
+
+mysql-dfsg-5.0 (5.0.51a-15) unstable; urgency=high
+
+  * SECURITY:
+    Fix for CVE-2008-3963: An empty bit-string literal (b'') caused a server
+    crash. Now the value is parsed as an empty bit value (which is treated as
+    an empty string in string context or 0 in numeric context).
+    (closes: #498362)
+
+ -- Norbert Tretkowski <[e-mail]>  Sun, 14 Sep 2008 18:27:46 +0200
+
+mysql-dfsg-5.0 (5.0.51a-14) unstable; urgency=low
+
+  * Update debconf translations:
+    - Swedish, from Martin Bagge. (closes: #491688)
+    - Netherlands, from Thijs Kinkhorst. (closes: #492723)
+
+ -- Norbert Tretkowski <[e-mail]>  Sun, 07 Sep 2008 20:18:31 +0200
+
+mysql-dfsg-5.0 (5.0.51a-13) unstable; urgency=medium
+
+  * New patch 59_fix_relay_logs_corruption.dpatch from 5.0.56 to fix
+    corruption in relay logs. (closes: #463515)
+
+ -- Norbert Tretkowski <[e-mail]>  Wed, 03 Sep 2008 09:13:46 +0200
 
 mysql-dfsg-5.0 (5.0.51a-12) unstable; urgency=low
 

=== modified file 'bakery/debian-5.0/dist/Debian/control'
--- bakery/debian-5.0/dist/Debian/control	2009-03-19 02:14:02 +0000
+++ bakery/debian-5.0/dist/Debian/control	2009-10-01 11:15:32 +0000
@@ -5,18 +5,18 @@
 XSBC-Original-Maintainer: Debian MySQL Maintainers <[e-mail]>
 Uploaders: OurDelta Maintainers <[e-mail]>
 Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper (>= 4.1.16), file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline5-dev | libreadline-dev, psmisc, po-debconf, chrpath, automake1.9, dpatch, gawk, bison, lsb-release
-Standards-Version: 3.8.0
+Standards-Version: 3.8.2
 Homepage: http://ourdelta.org/
-XS-Original-Vcs-Browser: http://svn.debian.org/wsvn/pkg-mysql/
-XS-Original-Vcs-Svn: svn://svn.debian.org/svn/pkg-mysql/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-mysql/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-mysql/
 Bugs: http://bugs.launchpad.net/ourdelta
 
 Package: libmysqlclient15off
 Section: libs
 Architecture: any
 Depends: mysql-common (>= ${source:Version}), ${shlibs:Depends}
-Conflicts: libmysqlclient15, mysql-doc-5.0 (<< 5.0.56-0ubuntu1)
-Replaces: libmysqlclient15, mysql-doc-5.0 (<< 5.0.56-0ubuntu1)
+Conflicts: libmysqlclient15
+Replaces: libmysqlclient15
 Description: MySQL database client library
  MySQL is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
@@ -25,7 +25,6 @@
  .
  This package includes the client library.
 
-
 Package: libmysqlclient15-dev
 Architecture: any
 Section: libdevel
@@ -55,12 +54,11 @@
 
 Package: mysql-client-5.0
 Architecture: any
-Suggests: mysql-doc-5.0
 Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202), mysql-common (>= ${source:Version}), libmysqlclient15off (>= ${binary:Version}), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Recommends: libterm-readkey-perl
 Provides: virtual-mysql-client, mysql-client, mysql-community-client-5.0
-Conflicts: mysql-client (<< ${source:Version}), mysql-enterprise-client-5.0,  mysql-doc-5.0 (<< 5.0.56-0ubuntu1)
-Replaces: mysql-client (<< ${source:Version}), mysql-server,  mysql-doc-5.0 (<< 5.0.56-0ubuntu1), innotop
+Conflicts: mysql-client (<< ${source:Version}), mysql-enterprise-client-5.0
+Replaces: mysql-client (<< ${source:Version}), mysql-server, innotop
 Description: MySQL database client binaries
  MySQL is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
@@ -72,13 +70,13 @@
 
 Package: mysql-server-5.0
 Architecture: any                                                              
-Suggests: tinyca, mailx
-Recommends: libhtml-template-perl
+Suggests: tinyca
+Recommends: mailx, libhtml-template-perl
 Pre-Depends: mysql-common (>= ${source:Version}), adduser (>= 3.40), debconf
 Depends: mysql-client-5.0 (>= ${binary:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10)
 Conflicts: mysql-server (<< ${source:Version})
 Provides: mysql-server, virtual-mysql-server, mysql-community-server-5.0
-Replaces: mysql-server (<< ${source:Version}), mysql-enterprise-server-5.0, mysql-doc-5.0 (<< 5.0.56-0ubuntu1)
+Replaces: mysql-server (<< ${source:Version}), mysql-enterprise-server-5.0
 Description: MySQL database server binaries
  MySQL is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
@@ -88,7 +86,7 @@
  This customised server contains the OurDelta patches and support for
  the Sphinx storage engine.
  .
- This package includes the server and ndb-cluster binaries.
+ This package includes the (enhanced) server.
 
 Package: mysql-server
 Architecture: all

=== added file 'bakery/debian-5.0/dist/Debian/mysql-server-5.0.README.Debian'
--- bakery/debian-5.0/dist/Debian/mysql-server-5.0.README.Debian	1970-01-01 00:00:00 +0000
+++ bakery/debian-5.0/dist/Debian/mysql-server-5.0.README.Debian	2009-10-01 11:15:32 +0000
@@ -0,0 +1,127 @@
+
+*                     REMEMBER TO SET THE ROOT PASSWORD !!!
+============================================================================
+
+* MYSQL WON'T INSTALL?
+======================
+MySQL will only install if you have a non-numeric hostname that is resolvable
+via the /etc/hosts file. E.g. if the "hostname" command returns "myhostname"
+then there must be a line like "10.0.0.1 myhostname".
+
+On upgrades from MySQL 3.23, as shipped with Debian Woody, symlinks in place of
+/var/lib/mysql or /var/log/mysql gets accidently removed and have manually be
+restored.
+
+* MYSQL WON'T START OR STOP?
+============================
+You may never ever delete the special mysql user "debian-sys-maint". This
+user together with the credentials in /etc/mysql/debian.cnf are used by the
+init scripts to stop the server as they would require knowledge of the mysql
+root users password else.
+So in most of the times you can fix the situation by making sure that the
+debian.cnf file contains the right password, e.g. by setting a new one
+(remember to do a "flush privileges" then).
+
+* WHAT TO DO AFTER UPGRADES:
+============================
+The privilege tables are automatically updated so all there is left is read
+the changelogs on dev.mysql.com to see if any changes affect custom apps.
+
+* WHAT TO DO AFTER INSTALLATION:
+================================
+The MySQL manual describes certain steps to do at this stage in a separate
+chapter.  They are not necessary as the Debian packages does them
+automatically.
+
+The only thing that is left over for the admin is 
+ - setting the *passwords* !!!
+ - creating new users and databases
+ - read the rest of this text
+
+* DOWNGRADING TO 4.0 or 4.1:
+============================
+Unsupported. Period.
+But if you do and get problems or make interesting experiences, mail me, it
+might help others.
+Ok, if you really want, I would recommend to "mysqldump --opt" all tables,
+then purge 4.1, delete /var/lib/mysql, install 4.0 and insert the dumps.  Be
+carefully, though, with the "mysql" table, you might not simply overwrite that
+one as the password for the mysql "debian-sys-maint" user is stored in
+/etc/mysql/debian.cnf and needed by /etc/init.d/ to start mysql and check if
+it's alive. 
+
+* SOME APPLICATION CAN NO LONGER CONNECT:
+=========================================
+This application is probably linked against libmysqlclient12 or below and
+somebody has created a mysql user with new-style passwords.
+The old_passwords option which forces backwards compatibility, can be set 
+with "dpkg-reconfigure mysql-server-5.0".
+If that does not help, the password can be set manually, the application that 
+inserted the user should be changed or the application that tries to connect 
+should be updated to libmysqlclient14 or -15. 
+Read http://dev.mysql.com/doc/refman/5.0/en/old-client.html
+
+* NETWORKING:
+=============
+For security reasons, the Debian package has enabled networking only on the
+loop-back device using "bind-address" in /etc/mysql/my.cnf.  Check with
+"netstat -tlnp" where it is listening. If your connection is aborted
+immediately see if "mysqld: all" or similar is in /etc/hosts.allow and read
+hosts_access(5).
+
+* WHERE IS THE DOCUMENTATION?:
+==============================
+Unfortunately due to licensing restrictions, debian currently not able
+to provide the mysql-doc package in any format.  For the most up to date
+documentation, please go to http://dev.mysql.com/doc.
+
+* PASSWORDS:
+============
+It is strongly recommended to set a password for the mysql root user (which
+is NOT the same as the "normal" root user) with these commands:
+  /usr/bin/mysql -u root -D mysql -e "update user set password=password('new-password') where user='root'"
+  /usr/bin/mysql -u root -e "flush privileges"
+If you already had a password set add "-p" before "-u" to the lines above.
+
+If you are tired to type the password in every time or want to automate your
+scripts you can store it in the file $HOME/.my.cnf. It should be chmod 0600
+(-rw------- username username .my.cnf) to ensure that nobody else can read
+it.  Every other configuration parameter can be stored there, too. You will
+find an example below and more information in the MySQL manual in
+/usr/share/doc/mysql-doc or www.mysql.com.
+
+ATTENTION: It is necessary, that a .my.cnf from root always contains a "user"
+line wherever there is a "password" line, else, the Debian maintenance
+scripts, that use /etc/mysql/debian.cnf, will use the username
+"debian-sys-maint" but the password that is in root's .my.cnf. Also note,
+that every change you make in the /root/.my.cnf will affect the mysql cron
+script, too.
+
+        # an example of $HOME/.my.cnf
+	[client]
+	user		= your-mysql-username
+	password	= enter-your-good-new-password-here
+
+* BIG_ROWS FOR EVEN MORE ROWS IN A TABLE:
+=========================================
+If you ever run out of rows in a table there is the possibility of building
+the package with "-DBIG_ROWS" which, according to a MySQL employee on
[e-mail] should lead to a 64bit row index (I guess > 2^32
+rows) but also to an approx. 5% performance loss.
+
+* NDB CLUSTER ENGINE:
+=====================
+Removed from Debian as it's broken.
+Still present in Ubuntu. Works for basic playing/testing.
+If you really need cluster, you want the 6.5.x telco branch, not this.
+
+
+* FURTHER NOTES ON REPLICATION
+===============================
+Іf the MySQL server is acting as a replication slave, you should not
+set --tmpdir to point to a directory on a memory-based filesystem or to
+a directory that is cleared when the server host restarts. A replication
+slave needs some of its temporary files to survive a machine restart so
+that it can replicate temporary tables or LOAD DATA INFILE operations. If
+files in the temporary file directory are lost when the server restarts,
+replication fails.

=== modified file 'bakery/debian-5.0/dist/Debian/mysql-server-5.0.files'
--- bakery/debian-5.0/dist/Debian/mysql-server-5.0.files	2009-03-19 03:56:32 +0000
+++ bakery/debian-5.0/dist/Debian/mysql-server-5.0.files	2009-10-01 11:15:32 +0000
@@ -20,27 +20,11 @@
 usr/bin/mysql_upgrade
 usr/bin/mysql_upgrade_shell
 usr/bin/mysql_zap
-usr/bin/ndb_config
-usr/bin/ndb_delete_all
-usr/bin/ndb_desc
-usr/bin/ndb_drop_index
-usr/bin/ndb_drop_table
-usr/bin/ndb_error_reporter
-usr/bin/ndb_mgm
-usr/bin/ndb_restore
-usr/bin/ndb_select_all
-usr/bin/ndb_select_count
-usr/bin/ndb_show_tables
-usr/bin/ndb_size
-usr/bin/ndb_test_platform
-usr/bin/ndb_waiter
 usr/bin/perror
 usr/bin/replace
 usr/bin/resolveip
 usr/bin/resolve_stack_dump
 usr/sbin/mysqld
-usr/sbin/ndbd
-usr/sbin/ndb_mgmd
 usr/share/doc/mysql-server-5.0/
 usr/share/lintian/overrides/mysql-server-5.0
 usr/share/man/man1/comp_err.1
@@ -67,20 +51,5 @@
 usr/share/man/man1/resolve_stack_dump.1
 usr/share/man/man1/innochecksum.1
 usr/share/man/man1/mysql_tzinfo_to_sql.1
-usr/share/man/man1/ndb_config.1
-usr/share/man/man1/ndb_delete_all.1
-usr/share/man/man1/ndb_desc.1
-usr/share/man/man1/ndb_drop_index.1
-usr/share/man/man1/ndb_drop_table.1
-usr/share/man/man1/ndb_error_reporter.1
-usr/share/man/man1/ndb_mgm.1
-usr/share/man/man1/ndb_restore.1
-usr/share/man/man1/ndb_select_all.1
-usr/share/man/man1/ndb_select_count.1
-usr/share/man/man1/ndb_show_tables.1
-usr/share/man/man1/ndb_size.pl.1
-usr/share/man/man1/ndb_waiter.1
 usr/share/man/man8/mysqld.8
-usr/share/man/man8/ndb_mgmd.8
-usr/share/man/man8/ndbd.8
 usr/share/mysql/

=== modified file 'bakery/debian-5.0/dist/Debian/mysql-server-5.0.postinst'
--- bakery/debian-5.0/dist/Debian/mysql-server-5.0.postinst	2009-03-19 02:14:02 +0000
+++ bakery/debian-5.0/dist/Debian/mysql-server-5.0.postinst	2009-10-01 11:15:32 +0000
@@ -18,7 +18,7 @@
   fi
 }
 
-MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables  --skip-bdb  --skip-innodb --skip-ndbcluster"
+MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables  --skip-bdb  --skip-innodb"
 
 test_mysql_access() {
 	mysql --no-defaults -u root -h localhost </dev/null >/dev/null 2>&1
@@ -28,6 +28,7 @@
 set_mysql_rootpw() {
 	# forget we ever saw the password.  don't use reset to keep the seen status
 	db_set mysql-server/root_password ""
+	db_set mysql-server/root_password_again ""
 
 	tfile=`mktemp`
 	if [ ! -f "$tfile" ]; then
@@ -174,7 +175,7 @@
     # recreate the credentials file if not present or without mysql_upgrade stanza
     dc=$mysql_cfgdir/debian.cnf; 
     if [ -e "$dc" -a -n "`fgrep mysql_upgrade $dc 2>/dev/null`" ]; then
-        pass="`sed -n 's/password *= *// p' $dc | head -n 1`"
+	pass="`sed -n 's/^[ 	]*password *= *// p' $dc | head -n 1`"
     else
 	pass=`perl -e 'print map{("a".."z","A".."Z",0..9)[int(rand(62))]}(1..16)'`;
         if [ ! -d "$mysql_cfgdir" ]; then install -o 0 -g 0 -m 0755 -d $mysql_cfgdir; fi
@@ -255,7 +256,7 @@
 # fails for any other reason, nothing happens.
 if [ "$1" = "configure" ]; then
 	if test_mysql_access; then
-		db_input medium mysql-server/root_password || true
+		db_input high mysql-server/root_password || true
 		db_go
 		db_get mysql-server/root_password && rootpw="$RET"
 

=== modified file 'bakery/debian-5.0/dist/Debian/mysql-server-5.0.postrm'
--- bakery/debian-5.0/dist/Debian/mysql-server-5.0.postrm	2009-03-19 02:14:02 +0000
+++ bakery/debian-5.0/dist/Debian/mysql-server-5.0.postrm	2009-10-01 11:15:32 +0000
@@ -81,17 +81,6 @@
 fi
 # (normally) End automatically added section
 
-# (normally) Automatically added by dh_installinit
-if [ "$1" = "purge" ] ; then
-        update-rc.d mysql-ndb-mgm remove >/dev/null || exit 0
-fi
-# (normally) End automatically added section
-# (normally) Automatically added by dh_installinit
-if [ "$1" = "purge" ] ; then
-        update-rc.d mysql-ndb remove >/dev/null || exit 0
-fi
-# (normally) End automatically added section
-
 # no DEBHELPER here, "update-rc.d remove" fails if mysql-server-5.0 is installed
 
 exit 0

=== modified file 'bakery/debian-5.0/dist/Debian/rules'
--- bakery/debian-5.0/dist/Debian/rules	2009-03-19 02:14:02 +0000
+++ bakery/debian-5.0/dist/Debian/rules	2009-10-01 11:15:32 +0000
@@ -28,17 +28,17 @@
 endif
 
 MAKE_TEST_TARGET=test-force
-ifneq ($(findstring $(DEB_BUILD_OPTIONS),fulltest),)
+ifneq ($(findstring fulltest,$(DEB_BUILD_OPTIONS)),)
 # make test-bt is the testsuite run by the MySQL build team 
 # before a release, but it is long
     MAKE_TEST_TARGET=test-bt
 endif
 
-ifeq ($(findstring $(ARCH),i386 sparc,lpia),$(ARCH))
+ifeq ($(findstring $(ARCH),i386 sparc lpia),$(ARCH))
     USE_ASSEMBLER=--enable-assembler 
 endif
 
-ifneq ($(findstring $(ARCH), alpha arm armel hppa mipsel powerpc sparc),)
+ifneq ($(findstring $(ARCH),alpha arm armel hppa mipsel powerpc sparc),)
    TESTSUITE_FAIL_CMD=true
 else
    TESTSUITE_FAIL_CMD=exit 1
@@ -50,7 +50,7 @@
 ifeq ($(STATIC_MYSQLD), 1)
     USE_STATIC_MYSQLD=--with-mysqld-ldflags=-all-static
 endif
-		
+	
 configure: patch configure-stamp
 configure-stamp:
 	@echo "RULES.configure-stamp"
@@ -73,7 +73,6 @@
 		--host=${DEB_HOST_GNU_TYPE} \
 		\
 		--prefix=/usr \
-			--sysconfdir=/etc/mysql \
 	        --exec-prefix=/usr \
 	        --libexecdir=/usr/sbin \
 	        --datadir=/usr/share \
@@ -100,6 +99,7 @@
 		--without-openssl \
 		--with-yassl \
 	    	--without-docs \
+		--with-bench \
 		--without-readline \
 		--with-extra-charsets=all \
 		--with-innodb \
@@ -110,12 +110,14 @@
 		--with-blackhole-storage-engine \
 		--with-sphinx-storage-engine \
 		--without-embedded-server \
-		--with-ndbcluster \
-		--with-ndb-ccflags="-fPIC" \
-		--with-ndb-shm \
-		--without-ndb-sci \
-		--without-ndb-test \
-		--without-ndb-docs'
+		--without-ndbcluster'
+
+	#       --sysconfdir=/etc/mysql         -- Appends /etc/mysql after ~/ in the my.cnf search path!
+        #       disabled for ourdelta: embedded server doesn't work with google patches
+	#       --with-embedded-server \
+	#       --with-embedded-privilege-control \
+	#       --with-debug \
+	#       --with-mysqlfs   # does not build, no toplevel fs/ directory! Needs CORBA.
 	
 	touch configure-stamp
 
@@ -126,15 +128,12 @@
 
 	$(MAKE) $(MAKE_J)
 
-	# ifeq ($(findstring $(DEB_BUILD_OPTIONS),nocheck),)
-	# 	if [ ! -f testsuite-stamp ] ; then \
-	# 		$(MAKE) $(MAKE_TEST_TARGET) || $(TESTSUITE_FAIL_CMD) ; \
-	# 	fi
-	# endif
-
-	echo "Skipping tests. Half are commented out for no apparent reason"
-	echo "and the other half test NDB, which *you* should not use anyway."
-	sleep 5
+# can't be indented
+ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),)
+	if [ ! -f testsuite-stamp ] ; then \
+		$(MAKE) $(MAKE_TEST_TARGET) || $(TESTSUITE_FAIL_CMD) ; \
+	fi
+endif
 
 	touch testsuite-stamp
 
@@ -152,12 +151,13 @@
 	rm -f testsuite-stamp
 	
 	[ ! -f Makefile ] || $(MAKE) clean
+	[ ! -d mysql-test/var ] || rm -rf mysql-test/var
 
 	# We like to see how long this is neccessary
 	@echo "CRUFT BEGIN" 
 	@find -type l -print0 | xargs --no-run-if-empty -0 rm -v
 	@find -name .deps -type d -print0 | xargs --no-run-if-empty -0 rm -rfv
-	@rm -vrf ndb/docs/.doxy* ndb/docs/*html ndb/docs/*pdf innobase/autom4te.cache
+	@rm -vrf innobase/autom4te.cache
 	@for i in \
 	  readline/Makefile \
 	  sql-bench/Makefile \
@@ -240,12 +240,10 @@
 	       $(TMP)/usr/share/mysql/mysql.server \
 	       $(TMP)/usr/share/mysql/binary-configure
 	nm -n sql/mysqld |gzip -9 > $(TMP)/usr/share/doc/mysql-server-5.0/mysqld.sym.gz
-	install -m 0644 debian/additions/ndb_mgmd.cnf $(TMP)/usr/share/doc/mysql-server-5.0/examples/
 	install -m 0755 debian/additions/echo_stderr $(TMP)/usr/share/mysql/
 	install -m 0755 debian/additions/debian-start $(TMP)/etc/mysql/
 	install -m 0755 debian/additions/debian-start.inc.sh $(TMP)/usr/share/mysql/
-	sed "s#filename => 'ndb_size.tmpl#filename => '/usr/share/mysql/ndb_size.tmpl#" < $(TMP)/usr/bin/ndb_size.pl > $(TMP)/usr/bin/ndb_size
-	mv $(TMP)/usr/mysql-test $(TMP)/usr/share/mysql/
+	mv $(TMP)/usr/mysql-test $(TMP)/usr/share/
 	mv $(TMP)/usr/sql-bench $(TMP)/usr/share/mysql/
 	# lintian overrides
 	mkdir -p $(TMP)/usr/share/lintian/overrides/
@@ -260,9 +258,6 @@
 	cp debian/mysql-server-5.0.mysql-server.logrotate $$d/_etc_logrotate.d_mysql-server; \
 	cp debian/additions/debian-start $$d/_etc_mysql_debian-start
 
-	# install AppArmor profile
-	install -D -m 644 debian/apparmor-profile $(TMP)/etc/apparmor.d/usr.sbin.mysqld
-
 	dh_movefiles
 	
 # Build architecture-independent files here.
@@ -301,12 +296,6 @@
 	dh_installexamples -a
 	dh_installmenu -a
 	dh_installlogrotate -a --name mysql-server
-	# NDB needs to start before MySQL if they share a machine
-	# Neither should automatically restart on package install. There
-	# is a rolling order in which nodes in a cluster should be 
-	# restarted that is not possible to manage here.
-	dh_installinit -a -r --no-start --name=mysql-ndb-mgm -- defaults 17 23
-	dh_installinit -a -r --no-start --name=mysql-ndb -- defaults 18 22
 	# Start mysql in runlevel 19 before 20 where apache, proftpd etc gets
 	# started which might depend on a running database server.
 	dh_installinit -a --name=mysql -- defaults 19 21

=== modified file 'bakery/debian-5.0/dist/Ubuntu/control'
--- bakery/debian-5.0/dist/Ubuntu/control	2009-03-19 02:14:02 +0000
+++ bakery/debian-5.0/dist/Ubuntu/control	2009-10-01 11:15:32 +0000
@@ -70,12 +70,27 @@
  This package includes the client binaries and the additional tools
  innotop and mysqlreport.
 
+Package: mysql-server-core-5.0
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmysqlclient15off (>= ${binary:Version})
+Replaces: mysql-server-5.0 (<< 5.1.30really5.0.75-0ubuntu3)
+Description: MySQL database core server files
+ MySQL is a fast, stable and true multi-user, multi-threaded SQL database
+ server. SQL (Structured Query Language) is the most popular database query
+ language in the world. The main goals of MySQL are speed, robustness and
+ ease of use.
+ .
+ This package includes the core server files, as used by Akonadi.
+ .
+ This customised server contains the OurDelta patches and support for
+ the Sphinx storage engine.
+
 Package: mysql-server-5.0
 Architecture: any                                                              
 Suggests: tinyca, mailx
 Recommends: libhtml-template-perl
 Pre-Depends: mysql-common (>= ${source:Version}), adduser (>= 3.40), debconf
-Depends: mysql-client-5.0 (>= ${binary:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10)
+Depends: mysql-client-5.0 (>= ${binary:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mysql-server-core-5.0 (>= ${binary:Version})
 Conflicts: mysql-server (<< ${source:Version}), apparmor-profiles (<< 2.1+1075-0ubuntu4)
 Provides: mysql-server, virtual-mysql-server, mysql-community-server-5.0
 Replaces: mysql-server (<< ${source:Version}), mysql-enterprise-server-5.0, mysql-doc-5.0 (<< 5.0.56-0ubuntu1), apparmor-profiles (<< 2.1+1075-0ubuntu4)

=== renamed file 'bakery/debian-5.0/dist/mysql-server-5.0.README.Debian' => 'bakery/debian-5.0/dist/Ubuntu/mysql-server-5.0.README.Debian'
=== modified file 'bakery/debian-5.0/dist/Ubuntu/mysql-server-5.0.files'
--- bakery/debian-5.0/dist/Ubuntu/mysql-server-5.0.files	2009-03-19 03:56:32 +0000
+++ bakery/debian-5.0/dist/Ubuntu/mysql-server-5.0.files	2009-10-01 11:15:32 +0000
@@ -1,3 +1,4 @@
+etc/apparmor.d/usr.sbin.mysqld
 etc/mysql/debian-start
 usr/bin/comp_err
 usr/bin/innochecksum
@@ -38,7 +39,6 @@
 usr/bin/replace
 usr/bin/resolveip
 usr/bin/resolve_stack_dump
-usr/sbin/mysqld
 usr/sbin/ndbd
 usr/sbin/ndb_mgmd
 usr/share/doc/mysql-server-5.0/
@@ -80,7 +80,18 @@
 usr/share/man/man1/ndb_show_tables.1
 usr/share/man/man1/ndb_size.pl.1
 usr/share/man/man1/ndb_waiter.1
-usr/share/man/man8/mysqld.8
 usr/share/man/man8/ndb_mgmd.8
 usr/share/man/man8/ndbd.8
-usr/share/mysql/
+usr/share/mysql/debian-start.inc.sh
+usr/share/mysql/echo_stderr
+usr/share/mysql/errmsg.txt
+usr/share/mysql/fill_help_tables.sql
+usr/share/mysql/mysqld_multi.server
+usr/share/mysql/mysql_fix_privilege_tables.sql
+usr/share/mysql/mysql_system_tables_data.sql
+usr/share/mysql/mysql_system_tables.sql
+usr/share/mysql-test
+usr/share/mysql/mysql_test_data_timezone.sql
+usr/share/mysql/ndb-config-2-node.ini
+usr/share/mysql/ndb_size.tmpl
+usr/share/mysql/sql-bench

=== modified file 'bakery/debian-5.0/dist/Ubuntu/mysql-server-5.0.postinst'
--- bakery/debian-5.0/dist/Ubuntu/mysql-server-5.0.postinst	2009-03-19 02:14:02 +0000
+++ bakery/debian-5.0/dist/Ubuntu/mysql-server-5.0.postinst	2009-10-01 11:15:32 +0000
@@ -28,6 +28,7 @@
 set_mysql_rootpw() {
 	# forget we ever saw the password.  don't use reset to keep the seen status
 	db_set mysql-server/root_password ""
+	db_set mysql-server/root_password_again ""
 
 	tfile=`mktemp`
 	if [ ! -f "$tfile" ]; then

=== added file 'bakery/debian-5.0/dist/Ubuntu/mysql-server-core-5.0.files'
--- bakery/debian-5.0/dist/Ubuntu/mysql-server-core-5.0.files	1970-01-01 00:00:00 +0000
+++ bakery/debian-5.0/dist/Ubuntu/mysql-server-core-5.0.files	2009-10-01 11:15:32 +0000
@@ -0,0 +1,26 @@
+usr/sbin/mysqld
+usr/share/man/man8/mysqld.8
+usr/share/mysql/charsets                                                                                        
+usr/share/mysql/czech                                                                                           
+usr/share/mysql/danish                                                                                          
+usr/share/mysql/dutch
+usr/share/mysql/english
+usr/share/mysql/estonian
+usr/share/mysql/french
+usr/share/mysql/german
+usr/share/mysql/greek
+usr/share/mysql/hungarian
+usr/share/mysql/italian
+usr/share/mysql/japanese
+usr/share/mysql/korean
+usr/share/mysql/norwegian
+usr/share/mysql/norwegian-ny
+usr/share/mysql/polish
+usr/share/mysql/portuguese
+usr/share/mysql/romanian
+usr/share/mysql/russian
+usr/share/mysql/serbian
+usr/share/mysql/slovak
+usr/share/mysql/spanish
+usr/share/mysql/swedish
+usr/share/mysql/ukrainian

=== modified file 'bakery/debian-5.0/dist/Ubuntu/rules'
--- bakery/debian-5.0/dist/Ubuntu/rules	2009-03-19 02:14:02 +0000
+++ bakery/debian-5.0/dist/Ubuntu/rules	2009-10-01 11:15:32 +0000
@@ -28,17 +28,17 @@
 endif
 
 MAKE_TEST_TARGET=test-force
-ifneq ($(findstring $(DEB_BUILD_OPTIONS),fulltest),)
+ifneq ($(findstring fulltest,$(DEB_BUILD_OPTIONS)),)
 # make test-bt is the testsuite run by the MySQL build team 
 # before a release, but it is long
     MAKE_TEST_TARGET=test-bt
 endif
 
-ifeq ($(findstring $(ARCH),i386 sparc,lpia),$(ARCH))
+ifeq ($(findstring $(ARCH),i386 sparc lpia),$(ARCH))
     USE_ASSEMBLER=--enable-assembler 
 endif
 
-ifneq ($(findstring $(ARCH), alpha arm armel hppa mipsel powerpc sparc),)
+ifneq ($(findstring $(ARCH),alpha arm armel hppa mipsel powerpc sparc),)
    TESTSUITE_FAIL_CMD=true
 else
    TESTSUITE_FAIL_CMD=exit 1
@@ -50,7 +50,7 @@
 ifeq ($(STATIC_MYSQLD), 1)
     USE_STATIC_MYSQLD=--with-mysqld-ldflags=-all-static
 endif
-		
+	
 configure: patch configure-stamp
 configure-stamp:
 	@echo "RULES.configure-stamp"
@@ -73,7 +73,6 @@
 		--host=${DEB_HOST_GNU_TYPE} \
 		\
 		--prefix=/usr \
-			--sysconfdir=/etc/mysql \
 	        --exec-prefix=/usr \
 	        --libexecdir=/usr/sbin \
 	        --datadir=/usr/share \
@@ -100,6 +99,7 @@
 		--without-openssl \
 		--with-yassl \
 	    	--without-docs \
+		--with-bench \
 		--without-readline \
 		--with-extra-charsets=all \
 		--with-innodb \
@@ -116,6 +116,13 @@
 		--without-ndb-sci \
 		--without-ndb-test \
 		--without-ndb-docs'
+
+	#       --sysconfdir=/etc/mysql         -- Appends /etc/mysql after ~/ in the my.cnf search path!
+        # 	disabled for ourdelta: embedded server doesn't work with google patches
+	#       --with-embedded-server \
+	#       --with-embedded-privilege-control \
+	#       --with-debug \
+	#       --with-mysqlfs   # does not build, no toplevel fs/ directory! Needs CORBA.
 	
 	touch configure-stamp
 
@@ -126,15 +133,12 @@
 
 	$(MAKE) $(MAKE_J)
 
-	# ifeq ($(findstring $(DEB_BUILD_OPTIONS),nocheck),)
-	# 	if [ ! -f testsuite-stamp ] ; then \
-	# 		$(MAKE) $(MAKE_TEST_TARGET) || $(TESTSUITE_FAIL_CMD) ; \
-	# 	fi
-	# endif
-
-	echo "Skipping tests. Half are commented out for no apparent reason"
-	echo "and the other half test NDB, which *you* should not use anyway."
-	sleep 5
+# can't be indented
+ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),)
+	if [ ! -f testsuite-stamp ] ; then \
+		$(MAKE) $(MAKE_TEST_TARGET) || $(TESTSUITE_FAIL_CMD) ; \
+	fi
+endif
 
 	touch testsuite-stamp
 
@@ -152,6 +156,7 @@
 	rm -f testsuite-stamp
 	
 	[ ! -f Makefile ] || $(MAKE) clean
+	[ ! -d mysql-test/var ] || rm -rf mysql-test/var
 
 	# We like to see how long this is neccessary
 	@echo "CRUFT BEGIN" 
@@ -245,7 +250,7 @@
 	install -m 0755 debian/additions/debian-start $(TMP)/etc/mysql/
 	install -m 0755 debian/additions/debian-start.inc.sh $(TMP)/usr/share/mysql/
 	sed "s#filename => 'ndb_size.tmpl#filename => '/usr/share/mysql/ndb_size.tmpl#" < $(TMP)/usr/bin/ndb_size.pl > $(TMP)/usr/bin/ndb_size
-	mv $(TMP)/usr/mysql-test $(TMP)/usr/share/mysql/
+	mv $(TMP)/usr/mysql-test $(TMP)/usr/share/
 	mv $(TMP)/usr/sql-bench $(TMP)/usr/share/mysql/
 	# lintian overrides
 	mkdir -p $(TMP)/usr/share/lintian/overrides/

=== modified file 'bakery/debian-5.0/mysql-server-5.0.links'
--- bakery/debian-5.0/mysql-server-5.0.links	2008-10-20 22:54:11 +0000
+++ bakery/debian-5.0/mysql-server-5.0.links	2009-10-01 11:15:32 +0000
@@ -1,2 +1,2 @@
-usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/mysql-test-run
-usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/mtr
+usr/share/mysql-test/mysql-test-run.pl usr/share/mysql-test/mysql-test-run
+usr/share/mysql-test/mysql-test-run.pl usr/share/mysql-test/mtr

=== modified file 'bakery/debian-5.0/mysql-server-5.0.mysql.init'
--- bakery/debian-5.0/mysql-server-5.0.mysql.init	2008-10-20 22:54:11 +0000
+++ bakery/debian-5.0/mysql-server-5.0.mysql.init	2009-10-01 11:15:32 +0000
@@ -21,8 +21,11 @@
 
 . /lib/lsb/init-functions
 
+# NOTE: Copying this script and changing the CONF variable here isn't
+# enough to run multiple instances of mysqld. Debian/Ubuntu doesn't 
+# currently support such a configuration out of the box.
+CONF=/etc/mysql/my.cnf
 SELF=$(cd $(dirname $0); pwd -P)/$(basename $0)
-CONF=/etc/mysql/my.cnf
 MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
 
 # priority can be overriden and "-s" adds output to stderr
@@ -51,9 +54,9 @@
 ## Do some sanity checks before even trying to start mysqld.
 sanity_checks() {
   # check for config file
-  if [ ! -r /etc/mysql/my.cnf ]; then
-    log_warning_msg "$0: WARNING: /etc/mysql/my.cnf cannot be read. See README.Debian.gz"
-    echo                "WARNING: /etc/mysql/my.cnf cannot be read. See README.Debian.gz" | $ERR_LOGGER
+  if [ ! -r "$CONF" ]; then
+    log_warning_msg "$0: WARNING: $CONF cannot be read. See README.Debian.gz"
+    echo                "WARNING: $CONF cannot be read. See README.Debian.gz" | $ERR_LOGGER
   fi
 
   # check for diskspace shortage

=== modified file 'bakery/debian-5.0/patches/00list'
--- bakery/debian-5.0/patches/00list	2009-03-19 06:09:38 +0000
+++ bakery/debian-5.0/patches/00list	2009-10-01 11:15:32 +0000
@@ -1,6 +1,8 @@
 01_MAKEFILES__Docs_Images_Makefile.in.dpatch
 01_MAKEFILES__Docs_Makefile.in.dpatch
+10_mysql_secure_installation.dpatch
 25_mysys__default.c.dpatch
+33_scripts__mysql_create_system_tables__no_test.dpatch
 35_init__openquery_configtest.dpatch
 36_scripts__mysqld_safe.sh__percona_syslog_undo.dpatch
 37_scripts__mysqld_safe.sh__syslog.dpatch
@@ -8,12 +10,11 @@
 41_scripts__mysql_install_db.sh__no_test.dpatch
 44_scripts__mysql_config__libs.dpatch
 45_warn-CLI-passwords.dpatch
-56-mysqlhotcopy-invalid-dbtable.dpatch
-57-fix-mysqlslowdump-config.dpatch
 60_disabled_tests.dpatch
-# No longer works with the provided system database.
-# 80_fix_user_setup_on_localhost.dpatch
 86_PATH_MAX.dpatch
 89_ndb__staticlib.dpatch
 90_upstream_bug_23921.dpatch
-91_ubuntu_buildd_testfailures.dpatch
+# removed for 5.0.86-d9-ourdelta
+#91_ubuntu_buildd_testfailures.dpatch
+# removed for 5.0.86-d9-ourdelta
+#92_ssl_test_cert.dpatch

=== added file 'bakery/debian-5.0/patches/10_mysql_secure_installation.dpatch'
--- bakery/debian-5.0/patches/10_mysql_secure_installation.dpatch	1970-01-01 00:00:00 +0000
+++ bakery/debian-5.0/patches/10_mysql_secure_installation.dpatch	2009-10-01 11:15:32 +0000
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_mysql_secure_installation.dpatch by Norbert Tretkowski <[e-mail]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Don't fail on passwords which needs quoting
+
+@DPATCH@
+--- mysql-dfsg-5.0-5.0.51a.orig/scripts/mysql_secure_installation.sh	2008-01-11 15:43:40.000000000 +0100
++++ mysql-dfsg-5.0-5.0.51a/scripts/mysql_secure_installation.sh	2009-01-24 22:58:45.000000000 +0100
+@@ -47,7 +47,7 @@
+     echo "# mysql_secure_installation config file" >$config
+     echo "[mysql]" >>$config
+     echo "user=root" >>$config
+-    echo "password=$rootpass" >>$config
++    echo "password='$rootpass'" >>$config
+ }
+ 
+ get_root_password() {

=== added file 'bakery/debian-5.0/patches/33_scripts__mysql_create_system_tables__no_test.dpatch'
--- bakery/debian-5.0/patches/33_scripts__mysql_create_system_tables__no_test.dpatch	1970-01-01 00:00:00 +0000
+++ bakery/debian-5.0/patches/33_scripts__mysql_create_system_tables__no_test.dpatch	2009-10-01 11:15:32 +0000
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 33_scripts__mysql_create_system_tables__no_test.dpatch by <[e-mail]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Don't create guest account
+
+@DPATCH@
+diff -Nur mysql-dfsg-5.0-5.0.75.orig/scripts/mysql_system_tables_data.sql mysql-dfsg-5.0-5.0.75/scripts/mysql_system_tables_data.sql
+--- mysql-dfsg-5.0-5.0.75.orig/scripts/mysql_system_tables_data.sql     2008-12-18 18:20:09.000000000 +0100
++++ mysql-dfsg-5.0-5.0.75/scripts/mysql_system_tables_data.sql  2008-12-22 09:48:57.000000000 +0100
+@@ -23,7 +23,5 @@
+ INSERT INTO tmp_user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
+ REPLACE INTO tmp_user SELECT @current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0 FROM dual WHERE LOWER( @current_hostname) != 'localhost';
+ REPLACE INTO tmp_user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
+-INSERT INTO tmp_user (host,user) VALUES ('localhost','');
+-INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE LOWER(@current_hostname ) != 'localhost';
+ INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0;
+ DROP TABLE tmp_user;

=== modified file 'bakery/debian-5.0/patches/45_warn-CLI-passwords.dpatch'
--- bakery/debian-5.0/patches/45_warn-CLI-passwords.dpatch	2008-10-20 22:54:11 +0000
+++ bakery/debian-5.0/patches/45_warn-CLI-passwords.dpatch	2009-10-01 11:15:33 +0000
@@ -5,10 +5,22 @@
 ## DP: warn-CLI-passwords
 
 @DPATCH@
-
---- old/client/mysqladmin.cc.orig	2005-11-15 01:12:30.000000000 +0100
-+++ new/client/mysqladmin.cc	2005-11-22 00:17:41.327082273 +0100
-@@ -154,7 +154,7 @@
+diff -urNad mysql-dfsg-5.0-5.1.30really5.0.83~/client/mysql.cc mysql-dfsg-5.0-5.1.30really5.0.83/client/mysql.cc
+--- mysql-dfsg-5.0-5.1.30really5.0.83~/client/mysql.cc	2009-05-29 14:15:31.000000000 -0400
++++ mysql-dfsg-5.0-5.1.30really5.0.83/client/mysql.cc	2009-07-10 17:24:45.000000000 -0400
+@@ -1395,7 +1395,7 @@
+    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
+ #endif
+   {"password", 'p',
+-   "Password to use when connecting to server. If password is not given it's asked from the tty.",
++   "Password to use when connecting to server. If password is not given it's asked from the tty. WARNING: This is insecure as the password is visible for anyone through /proc for a short time.",
+    0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
+ #ifdef __WIN__
+   {"pipe", 'W', "Use named pipes to connect to server.", 0, 0, 0, GET_NO_ARG,
+diff -urNad mysql-dfsg-5.0-5.1.30really5.0.83~/client/mysqladmin.cc mysql-dfsg-5.0-5.1.30really5.0.83/client/mysqladmin.cc
+--- mysql-dfsg-5.0-5.1.30really5.0.83~/client/mysqladmin.cc	2009-05-29 14:15:31.000000000 -0400
++++ mysql-dfsg-5.0-5.1.30really5.0.83/client/mysqladmin.cc	2009-07-10 17:24:45.000000000 -0400
+@@ -153,7 +153,7 @@
    {"host", 'h', "Connect to host.", (gptr*) &host, (gptr*) &host, 0, GET_STR,
     REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
    {"password", 'p',
@@ -17,20 +29,10 @@
     0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
  #ifdef __WIN__
    {"pipe", 'W', "Use named pipes to connect to server.", 0, 0, 0, GET_NO_ARG,
---- old/client/mysql.cc.orig	2005-11-15 01:12:45.000000000 +0100
-+++ new/client/mysql.cc	2005-11-22 00:17:41.329082230 +0100
-@@ -621,7 +621,7 @@
-    0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
- #endif
-   {"password", 'p',
--   "Password to use when connecting to server. If password is not given it's asked from the tty.",
-+   "Password to use when connecting to server. If password is not given it's asked from the tty. WARNING: This is insecure as the password is visible for anyone through /proc for a short time.",
-    0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
- #ifdef __WIN__
-   {"pipe", 'W', "Use named pipes to connect to server.", 0, 0, 0, GET_NO_ARG,
---- old/client/mysqldump.c.orig	2005-11-15 01:12:38.000000000 +0100
-+++ new/client/mysqldump.c	2005-11-22 00:17:41.332082165 +0100
-@@ -323,7 +323,7 @@
+diff -urNad mysql-dfsg-5.0-5.1.30really5.0.83~/client/mysqldump.c mysql-dfsg-5.0-5.1.30really5.0.83/client/mysqldump.c
+--- mysql-dfsg-5.0-5.1.30really5.0.83~/client/mysqldump.c	2009-05-29 14:15:32.000000000 -0400
++++ mysql-dfsg-5.0-5.1.30really5.0.83/client/mysqldump.c	2009-07-10 17:24:45.000000000 -0400
+@@ -357,7 +357,7 @@
     "Sorts each table's rows by primary key, or first unique key, if such a key exists.  Useful when dumping a MyISAM table to be loaded into an InnoDB table, but will make the dump itself take considerably longer.",
     (gptr*) &opt_order_by_primary, (gptr*) &opt_order_by_primary, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
    {"password", 'p',
@@ -39,19 +41,103 @@
     0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
  #ifdef __WIN__
    {"pipe", 'W', "Use named pipes to connect to server.", 0, 0, 0, GET_NO_ARG,
---- old/client/mysqlshow.c.orig	2005-11-15 01:12:47.000000000 +0100
-+++ new/client/mysqlshow.c	2005-11-22 00:17:41.333082144 +0100
-@@ -185,7 +185,7 @@
+diff -urNad mysql-dfsg-5.0-5.1.30really5.0.83~/client/mysqlshow.c mysql-dfsg-5.0-5.1.30really5.0.83/client/mysqlshow.c
+--- mysql-dfsg-5.0-5.1.30really5.0.83~/client/mysqlshow.c	2009-05-29 14:15:32.000000000 -0400
++++ mysql-dfsg-5.0-5.1.30really5.0.83/client/mysqlshow.c	2009-07-10 17:24:45.000000000 -0400
+@@ -186,7 +186,7 @@
    {"keys", 'k', "Show keys for table.", (gptr*) &opt_show_keys,
     (gptr*) &opt_show_keys, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
    {"password", 'p',
 -   "Password to use when connecting to server. If password is not given it's asked from the tty.",
 +   "Password to use when connecting to server. If password is not given it's asked from the tty. WARNING: Providing a password on command line is insecure as it is visible through /proc to anyone for a short time.", 
     0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
-   {"port", 'P', "Port number to use for connection.", (gptr*) &opt_mysql_port,
-    (gptr*) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, MYSQL_PORT, 0, 0, 0, 0,
---- old/scripts/mysqlaccess.sh.orig	2005-11-15 01:12:32.000000000 +0100
-+++ new/scripts/mysqlaccess.sh	2005-11-22 00:17:41.352081736 +0100
+   {"port", 'P', "Port number to use for connection or 0 for default to, in "
+    "order of preference, my.cnf, $MYSQL_TCP_PORT, "
+diff -urNad mysql-dfsg-5.0-5.1.30really5.0.83~/scripts/mysql_convert_table_format.sh mysql-dfsg-5.0-5.1.30really5.0.83/scripts/mysql_convert_table_format.sh
+--- mysql-dfsg-5.0-5.1.30really5.0.83~/scripts/mysql_convert_table_format.sh	2009-05-29 14:19:19.000000000 -0400
++++ mysql-dfsg-5.0-5.1.30really5.0.83/scripts/mysql_convert_table_format.sh	2009-07-10 17:24:50.000000000 -0400
+@@ -121,6 +121,8 @@
+ 
+ --password='password'
+   Password for the current user.
++  WARNING: Providing a password on command line is insecure as it is visible
++  through /proc to anyone for a short time.
+ 
+ --port=port
+   TCP/IP port to connect to if host is not "localhost".
+diff -urNad mysql-dfsg-5.0-5.1.30really5.0.83~/scripts/mysql_explain_log.sh mysql-dfsg-5.0-5.1.30really5.0.83/scripts/mysql_explain_log.sh
+--- mysql-dfsg-5.0-5.1.30really5.0.83~/scripts/mysql_explain_log.sh	2009-05-29 14:19:19.000000000 -0400
++++ mysql-dfsg-5.0-5.1.30really5.0.83/scripts/mysql_explain_log.sh	2009-07-10 17:24:51.000000000 -0400
+@@ -342,6 +342,9 @@
+     The MySQL username to use when connecting to the server
+ --password=PASSWORD, -p=PASSWORD
+     The password to use when connecting to the server
++    WARNING: Providing a password on command line is
++    insecure as it is visible through /proc to anyone
++    for a short time.
+ --socket=SOCKET, -s=SOCKET
+     The socket file to use when connecting to the server
+ --printerror=1, -e 1
+@@ -380,7 +383,7 @@
+ 
+ =head1 USAGE
+ 
+-mysql_explain_log [--date=YYMMDD] --host=dbhost] [--user=dbuser] [--password=dbpw] [--socket=/path/to/socket] [--printerror=1] < logfile
++mysql_explain_log [--date=YYMMDD] --host=dbhost] [--user=dbuser] [--password=dbpw (INSECURE)] [--socket=/path/to/socket] [--printerror=1] < logfile
+ 
+ --help, -h
+     Display this help message
+@@ -392,6 +395,8 @@
+     The MySQL username to use when connecting to the server
+ --password=PASSWORD, -p=PASSWORD
+     The password to use when connecting to the server
++    WARNING: Providing a password on command line is insecure
++    as it is visible through /proc to anyone for a short time.
+ --socket=SOCKET, -s=SOCKET
+     The socket file to use when connecting to the server
+ --printerror=1, -e 1
+diff -urNad mysql-dfsg-5.0-5.1.30really5.0.83~/scripts/mysql_fix_privilege_tables.sh mysql-dfsg-5.0-5.1.30really5.0.83/scripts/mysql_fix_privilege_tables.sh
+--- mysql-dfsg-5.0-5.1.30really5.0.83~/scripts/mysql_fix_privilege_tables.sh	2009-05-29 14:19:19.000000000 -0400
++++ mysql-dfsg-5.0-5.1.30really5.0.83/scripts/mysql_fix_privilege_tables.sh	2009-07-10 17:24:51.000000000 -0400
+@@ -49,6 +49,10 @@
+ 
+ case "$1" in
+     --no-defaults|--defaults-file=*|--defaults-extra-file=*)
++#
++# WARNING: Providing a password on command line is insecure as it is visible
++# through /proc to anyone for a short time.
++#
+       defaults="$1"; shift
+       ;;
+ esac
+diff -urNad mysql-dfsg-5.0-5.1.30really5.0.83~/scripts/mysql_setpermission.sh mysql-dfsg-5.0-5.1.30really5.0.83/scripts/mysql_setpermission.sh
+--- mysql-dfsg-5.0-5.1.30really5.0.83~/scripts/mysql_setpermission.sh	2009-05-29 14:19:19.000000000 -0400
++++ mysql-dfsg-5.0-5.1.30really5.0.83/scripts/mysql_setpermission.sh	2009-07-10 17:24:51.000000000 -0400
+@@ -641,6 +641,9 @@
+ 
+ --user		: is the username to connect with.
+ --password	: the password of the username.
++                  WARNING: Providing a password on command line is
++                  insecure as it is visible through /proc to anyone
++                  for a short time.
+ --host		: the host to connect to.
+ --socket	: the socket to connect to.
+ --port		: the port number of the host to connect to.
+diff -urNad mysql-dfsg-5.0-5.1.30really5.0.83~/scripts/mysql_tableinfo.sh mysql-dfsg-5.0-5.1.30really5.0.83/scripts/mysql_tableinfo.sh
+--- mysql-dfsg-5.0-5.1.30really5.0.83~/scripts/mysql_tableinfo.sh	2009-05-29 14:19:19.000000000 -0400
++++ mysql-dfsg-5.0-5.1.30really5.0.83/scripts/mysql_tableinfo.sh	2009-07-10 17:24:51.000000000 -0400
+@@ -462,6 +462,8 @@
+ =item -p, --password=#     
+ 
+ password to use when connecting to server
++WARNING: Providing a password on command line is insecure as it is visible
++through /proc to anyone for a short time.
+ 
+ =item -h, --host=#     
+ 
+diff -urNad mysql-dfsg-5.0-5.1.30really5.0.83~/scripts/mysqlaccess.sh mysql-dfsg-5.0-5.1.30really5.0.83/scripts/mysqlaccess.sh
+--- mysql-dfsg-5.0-5.1.30really5.0.83~/scripts/mysqlaccess.sh	2009-05-29 14:19:19.000000000 -0400
++++ mysql-dfsg-5.0-5.1.30really5.0.83/scripts/mysqlaccess.sh	2009-07-10 17:24:45.000000000 -0400
 @@ -74,11 +74,17 @@
  
    -u, --user=#         username for logging in to the db
@@ -70,20 +156,10 @@
    -H, --rhost=#        remote MySQL-server to connect to
        --old_server     connect to old MySQL-server (before v3.21) which 
                         does not yet know how to handle full where clauses.
---- old/scripts/mysql_convert_table_format.sh.orig	2005-11-15 01:12:45.000000000 +0100
-+++ new/scripts/mysql_convert_table_format.sh	2005-11-22 00:17:41.353081714 +0100
-@@ -107,6 +107,8 @@
- 
- --password='password'
-   Password for the current user.
-+  WARNING: Providing a password on command line is insecure as it is visible
-+  through /proc to anyone for a short time.
- 
- --port=port
-   TCP/IP port to connect to if host is not "localhost".
---- old/scripts/mysqld_multi.sh.orig	2005-11-15 01:12:46.000000000 +0100
-+++ new/scripts/mysqld_multi.sh	2005-11-22 00:17:41.355081671 +0100
-@@ -730,6 +730,9 @@
+diff -urNad mysql-dfsg-5.0-5.1.30really5.0.83~/scripts/mysqld_multi.sh mysql-dfsg-5.0-5.1.30really5.0.83/scripts/mysqld_multi.sh
+--- mysql-dfsg-5.0-5.1.30really5.0.83~/scripts/mysqld_multi.sh	2009-05-29 14:19:19.000000000 -0400
++++ mysql-dfsg-5.0-5.1.30really5.0.83/scripts/mysqld_multi.sh	2009-07-10 17:24:50.000000000 -0400
+@@ -675,6 +675,9 @@
  mysqladmin = /path/to/mysqladmin/mysqladmin
  socket     = /tmp/mysql.sock3
  port       = 3308
@@ -93,21 +169,9 @@
  pid-file   = @localstatedir@3/hostname.pid3
  datadir    = @localstatedir@3
  language   = @datadir@/mysql/swedish
---- old/scripts/mysql_fix_privilege_tables.sh.orig	2005-11-15 01:12:47.000000000 +0100
-+++ new/scripts/mysql_fix_privilege_tables.sh	2005-11-22 00:17:41.357081628 +0100
-@@ -33,6 +33,10 @@
- 
- case "$1" in
-     --no-defaults|--defaults-file=*|--defaults-extra-file=*)
-+#
-+# WARNING: Providing a password on command line is insecure as it is visible
-+# through /proc to anyone for a short time.
-+#
-       defaults="$1"; shift
-       ;;
- esac
---- old/scripts/mysqlhotcopy.sh.orig	2005-11-15 01:12:47.000000000 +0100
-+++ new/scripts/mysqlhotcopy.sh	2005-11-22 00:17:41.358081607 +0100
+diff -urNad mysql-dfsg-5.0-5.1.30really5.0.83~/scripts/mysqlhotcopy.sh mysql-dfsg-5.0-5.1.30really5.0.83/scripts/mysqlhotcopy.sh
+--- mysql-dfsg-5.0-5.1.30really5.0.83~/scripts/mysqlhotcopy.sh	2009-05-29 14:19:19.000000000 -0400
++++ mysql-dfsg-5.0-5.1.30really5.0.83/scripts/mysqlhotcopy.sh	2009-07-10 17:26:06.000000000 -0400
 @@ -32,6 +32,7 @@
  
    mysqlhotcopy --method='scp -Bq -i /usr/home/foo/.ssh/identity' --user=root --password=secretpassword \
@@ -123,12 +187,12 @@
 +                       WARNING: Providing a password on command line is
 +                       insecure as it is visible through /proc to anyone
 +                       for a short time.
-   -h, --host=#         Hostname for local server when connecting over TCP/IP
+   -h, --host=#         hostname for local server when connecting over TCP/IP
    -P, --port=#         port to use when connecting to local server with TCP/IP
    -S, --socket=#       socket to use when connecting to local server
-@@ -1025,6 +1029,9 @@
+@@ -961,6 +965,9 @@
  one of the config files, normally /etc/my.cnf or your personal ~/.my.cnf.
- (See the chapter 'my.cnf Option Files' in the manual)
+ (See the chapter 'my.cnf Option Files' in the manual.)
  
 +WARNING: Providing a password on command line is insecure as it is visible
 +through /proc to anyone for a short time.
@@ -136,56 +200,3 @@
  =item -h, -h, --host=#
  
  Hostname for local server when connecting over TCP/IP.  By specifying this
---- old/scripts/mysql_setpermission.sh.orig	2005-11-15 01:12:30.000000000 +0100
-+++ new/scripts/mysql_setpermission.sh	2005-11-22 00:17:41.359081585 +0100
-@@ -647,6 +647,9 @@
- 
- --user		: is the username to connect with.
- --password	: the password of the username.
-+                  WARNING: Providing a password on command line is
-+                  insecure as it is visible through /proc to anyone
-+                  for a short time.
- --host		: the host to connect to.
- --socket	: the socket to connect to.
- --port		: the port number of the host to connect to.
---- old/scripts/mysql_tableinfo.sh.orig	2005-11-15 01:12:32.000000000 +0100
-+++ new/scripts/mysql_tableinfo.sh	2005-11-22 00:17:41.360081564 +0100
-@@ -462,6 +462,8 @@
- =item -p, --password=#     
- 
- password to use when connecting to server
-+WARNING: Providing a password on command line is insecure as it is visible
-+through /proc to anyone for a short time.
- 
- =item -h, --host=#     
- 
---- old/scripts/mysql_explain_log.sh	2007-02-20 18:49:37.000000000 +0100
-+++ new/scripts/mysql_explain_log.sh	2007-03-22 22:32:26.000000000 +0100
-@@ -341,6 +341,9 @@
-     The MySQL username to use when connecting to the server
- --password=PASSWORD, -p=PASSWORD
-     The password to use when connecting to the server
-+    WARNING: Providing a password on command line is
-+    insecure as it is visible through /proc to anyone
-+    for a short time.
- --socket=SOCKET, -s=SOCKET
-     The socket file to use when connecting to the server
- --printerror=1, -e 1
-@@ -379,7 +382,7 @@
- 
- =head1 USAGE
- 
--mysql_explain_log [--date=YYMMDD] --host=dbhost] [--user=dbuser] [--password=dbpw] [--socket=/path/to/socket] [--printerror=1] < logfile
-+mysql_explain_log [--date=YYMMDD] --host=dbhost] [--user=dbuser] [--password=dbpw (INSECURE)] [--socket=/path/to/socket] [--printerror=1] < logfile
- 
- --help, -h
-     Display this help message
-@@ -391,6 +394,8 @@
-     The MySQL username to use when connecting to the server
- --password=PASSWORD, -p=PASSWORD
-     The password to use when connecting to the server
-+    WARNING: Providing a password on command line is insecure
-+    as it is visible through /proc to anyone for a short time.
- --socket=SOCKET, -s=SOCKET
-     The socket file to use when connecting to the server
- --printerror=1, -e 1

=== removed file 'bakery/debian-5.0/patches/56-mysqlhotcopy-invalid-dbtable.dpatch'
--- bakery/debian-5.0/patches/56-mysqlhotcopy-invalid-dbtable.dpatch	2008-10-20 22:54:11 +0000
+++ bakery/debian-5.0/patches/56-mysqlhotcopy-invalid-dbtable.dpatch	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
-@DPATCH@
-diff -Naur mysql-dfsg-5.0-5.0.51a.orig/scripts/mysqlhotcopy.sh mysql-dfsg-5.0-5.0.51a/scripts/mysqlhotcopy.sh
---- mysql-dfsg-5.0-5.0.51a.orig/scripts/mysqlhotcopy.sh	2008-01-11 09:43:28.000000000 -0500
-+++ mysql-dfsg-5.0-5.0.51a/scripts/mysqlhotcopy.sh	2008-04-29 15:18:12.000000000 -0400
-@@ -333,7 +333,7 @@
- 
-     $rdb->{files}  = [ @db_files ];
-     $rdb->{index}  = [ @index_files ];
--    my @hc_tables = map { quote_names("$db.$_") } @dbh_tables;
-+    my @hc_tables = map { quote_names("$_") } @dbh_tables;
-     $rdb->{tables} = [ @hc_tables ];
- 
-     $rdb->{raid_dirs} = [ get_raid_dirs( $rdb->{files} ) ];
-@@ -464,13 +464,15 @@
- }
- else {
-     my $start = time;
-+    $hc_locks =~ s/\`//g;
-+    $hc_locks =~ s/\`//g;
-     $dbh->do("LOCK TABLES $hc_locks");
-     printf "Locked $num_tables tables in %d seconds.\n", time-$start unless $opt{quiet};
-     $hc_started = time;	# count from time lock is granted
- 
-     # flush tables to make on-disk copy uptodate
-     $start = time;
--    $dbh->do("FLUSH TABLES /*!32323 $hc_tables */");
-+    $dbh->do("FLUSH TABLES");
-     printf "Flushed tables ($hc_tables) in %d seconds.\n", time-$start unless $opt{quiet};
-     $dbh->do( "FLUSH LOGS" ) if ( $opt{flushlog} );
-     $dbh->do( "RESET MASTER" ) if ( $opt{resetmaster} );
-@@ -478,7 +480,7 @@
- 
-     if ( $opt{record_log_pos} ) {
- 	record_log_pos( $dbh, $opt{record_log_pos} );
--	$dbh->do("FLUSH TABLES /*!32323 $hc_tables */");
-+	$dbh->do("FLUSH TABLES");
-     }
- }
- 
-@@ -828,7 +830,7 @@
-         } || [];
-     warn "Unable to retrieve list of tables in $db: $@" if $@;
- 
--    return (map { $_->[0] } @$tables);
-+    return (map { $db . "." . $_->[0] } @$tables); 
- }
- 
- sub quote_names {

=== removed file 'bakery/debian-5.0/patches/57-fix-mysqlslowdump-config.dpatch'
--- bakery/debian-5.0/patches/57-fix-mysqlslowdump-config.dpatch	2008-10-20 22:54:11 +0000
+++ bakery/debian-5.0/patches/57-fix-mysqlslowdump-config.dpatch	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
-@DPATCH@
-diff -Naur mysql-dfsg-5.0-5.0.45.orig/scripts/mysqldumpslow.sh mysql-dfsg-5.0-5.0.45/scripts/mysqldumpslow.sh
---- mysql-dfsg-5.0-5.0.45.orig/scripts/mysqldumpslow.sh	2007-07-04 09:06:41.000000000 -0400
-+++ mysql-dfsg-5.0-5.0.45/scripts/mysqldumpslow.sh	2008-02-04 08:04:14.000000000 -0500
-@@ -34,13 +34,13 @@
- $opt{'help'} and usage();
- 
- unless (@ARGV) {
--    my $defaults   = `my_print_defaults mysqld`;
-+    my $defaults   = `my_print_defaults mysqld -c -c /etc/mysql/my.cnf`;
-     my $basedir = ($defaults =~ m/--basedir=(.*)/)[0]
--	or die "Can't determine basedir from 'my_print_defaults mysqld' output: $defaults";
-+	or die "Can't determine basedir from 'my_print_defaults mysqld' -c -c /etc/mysql/my.cnf output: $defaults";
-     warn "basedir=$basedir\n" if $opt{v};
- 
-     my $datadir = ($defaults =~ m/--datadir=(.*)/)[0];
--    my $slowlog = ($defaults =~ m/--log-slow-queries=(.*)/)[0];
-+    my $slowlog = ($defaults =~ m/--log[-_]slow[-_]queries=(.*)/)[0];
-     if (!$datadir or $opt{i}) {
- 	# determine the datadir from the instances section of /etc/my.cnf, if any
- 	my $instances  = `my_print_defaults instances`;

=== modified file 'bakery/debian-5.0/patches/60_disabled_tests.dpatch'
--- bakery/debian-5.0/patches/60_disabled_tests.dpatch	2008-10-20 22:54:11 +0000
+++ bakery/debian-5.0/patches/60_disabled_tests.dpatch	2009-10-01 11:15:33 +0000
@@ -3,17 +3,13 @@
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Disable tests which fail randomly.
-diff -Nur mysql-dfsg-5.0-5.0.67.orig/mysql-test/t/disabled.def mysql-dfsg-5.0-5.0.67/mysql-test/t/disabled.def
---- mysql-dfsg-5.0-5.0.67.orig/mysql-test/t/disabled.def	2008-08-04 14:32:17.000000000 +0200
-+++ mysql-dfsg-5.0-5.0.67/mysql-test/t/disabled.def	2008-08-10 09:13:43.000000000 +0200
-@@ -16,6 +16,10 @@
- im_options_set       : Bug#20294: Instance manager tests fail randomly
- im_options_unset     : Bug#20294: Instance manager tests fail randomly
- im_utils             : Bug#20294: Instance manager tests fail randomly
+--- mysql-dfsg-5.0-5.0.84.orig/mysql-test/t/disabled.def        2009-07-07 16:03:40.000000000 +0200
++++ mysql-dfsg-5.0-5.0.84/mysql-test/t/disabled.def     2009-07-24 09:37:50.000000000 +0200
+@@ -25,3 +25,7 @@
+ ndb_autodiscover3    : Bug#35148: Error '4009 Cluster Failure' in various tests on various platforms
+ ndb_autodiscover     : Bug#45972: ndb.ndb_autodiscover fails occasionally with pb2
+ ndb_autodiscover2    : Bug#45972: ndb.ndb_autodiscover fails occasionally with pb2
 +ndb_alter_table      : failed for some reason
 +ndb_replace          : failed for some reason
 +innodb_handler       : http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=491363
 +rpl_ndb_innodb_trans : http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=494238
- grant_cache          : Bug#32651: grant_cache.test fails
- rpl_log              : Bug#32653: rpl_log.test fails randomly
- rpl_view             : Bug#32654: rpl_view.test fails randomly

=== removed file 'bakery/debian-5.0/patches/80_fix_user_setup_on_localhost.dpatch'
--- bakery/debian-5.0/patches/80_fix_user_setup_on_localhost.dpatch	2008-10-20 22:54:11 +0000
+++ bakery/debian-5.0/patches/80_fix_user_setup_on_localhost.dpatch	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 80_fix_user_setup_on_localhost.dpatch by Daniel Hahler <[e-mail]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -Nur mysql-dfsg-5.0-5.0.67.orig/scripts/mysql_system_tables_data.sql mysql-dfsg-5.0-5.0.67/scripts/mysql_system_tables_data.sql
---- mysql-dfsg-5.0-5.0.67.orig/scripts/mysql_system_tables_data.sql	2008-08-04 14:20:02.000000000 +0200
-+++ mysql-dfsg-5.0-5.0.67/scripts/mysql_system_tables_data.sql	2008-08-10 08:09:46.000000000 +0200
-@@ -24,6 +24,6 @@
- REPLACE INTO tmp_user VALUES (@current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
- REPLACE INTO tmp_user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
- INSERT INTO tmp_user (host,user) VALUES ('localhost','');
--INSERT INTO tmp_user (host,user) VALUES (@current_hostname,'');
-+REPLACE INTO tmp_user (host,user) VALUES (@current_hostname,'');
- INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0;
- DROP TABLE tmp_user;

=== added file 'bakery/debian-5.0/patches/92_ssl_test_cert.dpatch'
--- bakery/debian-5.0/patches/92_ssl_test_cert.dpatch	1970-01-01 00:00:00 +0000
+++ bakery/debian-5.0/patches/92_ssl_test_cert.dpatch	2009-10-01 11:15:33 +0000
@@ -0,0 +1,722 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 92_ssl_test_cert.dpatch by  <[e-mail]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Bug #42366: server-cert.pem expired.
+## DP: http://bugs.mysql.com/bug.php?id=42366
+## DP: http://bazaar.launchpad.net/~mysql/mysql-server/mysql-5.0-bugteam/revision/2730
+
+@DPATCH@
+diff -urNad mysql-dfsg-5.0-5.1.30really5.0.75~/mysql-test/r/openssl_1.result mysql-dfsg-5.0-5.1.30really5.0.75/mysql-test/r/openssl_1.result
+--- mysql-dfsg-5.0-5.1.30really5.0.75~/mysql-test/r/openssl_1.result	2008-12-18 18:37:11.000000000 +0100
++++ mysql-dfsg-5.0-5.1.30really5.0.75/mysql-test/r/openssl_1.result	2009-02-02 23:46:47.000000000 +0100
+@@ -3,8 +3,8 @@
+ insert into t1 values (5);
+ grant select on test.* to ssl_user1@localhost require SSL;
+ grant select on test.* to ssl_user2@localhost require cipher "DHE-RSA-AES256-SHA";
+-grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB/emailAddress=[e-mail]";
+-grant select on test.* to ssl_user4@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB/emailAddress=[e-mail]" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB";
++grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB/emailAddress=[e-mail]";
++grant select on test.* to ssl_user4@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB/emailAddress=[e-mail]" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB";
+ grant select on test.* to ssl_user5@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "xxx";
+ flush privileges;
+ connect(localhost,ssl_user5,,test,MASTER_PORT,MASTER_SOCKET);
+diff -urNad mysql-dfsg-5.0-5.1.30really5.0.75~/mysql-test/std_data/cacert.pem mysql-dfsg-5.0-5.1.30really5.0.75/mysql-test/std_data/cacert.pem
+--- mysql-dfsg-5.0-5.1.30really5.0.75~/mysql-test/std_data/cacert.pem	2008-12-18 18:37:11.000000000 +0100
++++ mysql-dfsg-5.0-5.1.30really5.0.75/mysql-test/std_data/cacert.pem	2009-02-02 23:46:47.000000000 +0100
+@@ -1,17 +1,17 @@
+ -----BEGIN CERTIFICATE-----
+-MIICrTCCAhagAwIBAgIJAIAO/Ybiptv1MA0GCSqGSIb3DQEBBAUAMEQxCzAJBgNV
++MIICrTCCAhagAwIBAgIJAJXpePU0UOTVMA0GCSqGSIb3DQEBBQUAMEQxCzAJBgNV
+ BAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxhMREwDwYD
+-VQQKEwhNeVNRTCBBQjAeFw0wNjA1MDMwODQ4NTRaFw0wOTAxMjcwODQ4NTRaMEQx
++VQQKEwhNeVNRTCBBQjAeFw0wOTAxMjgxMDQ5NDZaFw0xNDAxMjcxMDQ5NDZaMEQx
+ CzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxh
+ MREwDwYDVQQKEwhNeVNRTCBBQjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+-+C46EQl1u7tQ6gb9eqc8V079gr8YmDPCEqtjO8bCIbchpjOpDITx0WZz36Sn9E72
+-GPJwNip4FxLaPRIA3xNQHM5cE5U53qznlRx1Fc4O3hcWCvyCqNDl/vzPAh3pI6Bl
+-Ku9hfHXpp93W812smVPe9haShEXGgbEPYGzvOfVdu/MCAwEAAaOBpjCBozAdBgNV
+-HQ4EFgQUjIy/6OCTmqtPHBFha6/qzVk3yTcwdAYDVR0jBG0wa4AUjIy/6OCTmqtP
+-HBFha6/qzVk3yTehSKRGMEQxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxh
+-MRAwDgYDVQQHEwdVcHBzYWxhMREwDwYDVQQKEwhNeVNRTCBBQoIJAIAO/Ybiptv1
+-MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEA8lD9zyB820Oq1aj7ZafX
+-De/hbdt9RIl2tzgw2K3r1KZGdXJVL0vSt5fZ51Nq9lg7OPJy3iXf+caBJEp0IJpB
+-uf4Gfr6zfXw+UlY6ZthRtHQHoXKcbskECjH5/ps/Uaa+dpVQ9O+Ii1rPzmgo6ztM
+-s+xZ46ESBt4WiHXm8kwbU9Y=
++4XQHAe5R1+TXC8noZtWf+d5E0v1C59FWpn9SWEUCBjE5UiIwuJvi4Y+7xWGOXLAI
++/JzJx5gNXLBiTsE/zh0uX9fKlajLhxB0GN+QU0ZlpQ1BeYipEcNXeI/7cT499f6v
++XWabnTflivdCgHSWUOQ20/Lzs6kP6/e6OoZd/DPSjPECAwEAAaOBpjCBozAdBgNV
++HQ4EFgQU8uLqVWWkmuKsnZf1RWz294wRrd8wdAYDVR0jBG0wa4AU8uLqVWWkmuKs
++nZf1RWz294wRrd+hSKRGMEQxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxh
++MRAwDgYDVQQHEwdVcHBzYWxhMREwDwYDVQQKEwhNeVNRTCBBQoIJAJXpePU0UOTV
++MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMMTE5sDN+Z0ZlV7KvH3g
++6+aKvql8dTpRT3hYukeQlWua0nq74WPGVw0c4e/M/vbiMwmJcCYpB9pd4+dHqzSw
++aPyoenjY6UF8n7B4quWy3SIUk2LSHeJLW+kzJn2afN9gvipFhdVh/uU2TIyLGOur
++Z/vmJX2W7hF1uqPnbfa8Lrw=
+ -----END CERTIFICATE-----
+diff -urNad mysql-dfsg-5.0-5.1.30really5.0.75~/mysql-test/std_data/client-cert.pem mysql-dfsg-5.0-5.1.30really5.0.75/mysql-test/std_data/client-cert.pem
+--- mysql-dfsg-5.0-5.1.30really5.0.75~/mysql-test/std_data/client-cert.pem	2008-12-18 18:37:11.000000000 +0100
++++ mysql-dfsg-5.0-5.1.30really5.0.75/mysql-test/std_data/client-cert.pem	2009-02-02 23:46:47.000000000 +0100
+@@ -1,42 +1,55 @@
+ Certificate:
+     Data:
+-        Version: 1 (0x0)
+-        Serial Number: 1 (0x1)
+-        Signature Algorithm: md5WithRSAEncryption
++        Version: 3 (0x2)
++        Serial Number: 3 (0x3)
++        Signature Algorithm: sha1WithRSAEncryption
+         Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
+         Validity
+-            Not Before: May  3 08:55:39 2006 GMT
+-            Not After : Jan 27 08:55:39 2009 GMT
+-        Subject: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB/emailAddress=[e-mail]
++            Not Before: Jan 28 11:04:39 2009 GMT
++            Not After : Jan 28 11:04:39 2010 GMT
++        Subject: C=SE, ST=Uppsala, O=MySQL AB/emailAddress=[e-mail]
+         Subject Public Key Info:
+             Public Key Algorithm: rsaEncryption
+             RSA Public Key: (512 bit)
+                 Modulus (512 bit):
+-                    00:d8:db:68:28:49:84:4d:d6:0f:5c:bc:3d:9a:ab:
+-                    70:d5:3e:f5:b5:17:ba:ef:e1:f8:87:54:30:22:1f:
+-                    81:07:bf:f9:24:7f:8a:54:10:e9:5f:e6:99:50:04:
+-                    d4:3b:55:a9:f1:52:ad:12:2b:5a:da:5c:be:8c:3e:
+-                    5b:9e:b0:5a:19
++                    00:e1:52:30:2c:d9:be:64:28:91:5d:7a:fd:d9:e9:
++                    14:35:7a:d2:94:4e:91:46:e0:db:9f:6b:79:f4:4c:
++                    ac:6e:07:61:34:86:74:62:a7:a8:44:af:fa:87:87:
++                    a8:7d:42:61:ff:ab:50:d4:7b:bf:75:fa:d5:d5:b3:
++                    74:fb:56:1e:37
+                 Exponent: 65537 (0x10001)
+-    Signature Algorithm: md5WithRSAEncryption
+-        07:57:bf:07:92:c2:8e:86:24:6b:0a:bf:e5:31:21:44:c3:60:
+-        02:a6:ac:9e:f7:db:7a:6e:fc:4f:d4:7b:54:18:80:47:d2:4a:
+-        63:0e:e3:f8:af:6e:58:e3:97:5a:2b:82:5d:76:20:d1:33:a0:
+-        f5:43:a1:d1:51:f4:ca:c8:b3:1a:66:4e:0e:55:df:d2:e8:fa:
+-        83:18:42:f5:ec:66:40:f0:39:e8:f9:d7:cf:f6:dd:e4:7b:69:
+-        dd:0c:92:d8:52:95:43:6f:29:3d:f0:8d:4c:dd:52:ea:6b:a0:
+-        39:0f:dc:59:a7:5c:37:6b:8b:05:44:b7:69:ea:a3:58:e0:4e:
+-        ce:d6
++        X509v3 extensions:
++            X509v3 Basic Constraints: 
++                CA:FALSE
++            X509v3 Subject Key Identifier: 
++                58:30:B5:9B:2C:05:94:06:BA:3D:3C:F0:B2:CD:1D:67:65:E3:7F:85
++            X509v3 Authority Key Identifier: 
++                keyid:F2:E2:EA:55:65:A4:9A:E2:AC:9D:97:F5:45:6C:F6:F7:8C:11:AD:DF
++                DirName:/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB
++                serial:95:E9:78:F5:34:50:E4:D5
++
++    Signature Algorithm: sha1WithRSAEncryption
++        05:19:e3:13:14:fc:c5:28:bf:69:f8:00:b3:25:cb:bd:ca:9f:
++        2f:4c:b3:a8:04:11:f0:74:27:bd:82:2c:b4:49:9b:a7:59:f0:
++        f7:87:d1:e0:ba:99:a2:fe:4b:1d:10:6f:e4:a2:b3:cd:7f:8b:
++        68:31:46:ee:cd:9e:e2:47:e1:4c:fa:74:d1:e2:8b:cc:a0:4b:
++        a8:24:d1:a4:c3:6b:2a:c6:28:cd:41:e0:06:48:e6:cf:f2:3c:
++        ca:37:95:d7:29:64:6b:91:91:83:e7:ac:c8:0b:87:bc:da:a6:
++        aa:f1:44:43:c8:74:7b:15:26:91:2e:03:c4:71:50:6c:f8:68:
++        dc:8c
+ -----BEGIN CERTIFICATE-----
+-MIIB5jCCAU8CAQEwDQYJKoZIhvcNAQEEBQAwRDELMAkGA1UEBhMCU0UxEDAOBgNV
+-BAgTB1VwcHNhbGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFC
+-MB4XDTA2MDUwMzA4NTUzOVoXDTA5MDEyNzA4NTUzOVowdzELMAkGA1UEBhMCU0Ux
+-EDAOBgNVBAgTB1VwcHNhbGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15
+-U1FMIEFCMTEwLwYJKoZIhvcNAQkBFiJhYnN0cmFjdC5teXNxbC5kZXZlbG9wZXJA
+-bXlzcWwuY29tMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANjbaChJhE3WD1y8PZqr
+-cNU+9bUXuu/h+IdUMCIfgQe/+SR/ilQQ6V/mmVAE1DtVqfFSrRIrWtpcvow+W56w
+-WhkCAwEAATANBgkqhkiG9w0BAQQFAAOBgQAHV78HksKOhiRrCr/lMSFEw2ACpqye
+-99t6bvxP1HtUGIBH0kpjDuP4r25Y45daK4JddiDRM6D1Q6HRUfTKyLMaZk4OVd/S
+-6PqDGEL17GZA8Dno+dfP9t3ke2ndDJLYUpVDbyk98I1M3VLqa6A5D9xZp1w3a4sF
+-RLdp6qNY4E7O1g==
++MIICfzCCAeigAwIBAgIBAzANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJTRTEQ
++MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT
++UUwgQUIwHhcNMDkwMTI4MTEwNDM5WhcNMTAwMTI4MTEwNDM5WjBlMQswCQYDVQQG
++EwJTRTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIxMTAvBgkq
++hkiG9w0BCQEWImFic3RyYWN0Lm15c3FsLmRldmVsb3BlckBteXNxbC5jb20wXDAN
++BgkqhkiG9w0BAQEFAANLADBIAkEA4VIwLNm+ZCiRXXr92ekUNXrSlE6RRuDbn2t5
++9EysbgdhNIZ0YqeoRK/6h4eofUJh/6tQ1Hu/dfrV1bN0+1YeNwIDAQABo4GjMIGg
++MAkGA1UdEwQCMAAwHQYDVR0OBBYEFFgwtZssBZQGuj088LLNHWdl43+FMHQGA1Ud
++IwRtMGuAFPLi6lVlpJrirJ2X9UVs9veMEa3foUikRjBEMQswCQYDVQQGEwJTRTEQ
++MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT
++UUwgQUKCCQCV6Xj1NFDk1TANBgkqhkiG9w0BAQUFAAOBgQAFGeMTFPzFKL9p+ACz
++Jcu9yp8vTLOoBBHwdCe9giy0SZunWfD3h9Hgupmi/ksdEG/korPNf4toMUbuzZ7i
++R+FM+nTR4ovMoEuoJNGkw2sqxijNQeAGSObP8jzKN5XXKWRrkZGD56zIC4e82qaq
++8URDyHR7FSaRLgPEcVBs+GjcjA==
+ -----END CERTIFICATE-----
+diff -urNad mysql-dfsg-5.0-5.1.30really5.0.75~/mysql-test/std_data/client-key.pem mysql-dfsg-5.0-5.1.30really5.0.75/mysql-test/std_data/client-key.pem
+--- mysql-dfsg-5.0-5.1.30really5.0.75~/mysql-test/std_data/client-key.pem	2008-12-18 18:37:11.000000000 +0100
++++ mysql-dfsg-5.0-5.1.30really5.0.75/mysql-test/std_data/client-key.pem	2009-02-02 23:46:47.000000000 +0100
+@@ -1,9 +1,9 @@
+ -----BEGIN RSA PRIVATE KEY-----
+-MIIBOgIBAAJBANjbaChJhE3WD1y8PZqrcNU+9bUXuu/h+IdUMCIfgQe/+SR/ilQQ
+-6V/mmVAE1DtVqfFSrRIrWtpcvow+W56wWhkCAwEAAQJAK27WT6tZylUjQomZNQ89
+-TBiOEbUtBbqWklQ0R8FTkH9uKV+8KYQ+k+tMkoAEGFfChB0YfofNQ2KZYWWw4yOB
+-WQIhAPXXDQt73aou10s+cmKM3C3WzLmIZtrvm9wNBXWDGxgTAiEA4dG4cXrZfa1M
+-TTbjzNU1/Jf50/M8SvZDWMPQWxJ8oqMCIH6zBpYUkHlVCsBMvsbrsc4uFfTIx7mu
+-I7WVQGr/1sbhAiBf4uFirjtztgZUMx5/d3k5DH80lG/hlLf8FQl/4lWx6QIhAPHw
+-CXfPUbUFl4r/i9Br5+exGol50qX4F3aP5Sh5EnZT
++MIIBOQIBAAJBAOFSMCzZvmQokV16/dnpFDV60pROkUbg259refRMrG4HYTSGdGKn
++qESv+oeHqH1CYf+rUNR7v3X61dWzdPtWHjcCAwEAAQJAXYooM8ZlcuEgj+VKU1ee
++qyEFIMqJJxqcMk+E/nWCM96WxCP3zHNSrqNfSpI3ld7QzMwhdRz+gFLxT2gGNpIw
++MQIhAPxzM/lDihe67X3ADYtDl9ZjA8Pm430x9sXlcxI17tCZAiEA5H1SyFl4mUee
++9VnfSC2XGW7lwz72ZygfVX+b7tLWF08CIEh40gzW5MfXM+KLxdea+fXjyursV5ZT
++R6KcMiKiNQLRAiAcmHqlzFzFgisotai2Fc6VRkXHG7gmzOSvBJt1VjmpDQIge6jf
++2N7whTdvC4ferB+zUlgWQdyvx1c3T4gnt6PYdaY=
+ -----END RSA PRIVATE KEY-----
+diff -urNad mysql-dfsg-5.0-5.1.30really5.0.75~/mysql-test/std_data/server-cert-des.pem mysql-dfsg-5.0-5.1.30really5.0.75/mysql-test/std_data/server-cert-des.pem
+--- mysql-dfsg-5.0-5.1.30really5.0.75~/mysql-test/std_data/server-cert-des.pem	2008-12-18 18:37:11.000000000 +0100
++++ mysql-dfsg-5.0-5.1.30really5.0.75/mysql-test/std_data/server-cert-des.pem	1970-01-01 01:00:00.000000000 +0100
+@@ -1,16 +0,0 @@
+------BEGIN CERTIFICATE-----
+-MIICljCCAX4CAQEwDQYJKoZIhvcNAQEEBQAwUTELMAkGA1UEBhMCU0UxEDAOBgNV
+-BAgTB1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFCMRAwDgYDVQQLEwdTdXBwb3J0
+-MQswCQYDVQQDEwJDQTAeFw0wNjA4MjgxMTA4NTlaFw0wOTA1MjQxMTA4NTlaMFUx
+-CzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMREwDwYDVQQKEwhNeVNRTCBB
+-QjEQMA4GA1UECxMHU3VwcG9ydDEPMA0GA1UEAxMGc2VydmVyMIGfMA0GCSqGSIb3
+-DQEBAQUAA4GNADCBiQKBgQDEiOVZcWYzZe7I8xhhUwCzvmkZifAXeMTH+8XKGLHX
+-NWF3FLduAmeAad9oOZgBKb+oWTdRDWXqwu6nYYUBfrUpaY27/wLkgWRgewL3LZnw
+-W2FjhNsjx3gI2NK+Pix47q9d+a+5T4AW5+lK499l0K0k2cvyFdIerhDW8R0t8Uru
+-twIDAQABMA0GCSqGSIb3DQEBBAUAA4IBAQC2LQcqLg52RbelWrKutlJ5E6rzugnJ
+-ZAlbN9sM98O2xFiIGDA3tb5j9LAEjE0E+RqdptEYnvy9b3szhLYXtIILZTkClf9r
+-Uwu1nUYPTyp+9ZYCa4fovOU5h1Ogv+9UZPds/LPDwWEn8K+lvscB4X57wJyuoEck
+-1Mu41OA6h77181MydSdgZo0oquJDWhdCsYHXVFVs0F6naMm2uPMCTDiQVlhHJuTO
+-VQMNIwxRFtvsv2tpsXsaP/8sT32d5CFebfxxSVnqQvJ4ZdIrphl6L43XU01rsEcE
+-K8KYujZQ6SKws+HVcGqsr7TPgJfJE6D+5RazvvIQISPvx4eduebqzqdC
+------END CERTIFICATE-----
+diff -urNad mysql-dfsg-5.0-5.1.30really5.0.75~/mysql-test/std_data/server-cert.pem mysql-dfsg-5.0-5.1.30really5.0.75/mysql-test/std_data/server-cert.pem
+--- mysql-dfsg-5.0-5.1.30really5.0.75~/mysql-test/std_data/server-cert.pem	2008-12-18 18:37:11.000000000 +0100
++++ mysql-dfsg-5.0-5.1.30really5.0.75/mysql-test/std_data/server-cert.pem	2009-02-02 23:46:47.000000000 +0100
+@@ -1,42 +1,55 @@
+ Certificate:
+     Data:
+-        Version: 1 (0x0)
++        Version: 3 (0x2)
+         Serial Number: 1 (0x1)
+-        Signature Algorithm: md5WithRSAEncryption
++        Signature Algorithm: sha1WithRSAEncryption
+         Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
+         Validity
+-            Not Before: May  3 08:54:13 2006 GMT
+-            Not After : Jan 27 08:54:13 2009 GMT
+-        Subject: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB, CN=localhost/emailAddress=[e-mail]
++            Not Before: Jan 28 10:55:13 2009 GMT
++            Not After : Jan 28 10:55:13 2010 GMT
++        Subject: C=SE, ST=Uppsala, O=MySQL AB, CN=localhost/emailAddress=[e-mail]
+         Subject Public Key Info:
+             Public Key Algorithm: rsaEncryption
+             RSA Public Key: (512 bit)
+                 Modulus (512 bit):
+-                    00:d9:fd:da:b3:fb:7c:e0:b0:03:be:97:c6:a4:36:
+-                    ac:71:af:bb:2d:e5:84:ed:f3:8f:2b:eb:11:e5:aa:
+-                    66:ed:bf:62:6b:e3:ce:fa:80:ed:90:ff:b9:4a:39:
+-                    20:40:b6:f2:99:bf:2f:33:b5:f2:ec:3a:90:60:1d:
+-                    9e:94:7e:a4:1b
++                    00:b6:8f:e5:b7:b4:86:83:13:8a:f9:bf:63:cb:64:
++                    2d:b9:51:d1:de:ab:7b:45:1f:aa:b5:66:73:13:f9:
++                    a6:07:d5:ba:7c:fa:92:bd:37:e2:ad:87:db:3e:b6:
++                    6a:12:64:f8:ee:17:e3:15:06:2f:a8:82:68:bf:57:
++                    8d:c3:04:98:27
+                 Exponent: 65537 (0x10001)
+-    Signature Algorithm: md5WithRSAEncryption
+-        de:5e:35:cd:7b:11:e6:7c:c5:7c:d6:27:4e:72:12:49:42:eb:
+-        6f:2c:96:f3:f4:00:78:a7:4f:9f:2d:7b:d7:30:39:af:49:4d:
+-        df:b1:55:0d:30:be:23:6f:06:67:fd:dd:ba:98:66:36:c6:32:
+-        b7:ed:63:fc:aa:49:cd:4f:72:98:3b:13:0e:f6:28:d7:d4:eb:
+-        04:6b:dc:e8:c7:04:80:92:e4:04:86:0b:ed:32:25:76:1d:a9:
+-        5c:a9:2c:18:2c:bd:bc:15:ed:e1:76:96:4d:bb:0d:41:44:06:
+-        2c:ad:45:bb:db:61:ad:17:11:cb:49:70:67:eb:c6:27:d3:91:
+-        c8:f2
++        X509v3 extensions:
++            X509v3 Basic Constraints: 
++                CA:FALSE
++            X509v3 Subject Key Identifier: 
++                D9:9A:B8:5F:22:EA:04:10:C8:25:7D:82:57:E6:2E:FD:19:29:E7:DA
++            X509v3 Authority Key Identifier: 
++                keyid:F2:E2:EA:55:65:A4:9A:E2:AC:9D:97:F5:45:6C:F6:F7:8C:11:AD:DF
++                DirName:/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB
++                serial:95:E9:78:F5:34:50:E4:D5
++
++    Signature Algorithm: sha1WithRSAEncryption
++        54:07:2d:21:0b:a5:af:3b:58:23:32:5e:56:7f:ab:58:63:48:
++        91:aa:38:90:89:16:f9:cc:bf:a4:0e:78:2b:9f:c5:1b:58:a6:
++        e6:08:8f:2e:ae:97:03:21:9b:f1:cd:c0:26:8f:1d:d7:28:27:
++        a0:8e:81:09:1b:1c:0f:c9:a5:41:3a:2d:44:3f:9c:fa:87:ff:
++        c8:4c:2b:44:f7:1b:c1:3e:4f:01:7f:e9:26:cc:9f:1c:06:b5:
++        0b:27:d1:10:90:be:93:0c:9c:e7:b0:d1:ea:27:99:4e:06:14:
++        0c:7a:e9:c1:52:c5:33:68:bc:61:0d:db:81:3b:57:48:57:bf:
++        42:9a
+ -----BEGIN CERTIFICATE-----
+-MIIB+zCCAWQCAQEwDQYJKoZIhvcNAQEEBQAwRDELMAkGA1UEBhMCU0UxEDAOBgNV
+-BAgTB1VwcHNhbGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFC
+-MB4XDTA2MDUwMzA4NTQxM1oXDTA5MDEyNzA4NTQxM1owgYsxCzAJBgNVBAYTAlNF
+-MRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxhMREwDwYDVQQKEwhN
+-eVNRTCBBQjESMBAGA1UEAxMJbG9jYWxob3N0MTEwLwYJKoZIhvcNAQkBFiJhYnN0
+-cmFjdC5teXNxbC5kZXZlbG9wZXJAbXlzcWwuY29tMFwwDQYJKoZIhvcNAQEBBQAD
+-SwAwSAJBANn92rP7fOCwA76XxqQ2rHGvuy3lhO3zjyvrEeWqZu2/YmvjzvqA7ZD/
+-uUo5IEC28pm/LzO18uw6kGAdnpR+pBsCAwEAATANBgkqhkiG9w0BAQQFAAOBgQDe
+-XjXNexHmfMV81idOchJJQutvLJbz9AB4p0+fLXvXMDmvSU3fsVUNML4jbwZn/d26
+-mGY2xjK37WP8qknNT3KYOxMO9ijX1OsEa9zoxwSAkuQEhgvtMiV2HalcqSwYLL28
+-Fe3hdpZNuw1BRAYsrUW722GtFxHLSXBn68Yn05HI8g==
++MIICkzCCAfygAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJTRTEQ
++MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT
++UUwgQUIwHhcNMDkwMTI4MTA1NTEzWhcNMTAwMTI4MTA1NTEzWjB5MQswCQYDVQQG
++EwJTRTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIxEjAQBgNV
++BAMTCWxvY2FsaG9zdDExMC8GCSqGSIb3DQEJARYiYWJzdHJhY3QubXlzcWwuZGV2
++ZWxvcGVyQG15c3FsLmNvbTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQC2j+W3tIaD
++E4r5v2PLZC25UdHeq3tFH6q1ZnMT+aYH1bp8+pK9N+Kth9s+tmoSZPjuF+MVBi+o
++gmi/V43DBJgnAgMBAAGjgaMwgaAwCQYDVR0TBAIwADAdBgNVHQ4EFgQU2Zq4XyLq
++BBDIJX2CV+Yu/Rkp59owdAYDVR0jBG0wa4AU8uLqVWWkmuKsnZf1RWz294wRrd+h
++SKRGMEQxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdV
++cHBzYWxhMREwDwYDVQQKEwhNeVNRTCBBQoIJAJXpePU0UOTVMA0GCSqGSIb3DQEB
++BQUAA4GBAFQHLSELpa87WCMyXlZ/q1hjSJGqOJCJFvnMv6QOeCufxRtYpuYIjy6u
++lwMhm/HNwCaPHdcoJ6COgQkbHA/JpUE6LUQ/nPqH/8hMK0T3G8E+TwF/6SbMnxwG
++tQsn0RCQvpMMnOew0eonmU4GFAx66cFSxTNovGEN24E7V0hXv0Ka
+ -----END CERTIFICATE-----
+diff -urNad mysql-dfsg-5.0-5.1.30really5.0.75~/mysql-test/std_data/server-key-des.pem mysql-dfsg-5.0-5.1.30really5.0.75/mysql-test/std_data/server-key-des.pem
+--- mysql-dfsg-5.0-5.1.30really5.0.75~/mysql-test/std_data/server-key-des.pem	2008-12-18 18:37:11.000000000 +0100
++++ mysql-dfsg-5.0-5.1.30really5.0.75/mysql-test/std_data/server-key-des.pem	1970-01-01 01:00:00.000000000 +0100
+@@ -1,18 +0,0 @@
+------BEGIN RSA PRIVATE KEY-----
+-Proc-Type: 4,ENCRYPTED
+-DEK-Info: DES-EDE3-CBC,D2BE7598C7E3BDA5
+-
+-1W3qPgw5ut80OhaAGVZZe/tfFiBAlwpX1SohdApWj+QYP+dK/mdEBhgI3BXTFNLW
+-pJqDTzGlKtft7hHN6QDFEdZMKxej5+2iLu14V62o+5yQgUoqswoXcmmqJCJ7AvyJ
+-yMBmGAzxRFlQsT8lf6o5TS1/efBvjvWhh3NG2Zq2LpyhWRRqA3kNhzktzt2WjDZe
+-ZkKmZJJnArr/Aw7jEBC4sH+nmgxoR18GzDddRG12hv1AWyHc3+VisTBpyNzeBy17
+-rxuQtqLzkAJmId723ddw83RVNSvBUUS3G0rx5O3HPobvZK89UqVxcXtIgc11WTVU
+-N3DbcJq5it43Loo0W3gAngtESDm2E3rTadrmdUSDGv2wQ5dNFl6cQ1f397Sdd/WC
+-A0grn1tKjJ6COp80Ymdyvn+stjv/+Rl1/KHSeG0lNeZxqjPPOJ7NHaKv7qjYsJ6W
+-LT35/Xc3oCo5qk9FOlq/0tGjHxf6RcFr5U7k5ILKZs+RmvJ4Sv/VYShLfLTcfGbJ
+-wBNfRKvcHZBQJQBb1+s/kRrjFFtvhrUwLz4+c9kskp+t4qRVYywUAnGGGsMs/GPm
+-wYsLQZO6Bs5/taaVUyaJQW015J7FGGv+/7/A1dIhu73S/Xl/YcFbX/CMEVq2Lxxd
+-hZdFIuaZ7LE+0MDQWsvYMYPDPLDH11diczb/jeKBdLPOzk/FUqVx3Fin1PpcaBxY
+-b+7oZJhYdg/rAWDeQ/nji9qnEG8waK6x1hdkYPOrqqWQPfgM/LPsSrgWeuTSdx2B
+-Ixi01UlBb5UP4K7UrjyddPobmcVjXaQLNe7zaq0+OS3UnIG85GtHrQ==
+------END RSA PRIVATE KEY-----
+diff -urNad mysql-dfsg-5.0-5.1.30really5.0.75~/mysql-test/std_data/server-key.pem mysql-dfsg-5.0-5.1.30really5.0.75/mysql-test/std_data/server-key.pem
+--- mysql-dfsg-5.0-5.1.30really5.0.75~/mysql-test/std_data/server-key.pem	2008-12-18 18:37:11.000000000 +0100
++++ mysql-dfsg-5.0-5.1.30really5.0.75/mysql-test/std_data/server-key.pem	2009-02-02 23:46:47.000000000 +0100
+@@ -1,9 +1,9 @@
+ -----BEGIN RSA PRIVATE KEY-----
+-MIIBOgIBAAJBANn92rP7fOCwA76XxqQ2rHGvuy3lhO3zjyvrEeWqZu2/YmvjzvqA
+-7ZD/uUo5IEC28pm/LzO18uw6kGAdnpR+pBsCAwEAAQJBAMieYdpmRoUaODf9wqh6
+-ULXH/sG8i1vaXRcUHcJ50oRVfVK8/tGGvUuTDu6MeINTdahNDlYfjwOjKWVXys1w
+-h6ECIQDs6s7DfczK2bKCLt0zqg24mZL3rOpGmDU+TatwN1yVgwIhAOuMzdVTX39p
+-328+5WxJvBOFfxmSmqdDhIFpnRMvgguJAiByvKjT/km+970+1OllyvaIL0AA2OpA
+-tBgdC0p6tyUMdwIgKuHAWzTJbu28UolVxQgLaFZmVCZ/ZzIAfnrWsLZ2a1kCIBq/
+-ywJ2cpyFlgazu8AH6KCQa0ok9s70ElaB6FEC85Al
++MIIBOQIBAAJBALaP5be0hoMTivm/Y8tkLblR0d6re0UfqrVmcxP5pgfVunz6kr03
++4q2H2z62ahJk+O4X4xUGL6iCaL9XjcMEmCcCAwEAAQJASA5VwgNb0CKHiPm0ntOk
++hG+54SRX3DmafEy6gRjZIl/bZ/asSLhXUZ+CeohyrQh7BZgYWvykd8pRISL9eKsU
++GQIhAOXkUrOtP/EtjyqNluEqZdG+RZi/7p61JS3Ce13Myu+LAiEAy0uMlV34AJpM
++b40FPKqlHxw8DD/Dt1iKhNVAg8+LDVUCIFjv7fbJDbW2VG63/Cj8CAwOukoP5rbL
++iaicVrHBKrllAiB9+MiaXeopZXNrxDS0jQFYr8Q9yt1aJVFgUkxx4Q9HKQIgZPs0
++KlF3NNNWw78INaAEkyf0IEssnLMsuoCWw0DIOak=
+ -----END RSA PRIVATE KEY-----
+diff -urNad mysql-dfsg-5.0-5.1.30really5.0.75~/mysql-test/std_data/server8k-cert.pem mysql-dfsg-5.0-5.1.30really5.0.75/mysql-test/std_data/server8k-cert.pem
+--- mysql-dfsg-5.0-5.1.30really5.0.75~/mysql-test/std_data/server8k-cert.pem	2008-12-18 18:37:11.000000000 +0100
++++ mysql-dfsg-5.0-5.1.30really5.0.75/mysql-test/std_data/server8k-cert.pem	2009-02-02 23:46:47.000000000 +0100
+@@ -1,51 +1,138 @@
++Certificate:
++    Data:
++        Version: 3 (0x2)
++        Serial Number: 4 (0x4)
++        Signature Algorithm: sha1WithRSAEncryption
++        Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
++        Validity
++            Not Before: Jan 28 11:12:27 2009 GMT
++            Not After : Jan 28 11:12:27 2010 GMT
++        Subject: C=SE, ST=Uppsala, O=MySQL AB, CN=server
++        Subject Public Key Info:
++            Public Key Algorithm: rsaEncryption
++            RSA Public Key: (8192 bit)
++                Modulus (8192 bit):
++                    00:c0:8f:22:03:24:59:67:46:14:d6:8f:60:09:58:
++                    06:07:45:f1:78:71:55:f1:ea:b9:30:8a:cd:c3:3c:
++                    b9:bf:65:6e:18:ed:a0:b8:c9:19:56:6f:c4:90:19:
++                    c8:65:09:db:ff:bf:82:a1:08:ad:01:4f:5a:a3:d4:
++                    3d:78:7e:4b:4a:01:a4:7d:e8:7b:05:3e:7d:d8:b9:
++                    55:58:60:d6:1c:ce:e8:32:62:2c:19:60:f3:ed:05:
++                    99:6d:c9:77:07:2e:11:6d:0b:9a:c7:68:38:46:e8:
++                    fa:31:80:df:e8:79:f0:f1:fd:a9:94:c3:fa:0d:f5:
++                    78:ac:49:7e:d5:17:fd:e1:ee:44:f3:c7:0e:30:32:
++                    5d:a9:19:25:e4:bb:21:1d:fe:3c:84:48:40:f5:58:
++                    f4:bf:13:8c:85:68:bb:ec:f5:dd:c6:38:d1:b0:77:
++                    1f:a6:8e:4f:8d:e2:6f:49:74:f5:3f:90:65:8e:99:
++                    1e:59:9c:1c:b5:26:24:c4:b1:de:1e:fb:96:65:c4:
++                    31:14:1a:53:b8:5e:62:8a:c7:04:f7:b4:36:a4:af:
++                    07:c8:27:06:ed:dd:e6:f4:8c:62:f1:65:40:d0:9f:
++                    9f:a9:14:c8:8e:8b:74:d6:67:5a:d0:c9:4d:35:a1:
++                    d5:7b:39:3a:42:9f:e4:d0:f4:c6:0f:2e:42:30:4b:
++                    56:b2:3d:6d:8e:2d:58:c5:69:99:35:49:95:95:99:
++                    b6:87:29:2b:32:d1:50:08:cd:25:14:48:6d:10:99:
++                    85:61:3c:41:26:21:55:cc:1f:cf:ad:b0:2f:b9:89:
++                    d8:4e:a0:18:ff:75:1d:b6:97:7c:c5:fa:8b:dc:93:
++                    17:86:0a:64:d4:09:35:d5:83:34:6d:5c:6d:c6:8c:
++                    cd:b9:ec:c2:93:c6:c1:b7:cc:04:6f:22:e0:07:bf:
++                    e0:d9:9b:2f:d5:a0:50:cc:f9:f0:95:83:8f:f4:30:
++                    83:72:94:d7:b5:4b:da:cc:9f:54:3b:8d:78:77:0b:
++                    24:6c:0f:c2:96:61:96:2f:b8:5f:b5:7a:ab:7a:5b:
++                    97:7a:a9:ad:40:8b:f2:d6:c6:8d:81:d9:94:61:8f:
++                    9d:03:c5:b9:10:03:68:83:bf:04:81:cc:ac:bd:34:
++                    89:e8:d4:8d:43:20:e2:b6:a4:11:3d:15:2a:82:0c:
++                    d6:3a:6a:8c:62:d4:93:bc:c3:80:bf:1b:b4:2b:0a:
++                    7a:34:f0:cd:1e:82:3f:25:0f:d1:04:a8:0a:05:19:
++                    b0:d6:16:83:39:af:0b:45:7d:cb:14:7e:4d:aa:aa:
++                    c2:39:a8:46:38:ab:bd:ab:2a:bd:34:43:7f:da:25:
++                    de:2b:fb:69:3b:fe:3b:87:fd:98:94:76:4a:bf:04:
++                    a3:31:e3:3a:ff:6f:04:fa:fa:24:e4:2a:89:e9:0e:
++                    bf:44:4c:72:85:82:3c:89:4a:03:63:01:41:92:53:
++                    d0:82:60:6e:d8:ff:8c:a2:b4:1a:3b:20:6d:ae:74:
++                    92:30:4e:48:e3:51:a6:cb:73:97:06:13:03:32:23:
++                    9b:7d:a2:c7:3a:a9:af:97:8c:51:ed:fe:fa:b4:b4:
++                    1a:a3:87:fc:cf:8c:8e:e6:80:15:03:fd:fe:7d:bd:
++                    b1:76:f1:5f:b3:09:2b:4c:4d:a7:7c:b5:72:b1:d6:
++                    db:38:c0:67:a4:54:bc:87:09:a5:39:ba:1a:7e:3f:
++                    74:60:ad:3d:4b:be:94:53:f3:64:16:c7:33:35:ec:
++                    41:00:95:b6:de:99:62:a2:7a:28:9a:45:4d:fa:cd:
++                    a6:77:f6:de:58:72:50:c8:7d:69:38:db:07:04:84:
++                    d8:4d:39:f7:50:13:43:ae:2d:af:45:a4:2a:39:56:
++                    3c:b8:b7:d8:26:a4:36:c9:23:aa:aa:b8:49:0b:21:
++                    ba:9e:7a:2b:7f:4d:29:9f:0e:00:1e:b4:5e:a6:fa:
++                    49:fe:8d:e5:74:57:d8:ba:d9:92:2c:d2:ac:84:1d:
++                    f2:a6:a4:44:1c:bf:88:41:32:7e:d1:c3:2f:6e:bc:
++                    0f:5d:19:a6:8f:74:2b:67:ba:dd:a9:db:68:b5:ce:
++                    9d:25:48:df:54:08:d0:1d:4f:2e:5b:24:bc:05:0f:
++                    fb:58:46:fa:02:ca:53:93:29:cf:10:27:c2:a0:18:
++                    d0:f5:d4:b9:3c:5e:df:8e:6c:f5:7c:b9:b4:54:cc:
++                    39:16:5d:3c:da:96:b3:c3:6c:d4:70:5d:d3:30:a7:
++                    a6:bd:6f:dd:41:bc:a8:de:42:60:59:9a:85:25:0d:
++                    2a:45:c3:05:b4:6e:7a:4a:4d:ca:8c:0a:e5:6c:34:
++                    bc:20:9b:6d:4a:ca:ca:b6:a6:3a:a0:db:c3:0e:20:
++                    1a:12:1b:77:dd:cb:1d:7f:c3:0d:0d:e7:c1:fd:96:
++                    d2:c7:68:80:99:a0:d9:8a:33:21:a3:8b:a2:5a:a7:
++                    7e:27:06:02:7f:ed:60:11:37:34:54:17:7f:4d:90:
++                    14:1e:69:37:0d:ba:f0:2b:f0:a3:2d:62:79:c8:76:
++                    a8:ea:c8:e7:3b:1f:c6:4f:c2:0c:d7:ac:f0:77:53:
++                    5d:f0:50:b4:df:9b:03:ca:4d:41:e1:18:b2:25:30:
++                    86:1d:63:e5:67:b1:53:cd:6b:4e:83:1a:b9:5e:2d:
++                    05:15:6b:d4:8e:b1:97:fc:31:03:57:cb:bf:27:7f:
++                    cd:5f:27:7e:66:e7:3c:17:09:b6:11:2a:4f:33:cd:
++                    eb:1a:d3:6f:d5:15:8b:8b:ce:68:6b:7e:9a:95:e5:
++                    74:7f:17:57:d9
++                Exponent: 65537 (0x10001)
++        X509v3 extensions:
++            X509v3 Basic Constraints: 
++                CA:FALSE
++            X509v3 Subject Key Identifier: 
++                58:12:24:59:A7:3C:29:15:89:5A:C2:12:DB:E7:A5:42:10:21:B7:BA
++            X509v3 Authority Key Identifier: 
++                keyid:F2:E2:EA:55:65:A4:9A:E2:AC:9D:97:F5:45:6C:F6:F7:8C:11:AD:DF
++                DirName:/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB
++                serial:95:E9:78:F5:34:50:E4:D5
++
++    Signature Algorithm: sha1WithRSAEncryption
++        cd:cb:5c:83:35:ea:cb:cb:c3:a8:c3:95:e2:e6:6f:4d:d8:e4:
++        ee:41:dd:3f:35:82:ac:2f:fd:63:89:4f:3a:19:d7:81:75:b3:
++        a3:fc:36:b2:12:d5:c6:56:bc:13:60:37:33:6e:a0:d8:ae:7c:
++        88:f9:4b:ee:7b:1f:c8:f0:56:19:07:4d:bb:45:52:1c:78:81:
++        07:7c:13:86:b8:86:70:85:e4:71:25:58:78:d1:be:de:22:82:
++        6d:1a:4b:06:ac:f0:e8:50:87:c7:69:64:c2:61:43:cd:96:06:
++        a6:7e:09:a9:02:01:2a:a2:40:f3:cd:10:80:48:d0:34:55:40:
++        b9:ce
+ -----BEGIN CERTIFICATE-----
+-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
+ -----END CERTIFICATE-----
+diff -urNad mysql-dfsg-5.0-5.1.30really5.0.75~/mysql-test/std_data/server8k-key.pem mysql-dfsg-5.0-5.1.30really5.0.75/mysql-test/std_data/server8k-key.pem
+--- mysql-dfsg-5.0-5.1.30really5.0.75~/mysql-test/std_data/server8k-key.pem	2008-12-18 18:37:11.000000000 +0100
++++ mysql-dfsg-5.0-5.1.30really5.0.75/mysql-test/std_data/server8k-key.pem	2009-02-02 23:46:47.000000000 +0100
+@@ -1,99 +1,99 @@
+ -----BEGIN RSA PRIVATE KEY-----
+-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
+ -----END RSA PRIVATE KEY-----
+diff -urNad mysql-dfsg-5.0-5.1.30really5.0.75~/mysql-test/t/openssl_1.test mysql-dfsg-5.0-5.1.30really5.0.75/mysql-test/t/openssl_1.test
+--- mysql-dfsg-5.0-5.1.30really5.0.75~/mysql-test/t/openssl_1.test	2008-12-18 18:37:11.000000000 +0100
++++ mysql-dfsg-5.0-5.1.30really5.0.75/mysql-test/t/openssl_1.test	2009-02-02 23:46:47.000000000 +0100
+@@ -11,8 +11,8 @@
+ 
+ grant select on test.* to ssl_user1@localhost require SSL;
+ grant select on test.* to ssl_user2@localhost require cipher "DHE-RSA-AES256-SHA";
+-grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB/emailAddress=[e-mail]";
+-grant select on test.* to ssl_user4@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB/emailAddress=[e-mail]" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB";
++grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB/emailAddress=[e-mail]";
++grant select on test.* to ssl_user4@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB/emailAddress=[e-mail]" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB";
+ grant select on test.* to ssl_user5@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "xxx";
+ flush privileges;
+ 

=== modified file 'bakery/debian-5.0/po/ar.po'
--- bakery/debian-5.0/po/ar.po	2008-10-20 22:54:11 +0000
+++ bakery/debian-5.0/po/ar.po	2009-10-01 11:15:33 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: templates\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2008-08-12 14:13+0200\n"
+"POT-Creation-Date: 2008-12-22 11:02+0100\n"
 "PO-Revision-Date: 2007-05-01 13:04+0300\n"
 "Last-Translator: Ossama M. Khayat <[e-mail]>\n"
 "Language-Team: Arabic <[e-mail]>\n"

=== modified file 'bakery/debian-5.0/po/ca.po'
--- bakery/debian-5.0/po/ca.po	2008-10-20 22:54:11 +0000
+++ bakery/debian-5.0/po/ca.po	2009-10-01 11:15:33 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: mysql-dfsg-4.1\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2008-08-12 14:13+0200\n"
+"POT-Creation-Date: 2008-12-22 11:02+0100\n"
 "PO-Revision-Date: 2004-01-31 19:20GMT\n"
 "Last-Translator: Aleix Badia i Bosch <[e-mail]>\n"
 "Language-Team: Debian L10n Catalan <[e-mail]>\n"

=== modified file 'bakery/debian-5.0/po/da.po'
--- bakery/debian-5.0/po/da.po	2008-10-20 22:54:11 +0000
+++ bakery/debian-5.0/po/da.po	2009-10-01 11:15:33 +0000
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: mysql-dfsg-4.1\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2008-08-12 14:13+0200\n"
+"POT-Creation-Date: 2008-12-22 11:02+0100\n"
 "PO-Revision-Date: 2007-05-30 22:41+0200\n"
 "Last-Translator: Claus Hindsgaul <[e-mail]>\n"
 "Language-Team: Danish\n"

=== modified file 'bakery/debian-5.0/po/eu.po'
--- bakery/debian-5.0/po/eu.po	2008-10-20 22:54:11 +0000
+++ bakery/debian-5.0/po/eu.po	2009-10-01 11:15:33 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2008-08-12 14:13+0200\n"
+"POT-Creation-Date: 2008-12-22 11:02+0100\n"
 "PO-Revision-Date: 2008-05-18 23:36+0200\n"
 "Last-Translator: Piarres Beobide <[e-mail]>\n"
 "Language-Team: Euskara <[e-mail]>\n"

=== modified file 'bakery/debian-5.0/po/ja.po'
--- bakery/debian-5.0/po/ja.po	2008-10-20 22:54:11 +0000
+++ bakery/debian-5.0/po/ja.po	2009-10-01 11:15:33 +0000
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.0 5.0.51a-7.1\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2008-08-12 14:13+0200\n"
+"POT-Creation-Date: 2008-12-22 11:02+0100\n"
 "PO-Revision-Date: 2008-06-21 07:25+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <[e-mail]>\n"
 "Language-Team: Japanese <[e-mail]>\n"

=== modified file 'bakery/debian-5.0/po/nb.po'
--- bakery/debian-5.0/po/nb.po	2008-10-20 22:54:11 +0000
+++ bakery/debian-5.0/po/nb.po	2009-10-01 11:15:33 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: mysql_nb\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2008-08-12 14:13+0200\n"
+"POT-Creation-Date: 2008-12-22 11:02+0100\n"
 "PO-Revision-Date: 2007-02-18 12:13+0100\n"
 "Last-Translator: Bjørn Steensrud <[e-mail]>\n"
 "Language-Team: Norwegian Bokmål <[e-mail]>\n"

=== modified file 'bakery/debian-5.0/po/nl.po'
--- bakery/debian-5.0/po/nl.po	2008-10-20 22:54:11 +0000
+++ bakery/debian-5.0/po/nl.po	2009-10-01 11:15:33 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.0 5.0.30-1\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2008-08-12 14:13+0200\n"
-"PO-Revision-Date: 2006-02-19 10:20+0100\n"
+"POT-Creation-Date: 2008-06-25 15:53+0200\n"
+"PO-Revision-Date: 2008-07-23 18:30+0200\n"
 "Last-Translator: Thijs Kinkhorst <[e-mail]>\n"
 "Language-Team: Debian-Dutch <[e-mail]>\n"
 "MIME-Version: 1.0\n"
@@ -18,8 +18,6 @@
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.0.templates:2001
-#, fuzzy
-#| msgid "Do you really want to downgrade?"
 msgid "Really proceed with downgrade?"
 msgstr "Wilt u echt een oude versie herstellen?"
 
@@ -27,25 +25,18 @@
 #. Description
 #: ../mysql-server-5.0.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
-msgstr ""
+msgstr "Op uw systeem is een bestand genaamd /var/lib/mysql/debian-*.flag "
+"aangetroffen."
 
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.0.templates:2001
-#, fuzzy
-#| msgid ""
-#| "WARNING: The file /var/lib/mysql/debian-*.flag exists. This indicates "
-#| "that a mysql-server package with a higher version has been installed "
-#| "before. It can not be guaranteed that this version can use its data."
 msgid ""
 "Such file is an indication that a mysql-server package with a higher version "
 "has been installed earlier."
 msgstr ""
-"Waarschuwing: waarschijnlijk is een hogere versie van het mysql-server "
-"pakket geïnstalleerd geweest (het bestand /var/lib/mysql/debian-*.flag "
-"bestaat). Er is geen garantie dat de gegevensbestanden, bewerkt met die "
-"hogere versie, kunnen worden gebruikt met de versie van mysql die u nu "
-"installeert."
+"Een dergelijk bestand is een indicatie dat een hogere versie van het pakket "
+"mysql-server geïnstalleerd is geweest."
 
 #. Type: boolean
 #. Description
@@ -54,14 +45,14 @@
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
 msgstr ""
+"Er is geen garantie dat de versie die u nu installeert de bestaande "
+"databases kan gebruiken."
 
 #. Type: note
 #. Description
 #: ../mysql-server-5.0.templates:3001
-#, fuzzy
-#| msgid "Important note for NIS/YP users!"
 msgid "Important note for NIS/YP users"
-msgstr "Belangrijke opmerking voor gebruikers van NIS/YP!"
+msgstr "Belangrijke opmerking voor gebruikers van NIS/YP"
 
 #. Type: note
 #. Description
@@ -70,6 +61,8 @@
 "To use MySQL, the following entries for users and groups should be added to "
 "the system:"
 msgstr ""
+"Om MySQL te kunnen gebruiken, moeten de volgende gebruikers en groepen "
+"aan het systeem toegevoegd worden:"
 
 #. Type: note
 #. Description
@@ -78,12 +71,13 @@
 "You should also check the permissions and the owner of the /var/lib/mysql "
 "directory:"
 msgstr ""
+"Controleert u ook de toegangsrechten en eigenaar van de map /var/lib/mysql:"
 
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.0.templates:4001
 msgid "Remove all MySQL databases?"
-msgstr ""
+msgstr "Alle MySQL-databases verwijderen?"
 
 #. Type: boolean
 #. Description
@@ -92,62 +86,47 @@
 "The /var/lib/mysql directory which contains the MySQL databases is about to "
 "be removed."
 msgstr ""
+"De map /var/lib/mysql, die alle MySQL databases bevat, staat op het punt "
+"verwijderd te worden."
 
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.0.templates:4001
-#, fuzzy
-#| msgid ""
-#| "The script is about to remove the data directory /var/lib/mysql. If it is "
-#| "planned to just install a higher MySQL version or if a different mysql-"
-#| "server package is already using it, the data should be kept."
 msgid ""
 "If you're removing the MySQL package in order to later install a more recent "
 "version or if a different mysql-server package is already using it, the data "
 "should be kept."
 msgstr ""
-"Het script staat op het punt de datamap /var/lib/mysql te verwijderen. Als "
+"Als "
 "het plan alleen maar is om een hogere MySQL versie te installeren, of als "
-"een ander mysql-serverpakket de datamap al gebruikt, dan zou de data moeten "
+"een ander mysql-serverpakket deze al gebruikt, dan zou de data moeten "
 "worden behouden."
 
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.0.templates:5001
-#, fuzzy
-#| msgid "Should MySQL start on boot?"
 msgid "Start the MySQL server on boot?"
-msgstr "Moet MySQL starten als de computer start?"
+msgstr "MySQL starten als de computer start?"
 
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.0.templates:5001
-#, fuzzy
-#| msgid ""
-#| "The MySQL can start automatically on boot time or only if you manually "
-#| "type '/etc/init.d/mysql start'."
 msgid ""
 "The MySQL server can be launched automatically at boot time or manually with "
 "the '/etc/init.d/mysql start' command."
 msgstr ""
-"MySQL kan automatisch starten bij het starten van de computer, of slechts "
-"wanneer u '/etc/init.d/mysql start' handmatig uitvoert."
+"MySQL kan automatisch starten bij het starten van de computer, of handmatig "
+"door '/etc/init.d/mysql start' uit te voeren."
 
 #. Type: password
 #. Description
 #: ../mysql-server-5.0.templates:6001
-#, fuzzy
-#| msgid "New password for MySQL \"root\" user:"
 msgid "New password for the MySQL \"root\" user:"
 msgstr "Nieuw wachtwoord voor de MySQL \"root\"-gebruiker:"
 
 #. Type: password
 #. Description
 #: ../mysql-server-5.0.templates:6001
-#, fuzzy
-#| msgid ""
-#| "It is highly recommended that you set a password for the MySQL "
-#| "administrative \"root\" user."
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MySQL administrative \"root\" user."
@@ -159,39 +138,29 @@
 #. Description
 #: ../mysql-server-5.0.templates:6001
 msgid "If that field is left blank, the password will not be changed."
-msgstr ""
+msgstr "Als dit wordt leeggelaten, zal het wachtwoord niet gewijzigd worden."
 
 #. Type: password
 #. Description
 #: ../mysql-server-5.0.templates:7001
-#, fuzzy
-#| msgid "New password for MySQL \"root\" user:"
 msgid "Repeat password for the MySQL \"root\" user:"
-msgstr "Nieuw wachtwoord voor de MySQL \"root\"-gebruiker:"
+msgstr "Hehaal wachtwoord voor de MySQL \"root\"-gebruiker:"
 
 #. Type: error
 #. Description
 #: ../mysql-server-5.0.templates:8001
-#, fuzzy
-#| msgid "Unable to set password for MySQL \"root\" user"
 msgid "Unable to set password for the MySQL \"root\" user"
 msgstr "Kan het wachtwoord voor de MySQL \"root\"-gebruiker niet instellen"
 
 #. Type: error
 #. Description
 #: ../mysql-server-5.0.templates:8001
-#, fuzzy
-#| msgid ""
-#| "It seems an error occurred while setting the password for the MySQL "
-#| "administrative user.  This may have happened because the user already has "
-#| "a password, or because there was a problem communicating with the MySQL "
-#| "server."
 msgid ""
 "An error occurred while setting the password for the MySQL administrative "
 "user. This may have happened because the account already has a password, or "
 "because of a communication problem with the MySQL server."
 msgstr ""
-"Er lijkt een fout te zijn opgetreden bij het instellen van het wachtwoord "
+"Er is een fout opgetreden bij het instellen van het wachtwoord "
 "van de MySQL administratieve gebruiker. Dat kan komen doordat de gebruiker "
 "al een wachtwoord heeft, of omdat er een probleem was bij het communiceren "
 "met de MySQL server."
@@ -201,6 +170,8 @@
 #: ../mysql-server-5.0.templates:8001
 msgid "You should check the account's password after the package installation."
 msgstr ""
+"Controleert u het wachtwoord van deze gebruiker nadat het pakket "
+"geïnstalleerd is."
 
 #. Type: error
 #. Description
@@ -211,18 +182,19 @@
 "Please read the /usr/share/doc/mysql-server-5.0/README.Debian file for more "
 "information."
 msgstr ""
+"Zie /usr/share/doc/mysql-server-5.0/README.Debian voor aanvullende informatie."
 
 #. Type: error
 #. Description
 #: ../mysql-server-5.0.templates:9001
 msgid "Password input error"
-msgstr ""
+msgstr "Invoerfout wachtwoord"
 
 #. Type: error
 #. Description
 #: ../mysql-server-5.0.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
-msgstr ""
+msgstr "De twee wachtwoorden die u opgaf waren verschillend. Probeert u het opnieuw."
 
 #. Type: boolean
 #. Description
@@ -235,13 +207,6 @@
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.0.templates:10001
-#, fuzzy
-#| msgid ""
-#| "The way passwords were stored was not very secure. This has been improved "
-#| "with the drawback that clients (e.g. PHP) from hosts running Debian 3.1 "
-#| "Sarge will not be able to connect to account which are new or whose "
-#| "password have been changed. See /usr/share/doc/mysql-server-5.0/README."
-#| "Debian."
 msgid ""
 "In old versions of MySQL clients on Debian, passwords were not stored "
 "securely. This has been improved since then, however clients (such as PHP) "
@@ -249,45 +214,7 @@
 "accounts or accounts whose password have been changed."
 msgstr ""
 "De wijze waarop wachtwoorden werden bewaard was niet erg veilig. Dit is "
-"verbeterd, maar helaas zullen programma's van computers die Debian 3.1 Sarge "
+"verbeterd, maar helaas zullen programma's (zoals PHP) van computers die Debian 3.1 Sarge "
 "draaien, geen verbinding meer kunnen maken met accounts die nieuw zijn, of "
-"waarvan het wachtwoord is gewijzigd. Zie /usr/share/doc/mysql-server-5.0/"
-"README.Debian."
-
-#~ msgid ""
-#~ "To use mysql you must install an equivalent user and group to the "
-#~ "following and ensure yourself that /var/lib/mysql has the right "
-#~ "permissions (the uid/gid may be different)."
-#~ msgstr ""
-#~ "Om mysql te gebruiken dient u een gebruiker en groep aan te maken, "
-#~ "gelijkwaardig aan onderstaand voorbeeld, en u dient ervoor te zorgen dat /"
-#~ "var/lib/mysql de bijbehorende toegangsrechten heeft (uid en gid mogen "
-#~ "anders zijn)."
-
-#~ msgid ""
-#~ "/etc/passwd:      mysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false"
-#~ msgstr ""
-#~ "/etc/passwd:      mysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false"
-
-#~ msgid "/etc/group:       mysql:x:101:"
-#~ msgstr "/etc/group:       mysql:x:101:"
-
-#~ msgid "/var/lib/mysql:   drwxr-xr-x   mysql    mysql"
-#~ msgstr "/var/lib/mysql:   drwxr-xr-x   mysql    mysql"
-
-#~ msgid "Remove the databases used by all MySQL versions?"
-#~ msgstr "Databases verwijderen die door alle MySQL versies worden gebruikt?"
-
-#~ msgid ""
-#~ "If you do not provide a password no changes will be made to the account."
-#~ msgstr ""
-#~ "Indien u geen wachtwoord opgeeft zal het account niet worden gewijzigd."
-
-#~ msgid ""
-#~ "When installation finishes, you should verify that the account is "
-#~ "properly protected with a password (see README.Debian for more "
-#~ "information)."
-#~ msgstr ""
-#~ "Wanneer de installatie klaar is, dient u te verifiëren dat het account "
-#~ "netjes beschermd is met een wachtwoord (zie README.Debian voor meer "
-#~ "informatie)."
+"waarvan het wachtwoord is gewijzigd."
+

=== modified file 'bakery/debian-5.0/po/pt.po'
--- bakery/debian-5.0/po/pt.po	2008-10-20 22:54:11 +0000
+++ bakery/debian-5.0/po/pt.po	2009-10-01 11:15:33 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.0\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2008-08-12 14:13+0200\n"
+"POT-Creation-Date: 2008-12-22 11:02+0100\n"
 "PO-Revision-Date: 2008-06-16 18:58+0100\n"
 "Last-Translator: Miguel Figueiredo <[e-mail]>\n"
 "Language-Team: Portuguese <[e-mail]>\n"

=== modified file 'bakery/debian-5.0/po/pt_BR.po'
--- bakery/debian-5.0/po/pt_BR.po	2008-10-20 22:54:11 +0000
+++ bakery/debian-5.0/po/pt_BR.po	2009-10-01 11:15:33 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.0\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2008-08-12 14:13+0200\n"
+"POT-Creation-Date: 2008-12-22 11:02+0100\n"
 "PO-Revision-Date: 2007-04-21 15:59-0300\n"
 "Last-Translator: André Luís Lopes <[e-mail]>\n"
 "Language-Team: Debian-BR Project <[e-mail]>\n"

=== modified file 'bakery/debian-5.0/po/ro.po'
--- bakery/debian-5.0/po/ro.po	2008-10-20 22:54:11 +0000
+++ bakery/debian-5.0/po/ro.po	2009-10-01 11:15:33 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: ro_new\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2008-08-12 14:13+0200\n"
+"POT-Creation-Date: 2008-12-22 11:02+0100\n"
 "PO-Revision-Date: 2008-06-18 15:24+0300\n"
 "Last-Translator: Eddy Petrișor <[e-mail]>\n"
 "Language-Team: Română <[e-mail]>\n"

=== modified file 'bakery/debian-5.0/po/sv.po'
--- bakery/debian-5.0/po/sv.po	2008-10-20 22:54:11 +0000
+++ bakery/debian-5.0/po/sv.po	2009-10-01 11:15:33 +0000
@@ -1,22 +1,22 @@
-# translation of mysql-dfsg-5.0_5.0.51a-6_sv.po to swedish
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-# Developers do not need to manually edit POT or PO files.
-#
-# Martin Bagge <[e-mail]>, 2008.
+# translation of mysql-dfsg-5.0_5.0.51a-6_sv.po to swedish
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+# Developers do not need to manually edit POT or PO files.
+# 
+# Martin Bagge <[e-mail]>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.0_5.0.51a-6_sv\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2008-05-08 20:05+0200\n"
-"PO-Revision-Date: 2008-05-23 00:24+0200\n"
-"Last-Translator: Martin Bagge <[e-mail]>\n"
+"POT-Creation-Date: 2008-12-22 11:02+0100\n"
+"PO-Revision-Date: 2008-07-21 13:12+0100\n"
+"Last-Translator: Martin Bagge <[e-mail]>\n"
 "Language-Team: swedish <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -28,7 +28,6 @@
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.0.templates:2001
-#, fuzzy
 msgid "Really proceed with downgrade?"
 msgstr "Vill du verkligen nedgradera?"
 
@@ -44,7 +43,9 @@
 msgid ""
 "Such file is an indication that a mysql-server package with a higher version "
 "has been installed earlier."
-msgstr "Detta betyder att paketet mysql-server med högre versionsnummer har installerats tidigare."
+msgstr ""
+"Detta betyder att paketet mysql-server med högre versionsnummer har "
+"installerats tidigare."
 
 #. Type: boolean
 #. Description
@@ -52,12 +53,13 @@
 msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
-msgstr "Det finns inga garantier att versionen du installerar kan använda de existerande databaserna."
+msgstr ""
+"Det finns inga garantier att versionen du installerar kan använda de "
+"existerande databaserna."
 
 #. Type: note
 #. Description
 #: ../mysql-server-5.0.templates:3001
-#, fuzzy
 msgid "Important note for NIS/YP users"
 msgstr "Viktig notering för NIS/YP-användare!"
 
@@ -67,7 +69,9 @@
 msgid ""
 "To use MySQL, the following entries for users and groups should be added to "
 "the system:"
-msgstr "För att kunna använda MySQL behöver följande poster för användare och grupper adderas till systemet:"
+msgstr ""
+"För att kunna använda MySQL behöver följande poster för användare och "
+"grupper adderas till systemet:"
 
 #. Type: note
 #. Description
@@ -75,7 +79,8 @@
 msgid ""
 "You should also check the permissions and the owner of the /var/lib/mysql "
 "directory:"
-msgstr "Du bör också kontrollera rättigheter och ägare av katalogen /var/lib/mysql:"
+msgstr ""
+"Du bör också kontrollera rättigheter och ägare av katalogen /var/lib/mysql:"
 
 #. Type: boolean
 #. Description
@@ -89,12 +94,13 @@
 msgid ""
 "The /var/lib/mysql directory which contains the MySQL databases is about to "
 "be removed."
-msgstr "Katalogen /var/lib/mysql, som innehåller alla MySQL-databaser, kommer att tas bort."
+msgstr ""
+"Katalogen /var/lib/mysql, som innehåller alla MySQL-databaser, kommer att "
+"tas bort."
 
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.0.templates:4001
-#, fuzzy
 msgid ""
 "If you're removing the MySQL package in order to later install a more recent "
 "version or if a different mysql-server package is already using it, the data "
@@ -107,14 +113,12 @@
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.0.templates:5001
-#, fuzzy
 msgid "Start the MySQL server on boot?"
 msgstr "Ska MySQL startas när systemet startar upp?"
 
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.0.templates:5001
-#, fuzzy
 msgid ""
 "The MySQL server can be launched automatically at boot time or manually with "
 "the '/etc/init.d/mysql start' command."
@@ -125,14 +129,12 @@
 #. Type: password
 #. Description
 #: ../mysql-server-5.0.templates:6001
-#, fuzzy
 msgid "New password for the MySQL \"root\" user:"
 msgstr "Nytt lösenord för MySQLs \"root\"-användare:"
 
 #. Type: password
 #. Description
 #: ../mysql-server-5.0.templates:6001
-#, fuzzy
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MySQL administrative \"root\" user."
@@ -149,21 +151,18 @@
 #. Type: password
 #. Description
 #: ../mysql-server-5.0.templates:7001
-#, fuzzy
 msgid "Repeat password for the MySQL \"root\" user:"
 msgstr "Nytt lösenord för MySQLs \"root\"-användare:"
 
 #. Type: error
 #. Description
 #: ../mysql-server-5.0.templates:8001
-#, fuzzy
 msgid "Unable to set password for the MySQL \"root\" user"
 msgstr "Lyckades inte sätta lösenord för MySQLs \"root\"-användare"
 
 #. Type: error
 #. Description
 #: ../mysql-server-5.0.templates:8001
-#, fuzzy
 msgid ""
 "An error occurred while setting the password for the MySQL administrative "
 "user. This may have happened because the account already has a password, or "
@@ -185,7 +184,6 @@
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.0.templates:8001 ../mysql-server-5.0.templates:10001
-#, fuzzy
 msgid ""
 "Please read the /usr/share/doc/mysql-server-5.0/README.Debian file for more "
 "information."
@@ -214,7 +212,6 @@
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.0.templates:10001
-#, fuzzy
 msgid ""
 "In old versions of MySQL clients on Debian, passwords were not stored "
 "securely. This has been improved since then, however clients (such as PHP) "
@@ -225,4 +222,3 @@
 "förbättrats på bekostnad av att klienter (t.ex. PHP) från system som kör "
 "Debian 3.1 Sarge inte kan ansluta till konton som är nya eller vars lösenord "
 "har ändrats. Se /usr/share/doc/mysql-server-5.0/README.Debian."
-

=== modified file 'bakery/debian-5.0/po/templates.pot'
--- bakery/debian-5.0/po/templates.pot	2008-10-20 22:54:11 +0000
+++ bakery/debian-5.0/po/templates.pot	2009-10-01 11:15:33 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2008-08-12 14:13+0200\n"
+"POT-Creation-Date: 2008-12-22 11:02+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"

=== modified file 'bakery/debian-5.0/watch'
--- bakery/debian-5.0/watch	2008-10-20 22:54:11 +0000
+++ bakery/debian-5.0/watch	2009-10-01 11:15:32 +0000
@@ -1,3 +1,3 @@
 version=3
 opts="uversionmangle=s/-(rc|beta)/$1/" \
-  ftp://ftp.mysql.com/pub/mysql/src/mysql-([\d\.]*(?:-beta|-rc)?).tar.gz debian
+  http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.0/mysql-([\d\.]*(?:-beta|-rc)?).tar.gz debian

=== modified file 'bakery/mysql50-ourdelta-centos.spec'
--- bakery/mysql50-ourdelta-centos.spec	2009-03-25 12:54:42 +0000
+++ bakery/mysql50-ourdelta-centos.spec	2009-10-01 11:15:32 +0000
@@ -2,7 +2,8 @@
 # 2008-10-05 [e-mail] Initial foo
 # 2008-11-04 [e-mail] Updated patch/build process
 # 2009-03-24 [e-mail] Fixups for 5.0.77, and now 4/7 not 4_6/5_2
-#
+# 2009-09-26 [e-mail] Fixups for 5.0.86
+
 # rpmbuild -ba mysql-ourdelta-centos.spec --sign --define 'ourdelta 1'
 # rpmbuild -ba mysql-ourdelta-centos.spec --sign --define 'ourdeltasail 1'
 #       --define '_with_yassl 1'
@@ -298,7 +299,7 @@
         export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe $CPUOPT"
 fi
 
-# 2008-10-03 [e-mail]
+# 2008-10-03 [e-mail]
 # we need the following to set up proper for Sphinx Engine
 sh BUILD/autorun.sh
 
@@ -346,7 +347,7 @@
 
 BuildServer
 
-MYSQL_RPMBUILD_TEST=no
+MYSQL_RPMBUILD_TEST=yes
 
 if [ "$MYSQL_RPMBUILD_TEST" != "no" ] ; then
 	make test-bt
@@ -722,7 +723,7 @@
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog
-* Mon Oct 05 2008 Arjen Lentz <[e-mail]>
+* Mon Oct 05 2008 Arjen Lentz <[e-mail]>
 
 - Pruned SPEC to start sorting out the mess
 - Pruned changelog

=== modified file 'bakery/preheat.sh'
--- bakery/preheat.sh	2008-11-05 04:04:20 +0000
+++ bakery/preheat.sh	2009-10-01 11:15:32 +0000
@@ -2,8 +2,8 @@
 #
 # Welcome to the OurDelta build env creator.
 # 2008-11-05
-# Peter Lieverdink <[e-mail]>
-# Arjen Lentz <[e-mail]>
+# Peter Lieverdink <[e-mail]>
+# Arjen Lentz <[e-mail]>
 #
 # This script does a bzr export of the build dirs and creates a source tarball.
 

=== modified file 'bakery/tarbake.sh'
--- bakery/tarbake.sh	2009-03-25 12:54:42 +0000
+++ bakery/tarbake.sh	2009-10-01 11:15:32 +0000
@@ -2,8 +2,8 @@
 # 
 # Welcome to the OurDelta tarball bakery.
 # 2008-11-01
-# Peter Lieverdink <[e-mail]>
-# Arjen Lentz <[e-mail]>
+# Peter Lieverdink <[e-mail]>
+# Arjen Lentz <[e-mail]>
 #
 UPSTREAM_DIR=/srv/shared/mysql
 

=== modified file 'bakery/util/util.sh' (properties changed: -x to +x)
--- bakery/util/util.sh	2008-11-05 02:03:01 +0000
+++ bakery/util/util.sh	2009-10-01 11:15:33 +0000
@@ -1,7 +1,7 @@
 # Welcome to the OurDelta tarball bakery.
 # 2008-11-01
-# Peter Lieverdink <[e-mail]>
-# Arjen Lentz <[e-mail]>
+# Peter Lieverdink <[e-mail]>
+# Arjen Lentz <[e-mail]>
 
 # Utility func to test for required tools. Yes, I assume `which' is installed :-)
 #

=== added file 'bakery/util/versionfix.sh'
--- bakery/util/versionfix.sh	1970-01-01 00:00:00 +0000
+++ bakery/util/versionfix.sh	2009-10-01 11:15:33 +0000
@@ -0,0 +1,25 @@
+# Welcome to the OurDelta tarball bakery.
+# 2008-11-01
+# Peter Lieverdink <[e-mail]>
+# Arjen Lentz <[e-mail]>
+
+VERSIONFIX=""
+LSB_RELEASE="$(which lsb_release)"
+if [ -x ${LSB_RELEASE} ]; then
+	distro="$(${LSB_RELEASE} -si)"
+	code="$(${LSB_RELEASE} -sr)"
+	if [ ${distro} = "Ubuntu" ]; then
+		case $code in
+			9.04)
+				VERSIONFIX="5.1.30really"
+			;;
+			9.10)
+				VERSIONFIX="5.1.30really"
+			;;
+			*)
+				VERSIONFIX=""
+			;;
+		esac
+	fi
+fi
+echo ${VERSIONFIX}

=== modified file 'mysql/5.0/antony_curtis/big_tables_fixlp284123_fixmysql35346/big_tables_fixlp284123_fixmysql35346.patch'
--- mysql/5.0/antony_curtis/big_tables_fixlp284123_fixmysql35346/big_tables_fixlp284123_fixmysql35346.patch	2008-10-21 06:00:59 +0000
+++ mysql/5.0/antony_curtis/big_tables_fixlp284123_fixmysql35346/big_tables_fixlp284123_fixmysql35346.patch	2009-10-01 11:15:33 +0000
@@ -28,4 +28,4 @@
 +Version=1.0
 +Author=Antony Curtis <[e-mail]>
 +License=N/A
-+Comment=Patch created by Arjen Lentz <[e-mail]>
++Comment=Patch created by Arjen Lentz <[e-mail]>

=== modified file 'mysql/5.0/google/if_idlev2/if_idlev2.patch'
--- mysql/5.0/google/if_idlev2/if_idlev2.patch	2009-03-22 22:21:19 +0000
+++ mysql/5.0/google/if_idlev2/if_idlev2.patch	2009-10-01 11:15:33 +0000
@@ -8,7 +8,7 @@
 +Version=2.0
 +Author=Google
 +License=GPL
-+Comment=Extracted by David Stainton ([e-mail]), fixes by Arjen Lentz <[e-mail]>
++Comment=Extracted by David Stainton ([e-mail]), fixes by Arjen Lentz <[e-mail]>
 Index: mysql-5.0.77/include/mysql_com.h
 ===================================================================
 --- mysql-5.0.77.orig/include/mysql_com.h

=== modified file 'mysql/5.0/ourdelta/configtest/configtest.patch'
--- mysql/5.0/ourdelta/configtest/configtest.patch	2009-03-19 05:58:44 +0000
+++ mysql/5.0/ourdelta/configtest/configtest.patch	2009-10-01 11:15:33 +0000
@@ -1,7 +1,18 @@
-Index: mysql-5.0.77/support-files/mysql.server.sh
-===================================================================
---- mysql-5.0.77.orig/support-files/mysql.server.sh
-+++ mysql-5.0.77/support-files/mysql.server.sh
+Index: mysql-5.0.86/patch_info/configtest.info
+===================================================================
+--- /dev/null
++++ mysql-5.0.86/patch_info/configtest.info
+@@ -0,0 +1,6 @@
++File=configtest.patch
++Name=Add configtest command to /etc/init.d/mysql
++Version=1.0
++Author=Open Query <[e-mail]>
++License=GPL
++Comment=Code by Peter Lieverdink <[e-mail]>
+Index: mysql-5.0.86/support-files/mysql.server.sh
+===================================================================
+--- mysql-5.0.86.orig/support-files/mysql.server.sh
++++ mysql-5.0.86/support-files/mysql.server.sh
 @@ -424,7 +424,32 @@ case "$mode" in
        fi
      fi

=== added directory 'mysql/5.0/ourdelta/mysql-test-fixes'
=== added file 'mysql/5.0/ourdelta/mysql-test-fixes/mysql-test-fixes-bug-mysql-47666.patch'
--- mysql/5.0/ourdelta/mysql-test-fixes/mysql-test-fixes-bug-mysql-47666.patch	1970-01-01 00:00:00 +0000
+++ mysql/5.0/ourdelta/mysql-test-fixes/mysql-test-fixes-bug-mysql-47666.patch	2009-10-01 11:15:33 +0000
@@ -0,0 +1,59 @@
+Index: mysql-5.0.86/mysql-test/r/ndb_gis.result
+===================================================================
+--- mysql-5.0.86.orig/mysql-test/r/ndb_gis.result	2009-09-29 14:28:11.000000000 +1000
++++ mysql-5.0.86/mysql-test/r/ndb_gis.result	2009-09-29 14:35:55.000000000 +1000
+@@ -1,4 +1,5 @@
+ SET storage_engine=ndbcluster;
++set @old_ecpd = @@session.engine_condition_pushdown;
+ DROP TABLE IF EXISTS t1, gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;
+ CREATE TABLE gis_point  (fid INTEGER, g POINT);
+ CREATE TABLE gis_line  (fid INTEGER, g LINESTRING);
+@@ -1086,3 +1087,4 @@
+ 0
+ DROP TABLE t1;
+ End of 5.0 tests
++set engine_condition_pushdown = @old_ecpd;
+Index: mysql-5.0.86/mysql-test/t/ndb_gis.test
+===================================================================
+--- mysql-5.0.86.orig/mysql-test/t/ndb_gis.test	2009-09-29 14:28:04.000000000 +1000
++++ mysql-5.0.86/mysql-test/t/ndb_gis.test	2009-09-29 14:34:48.000000000 +1000
+@@ -1,5 +1,7 @@
+ --source include/have_ndb.inc
+ SET storage_engine=ndbcluster;
++set @old_ecpd = @@session.engine_condition_pushdown;
+ --source include/gis_generic.inc
+ set engine_condition_pushdown = on;
+ --source include/gis_generic.inc
++set engine_condition_pushdown = @old_ecpd;
+Index: mysql-5.0.86/mysql-test/r/ndb_basic.result
+===================================================================
+--- mysql-5.0.86.orig/mysql-test/r/ndb_basic.result	2009-09-29 15:09:06.000000000 +1000
++++ mysql-5.0.86/mysql-test/r/ndb_basic.result	2009-09-29 15:12:58.000000000 +1000
+@@ -1,3 +1,5 @@
++set @old_ecpd = @@session.engine_condition_pushdown;
++set engine_condition_pushdown = 0;
+ DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
+ drop database if exists mysqltest;
+ CREATE TABLE t1 (
+@@ -866,3 +868,4 @@
+ ccc	-ccc
+ drop table t1;
+ End of 5.0 tests
++set engine_condition_pushdown = @old_ecpd;
+Index: mysql-5.0.86/mysql-test/t/ndb_basic.test
+===================================================================
+--- mysql-5.0.86.orig/mysql-test/t/ndb_basic.test	2009-09-29 15:09:12.000000000 +1000
++++ mysql-5.0.86/mysql-test/t/ndb_basic.test	2009-09-29 15:11:14.000000000 +1000
+@@ -1,5 +1,7 @@
+ -- source include/have_ndb.inc
+ -- source include/not_embedded.inc
++set @old_ecpd = @@session.engine_condition_pushdown;
++set engine_condition_pushdown = 0;
+ 
+ --disable_warnings
+ DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
+@@ -802,3 +804,4 @@
+ 
+ # End of 5.0 tests
+ --echo End of 5.0 tests
++set engine_condition_pushdown = @old_ecpd;

=== added file 'mysql/5.0/ourdelta/mysql-test-fixes/mysql-test-fixes.patch'
--- mysql/5.0/ourdelta/mysql-test-fixes/mysql-test-fixes.patch	1970-01-01 00:00:00 +0000
+++ mysql/5.0/ourdelta/mysql-test-fixes/mysql-test-fixes.patch	2009-10-01 11:15:33 +0000
@@ -0,0 +1,51 @@
+Index: mysql-5.0.86/patch_info/mysql-test-fixes.info
+===================================================================
+--- /dev/null
++++ mysql-5.0.86/patch_info/mysql-test-fixes.info
+@@ -0,0 +1,6 @@
++File=mysql-test-fixes.patch
++Name=OurDelta temp patches to keep testsuite happy
++Version=1.0
++Author=Open Query <[e-mail]>
++License=N/A
++Comment=Relevant bugs filed upstream
+Index: mysql-5.0.86/mysql-test/r/ndb_gis.result
+===================================================================
+--- mysql-5.0.86.orig/mysql-test/r/ndb_gis.result	2009-09-10 05:40:37.000000000 +1000
++++ mysql-5.0.86/mysql-test/r/ndb_gis.result	2009-09-30 12:50:06.000000000 +1000
+@@ -1,4 +1,5 @@
+ SET storage_engine=ndbcluster;
++set @old_ecpd = @@session.engine_condition_pushdown;
+ DROP TABLE IF EXISTS t1, gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;
+ CREATE TABLE gis_point  (fid INTEGER, g POINT);
+ CREATE TABLE gis_line  (fid INTEGER, g LINESTRING);
+@@ -1086,3 +1087,4 @@
+ 0
+ DROP TABLE t1;
+ End of 5.0 tests
++set engine_condition_pushdown = @old_ecpd;
+Index: mysql-5.0.86/mysql-test/t/ndb_gis.test
+===================================================================
+--- mysql-5.0.86.orig/mysql-test/t/ndb_gis.test	2009-09-10 05:40:31.000000000 +1000
++++ mysql-5.0.86/mysql-test/t/ndb_gis.test	2009-09-30 12:50:06.000000000 +1000
+@@ -1,5 +1,7 @@
+ --source include/have_ndb.inc
+ SET storage_engine=ndbcluster;
++set @old_ecpd = @@session.engine_condition_pushdown;
+ --source include/gis_generic.inc
+ set engine_condition_pushdown = on;
+ --source include/gis_generic.inc
++set engine_condition_pushdown = @old_ecpd;
+Index: mysql-5.0.86/mysql-test/r/ndb_basic.result
+===================================================================
+--- mysql-5.0.86.orig/mysql-test/r/ndb_basic.result	2009-09-10 05:40:37.000000000 +1000
++++ mysql-5.0.86/mysql-test/r/ndb_basic.result	2009-09-30 12:56:14.000000000 +1000
+@@ -568,7 +568,7 @@
+ insert into t1 values (1,1),(2,1),(3,1),(4,1),(5,2),(6,1),(7,1);
+ explain select * from t1 where a12345678901234567890123456789a1234567890=2;
+ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+-1	SIMPLE	t1	ref	a12345678901234567890123456789a1234567890	a12345678901234567890123456789a1234567890	5	const	10	Using where
++1	SIMPLE	t1	ref	a12345678901234567890123456789a1234567890	a12345678901234567890123456789a1234567890	5	const	10	Using where with pushed condition
+ select * from t1 where a12345678901234567890123456789a1234567890=2;
+ a1234567890123456789012345678901234567890	a12345678901234567890123456789a1234567890
+ 5	2

=== added file 'mysql/5.0/ourdelta/mysql-test-fixes/ourdelta-test-fixes.patch'
--- mysql/5.0/ourdelta/mysql-test-fixes/ourdelta-test-fixes.patch	1970-01-01 00:00:00 +0000
+++ mysql/5.0/ourdelta/mysql-test-fixes/ourdelta-test-fixes.patch	2009-10-01 11:15:33 +0000
@@ -0,0 +1,694 @@
+Index: mysql-5.0.86/mysql-test/suite/funcs_1/r/is_columns_is.result
+===================================================================
+--- mysql-5.0.86.orig/mysql-test/suite/funcs_1/r/is_columns_is.result	2009-10-01 20:53:49.000000000 +1000
++++ mysql-5.0.86/mysql-test/suite/funcs_1/r/is_columns_is.result	2009-10-01 20:54:36.000000000 +1000
+@@ -7,6 +7,27 @@
+ NULL	information_schema	CHARACTER_SETS	DEFAULT_COLLATE_NAME	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+ NULL	information_schema	CHARACTER_SETS	DESCRIPTION	3		NO	varchar	60	180	NULL	NULL	utf8	utf8_general_ci	varchar(60)			select	
+ NULL	information_schema	CHARACTER_SETS	MAXLEN	4	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(3)			select	
++NULL	information_schema	CLIENT_STATISTICS	ACCESS_DENIED	20	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	CLIENT_STATISTICS	BINLOG_BYTES_WRITTEN	9	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	CLIENT_STATISTICS	BUSY_TIME	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	CLIENT_STATISTICS	BYTES_RECEIVED	7	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	CLIENT_STATISTICS	BYTES_SENT	8	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	CLIENT_STATISTICS	CLIENT	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
++NULL	information_schema	CLIENT_STATISTICS	COMMIT_TRANSACTIONS	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	CLIENT_STATISTICS	CONCURRENT_CONNECTIONS	3	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	CLIENT_STATISTICS	CONNECTED_TIME	4	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	CLIENT_STATISTICS	CPU_TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	CLIENT_STATISTICS	DENIED_CONNECTIONS	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	CLIENT_STATISTICS	EMPTY_QUERIES	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	CLIENT_STATISTICS	LOST_CONNECTIONS	19	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	CLIENT_STATISTICS	OTHER_COMMANDS	15	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	CLIENT_STATISTICS	ROLLBACK_TRANSACTIONS	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	CLIENT_STATISTICS	ROWS_FETCHED	10	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	CLIENT_STATISTICS	ROWS_UPDATED	11	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	CLIENT_STATISTICS	SELECT_COMMANDS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	CLIENT_STATISTICS	TABLE_ROWS_READ	12	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	CLIENT_STATISTICS	TOTAL_CONNECTIONS	2	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	CLIENT_STATISTICS	UPDATE_COMMANDS	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+ NULL	information_schema	COLLATIONS	CHARACTER_SET_NAME	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+ NULL	information_schema	COLLATIONS	COLLATION_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+ NULL	information_schema	COLLATIONS	ID	3	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(11)			select	
+@@ -41,6 +62,35 @@
+ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	512	1536	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select	
+ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
++NULL	information_schema	INDEX_STATISTICS	INDEX_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
++NULL	information_schema	INDEX_STATISTICS	ROWS_READ	4	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	INDEX_STATISTICS	TABLE_NAME	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
++NULL	information_schema	INDEX_STATISTICS	TABLE_SCHEMA	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
++NULL	information_schema	INNODB_BUFFER_POOL_CONTENT	BLOCK_NUM	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	INNODB_BUFFER_POOL_CONTENT	DATASIZE	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	INNODB_BUFFER_POOL_CONTENT	FIX_COUNT	7	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	INNODB_BUFFER_POOL_CONTENT	FLUSH_TYPE	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	INNODB_BUFFER_POOL_CONTENT	INDEX_NAME	11		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
++NULL	information_schema	INNODB_BUFFER_POOL_CONTENT	LRU_POSITION	8	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	INNODB_BUFFER_POOL_CONTENT	OFFSET	3	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	INNODB_BUFFER_POOL_CONTENT	PAGE_TYPE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
++NULL	information_schema	INNODB_BUFFER_POOL_CONTENT	PAGE_TYPE_ID	9	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	INNODB_BUFFER_POOL_CONTENT	RECORDS	4	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	INNODB_BUFFER_POOL_CONTENT	SPACE	2	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	INNODB_BUFFER_POOL_CONTENT	TABLE_NAME	13		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
++NULL	information_schema	INNODB_BUFFER_POOL_CONTENT	TABLE_SCHEMA	12		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
++NULL	information_schema	INNODB_IO_PATTERN	INDEX_ID	3	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(11)			select	
++NULL	information_schema	INNODB_IO_PATTERN	INDEX_NAME	5		NO	varchar	32	96	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select	
++NULL	information_schema	INNODB_IO_PATTERN	N_READ	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(11)			select	
++NULL	information_schema	INNODB_IO_PATTERN	N_WRITE	7	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(11)			select	
++NULL	information_schema	INNODB_IO_PATTERN	OFFSET	2	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(11)			select	
++NULL	information_schema	INNODB_IO_PATTERN	SPACE	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(11)			select	
++NULL	information_schema	INNODB_IO_PATTERN	TABLE_NAME	4		NO	varchar	32	96	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select	
++NULL	information_schema	INNODB_RSEG	CURR_SIZE	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	INNODB_RSEG	MAX_SIZE	4	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	INNODB_RSEG	PAGE_NO	3	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	INNODB_RSEG	RSEG_ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	INNODB_RSEG	SPACE_ID	2	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+ NULL	information_schema	KEY_COLUMN_USAGE	COLUMN_NAME	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+ NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	512	1536	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select	
+ NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+@@ -53,6 +103,15 @@
+ NULL	information_schema	KEY_COLUMN_USAGE	TABLE_CATALOG	4	NULL	YES	varchar	512	1536	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select	
+ NULL	information_schema	KEY_COLUMN_USAGE	TABLE_NAME	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+ NULL	information_schema	KEY_COLUMN_USAGE	TABLE_SCHEMA	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
++NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
++NULL	information_schema	PROCESSLIST	DB	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
++NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
++NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
++NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
++NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
++NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
++NULL	information_schema	PROCESSLIST	TIME_MS	9	0.000	NO	decimal	NULL	NULL	22	3	NULL	NULL	decimal(22,3)			select	
++NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+ NULL	information_schema	ROUTINES	CREATED	16	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+ NULL	information_schema	ROUTINES	DEFINER	20		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
+ NULL	information_schema	ROUTINES	DTD_IDENTIFIER	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+@@ -131,6 +190,11 @@
+ NULL	information_schema	TABLE_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	512	1536	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select	
+ NULL	information_schema	TABLE_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+ NULL	information_schema	TABLE_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
++NULL	information_schema	TABLE_STATISTICS	ROWS_CHANGED	4	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	TABLE_STATISTICS	ROWS_CHANGED_X_INDEXES	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	TABLE_STATISTICS	ROWS_READ	3	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	TABLE_STATISTICS	TABLE_NAME	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
++NULL	information_schema	TABLE_STATISTICS	TABLE_SCHEMA	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+ NULL	information_schema	TRIGGERS	ACTION_CONDITION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+ NULL	information_schema	TRIGGERS	ACTION_ORDER	8	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+ NULL	information_schema	TRIGGERS	ACTION_ORIENTATION	11		NO	varchar	9	27	NULL	NULL	utf8	utf8_general_ci	varchar(9)			select	
+@@ -154,6 +218,27 @@
+ NULL	information_schema	USER_PRIVILEGES	IS_GRANTABLE	4		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+ NULL	information_schema	USER_PRIVILEGES	PRIVILEGE_TYPE	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+ NULL	information_schema	USER_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	512	1536	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select	
++NULL	information_schema	USER_STATISTICS	ACCESS_DENIED	20	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	USER_STATISTICS	BINLOG_BYTES_WRITTEN	9	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	USER_STATISTICS	BUSY_TIME	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	USER_STATISTICS	BYTES_RECEIVED	7	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	USER_STATISTICS	BYTES_SENT	8	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	USER_STATISTICS	COMMIT_TRANSACTIONS	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	USER_STATISTICS	CONCURRENT_CONNECTIONS	3	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	USER_STATISTICS	CONNECTED_TIME	4	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	USER_STATISTICS	CPU_TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	USER_STATISTICS	DENIED_CONNECTIONS	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	USER_STATISTICS	EMPTY_QUERIES	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	USER_STATISTICS	LOST_CONNECTIONS	19	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	USER_STATISTICS	OTHER_COMMANDS	15	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	USER_STATISTICS	ROLLBACK_TRANSACTIONS	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	USER_STATISTICS	ROWS_FETCHED	10	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	USER_STATISTICS	ROWS_UPDATED	11	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	USER_STATISTICS	SELECT_COMMANDS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	USER_STATISTICS	TABLE_ROWS_READ	12	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	USER_STATISTICS	TOTAL_CONNECTIONS	2	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	USER_STATISTICS	UPDATE_COMMANDS	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
++NULL	information_schema	USER_STATISTICS	USER	1		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+ NULL	information_schema	VIEWS	CHECK_OPTION	5		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+ NULL	information_schema	VIEWS	DEFINER	7		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
+ NULL	information_schema	VIEWS	IS_UPDATABLE	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+@@ -202,6 +287,7 @@
+ COL_CML	DATA_TYPE	CHARACTER_SET_NAME	COLLATION_NAME
+ NULL	bigint	NULL	NULL
+ NULL	datetime	NULL	NULL
++NULL	decimal	NULL	NULL
+ --> CHAR(0) is allowed (see manual), and here both CHARACHTER_* values
+ --> are 0, which is intended behavior, and the result of 0 / 0 IS NULL
+ SELECT CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH AS COL_CML,
+@@ -223,6 +309,27 @@
+ 3.0000	information_schema	CHARACTER_SETS	DEFAULT_COLLATE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+ 3.0000	information_schema	CHARACTER_SETS	DESCRIPTION	varchar	60	180	utf8	utf8_general_ci	varchar(60)
+ NULL	information_schema	CHARACTER_SETS	MAXLEN	bigint	NULL	NULL	NULL	NULL	bigint(3)
++3.0000	information_schema	CLIENT_STATISTICS	CLIENT	varchar	64	192	utf8	utf8_general_ci	varchar(64)
++NULL	information_schema	CLIENT_STATISTICS	TOTAL_CONNECTIONS	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	CLIENT_STATISTICS	CONCURRENT_CONNECTIONS	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	CLIENT_STATISTICS	CONNECTED_TIME	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	CLIENT_STATISTICS	BUSY_TIME	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	CLIENT_STATISTICS	CPU_TIME	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	CLIENT_STATISTICS	BYTES_RECEIVED	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	CLIENT_STATISTICS	BYTES_SENT	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	CLIENT_STATISTICS	BINLOG_BYTES_WRITTEN	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	CLIENT_STATISTICS	ROWS_FETCHED	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	CLIENT_STATISTICS	ROWS_UPDATED	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	CLIENT_STATISTICS	TABLE_ROWS_READ	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	CLIENT_STATISTICS	SELECT_COMMANDS	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	CLIENT_STATISTICS	UPDATE_COMMANDS	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	CLIENT_STATISTICS	OTHER_COMMANDS	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	CLIENT_STATISTICS	COMMIT_TRANSACTIONS	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	CLIENT_STATISTICS	ROLLBACK_TRANSACTIONS	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	CLIENT_STATISTICS	DENIED_CONNECTIONS	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	CLIENT_STATISTICS	LOST_CONNECTIONS	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	CLIENT_STATISTICS	ACCESS_DENIED	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	CLIENT_STATISTICS	EMPTY_QUERIES	bigint	NULL	NULL	NULL	NULL	bigint(21)
+ 3.0000	information_schema	COLLATIONS	COLLATION_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+ 3.0000	information_schema	COLLATIONS	CHARACTER_SET_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+ NULL	information_schema	COLLATIONS	ID	bigint	NULL	NULL	NULL	NULL	bigint(11)
+@@ -257,6 +364,35 @@
+ 3.0000	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+ 3.0000	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+ 3.0000	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	varchar	3	9	utf8	utf8_general_ci	varchar(3)
++3.0000	information_schema	INDEX_STATISTICS	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
++3.0000	information_schema	INDEX_STATISTICS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
++3.0000	information_schema	INDEX_STATISTICS	INDEX_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
++NULL	information_schema	INDEX_STATISTICS	ROWS_READ	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	INNODB_BUFFER_POOL_CONTENT	BLOCK_NUM	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	INNODB_BUFFER_POOL_CONTENT	SPACE	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	INNODB_BUFFER_POOL_CONTENT	OFFSET	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	INNODB_BUFFER_POOL_CONTENT	RECORDS	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	INNODB_BUFFER_POOL_CONTENT	DATASIZE	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	INNODB_BUFFER_POOL_CONTENT	FLUSH_TYPE	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	INNODB_BUFFER_POOL_CONTENT	FIX_COUNT	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	INNODB_BUFFER_POOL_CONTENT	LRU_POSITION	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	INNODB_BUFFER_POOL_CONTENT	PAGE_TYPE_ID	bigint	NULL	NULL	NULL	NULL	bigint(21)
++3.0000	information_schema	INNODB_BUFFER_POOL_CONTENT	PAGE_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
++3.0000	information_schema	INNODB_BUFFER_POOL_CONTENT	INDEX_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
++3.0000	information_schema	INNODB_BUFFER_POOL_CONTENT	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
++3.0000	information_schema	INNODB_BUFFER_POOL_CONTENT	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
++NULL	information_schema	INNODB_IO_PATTERN	SPACE	bigint	NULL	NULL	NULL	NULL	bigint(11)
++NULL	information_schema	INNODB_IO_PATTERN	OFFSET	bigint	NULL	NULL	NULL	NULL	bigint(11)
++NULL	information_schema	INNODB_IO_PATTERN	INDEX_ID	bigint	NULL	NULL	NULL	NULL	bigint(11)
++3.0000	information_schema	INNODB_IO_PATTERN	TABLE_NAME	varchar	32	96	utf8	utf8_general_ci	varchar(32)
++3.0000	information_schema	INNODB_IO_PATTERN	INDEX_NAME	varchar	32	96	utf8	utf8_general_ci	varchar(32)
++NULL	information_schema	INNODB_IO_PATTERN	N_READ	bigint	NULL	NULL	NULL	NULL	bigint(11)
++NULL	information_schema	INNODB_IO_PATTERN	N_WRITE	bigint	NULL	NULL	NULL	NULL	bigint(11)
++NULL	information_schema	INNODB_RSEG	RSEG_ID	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	INNODB_RSEG	SPACE_ID	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	INNODB_RSEG	PAGE_NO	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	INNODB_RSEG	MAX_SIZE	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	INNODB_RSEG	CURR_SIZE	bigint	NULL	NULL	NULL	NULL	bigint(21)
+ 3.0000	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	varchar	512	1536	utf8	utf8_general_ci	varchar(512)
+ 3.0000	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+ 3.0000	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+@@ -269,6 +405,15 @@
+ 3.0000	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+ 3.0000	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+ 3.0000	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
++NULL	information_schema	PROCESSLIST	ID	bigint	NULL	NULL	NULL	NULL	bigint(4)
++3.0000	information_schema	PROCESSLIST	USER	varchar	16	48	utf8	utf8_general_ci	varchar(16)
++3.0000	information_schema	PROCESSLIST	HOST	varchar	64	192	utf8	utf8_general_ci	varchar(64)
++3.0000	information_schema	PROCESSLIST	DB	varchar	64	192	utf8	utf8_general_ci	varchar(64)
++3.0000	information_schema	PROCESSLIST	COMMAND	varchar	16	48	utf8	utf8_general_ci	varchar(16)
++NULL	information_schema	PROCESSLIST	TIME	bigint	NULL	NULL	NULL	NULL	bigint(7)
++3.0000	information_schema	PROCESSLIST	STATE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
++1.0000	information_schema	PROCESSLIST	INFO	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
++NULL	information_schema	PROCESSLIST	TIME_MS	decimal	NULL	NULL	NULL	NULL	decimal(22,3)
+ 3.0000	information_schema	ROUTINES	SPECIFIC_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+ 3.0000	information_schema	ROUTINES	ROUTINE_CATALOG	varchar	512	1536	utf8	utf8_general_ci	varchar(512)
+ 3.0000	information_schema	ROUTINES	ROUTINE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+@@ -347,6 +492,11 @@
+ 3.0000	information_schema	TABLE_PRIVILEGES	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+ 3.0000	information_schema	TABLE_PRIVILEGES	PRIVILEGE_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+ 3.0000	information_schema	TABLE_PRIVILEGES	IS_GRANTABLE	varchar	3	9	utf8	utf8_general_ci	varchar(3)
++3.0000	information_schema	TABLE_STATISTICS	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
++3.0000	information_schema	TABLE_STATISTICS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
++NULL	information_schema	TABLE_STATISTICS	ROWS_READ	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	TABLE_STATISTICS	ROWS_CHANGED	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	TABLE_STATISTICS	ROWS_CHANGED_X_INDEXES	bigint	NULL	NULL	NULL	NULL	bigint(21)
+ 3.0000	information_schema	TRIGGERS	TRIGGER_CATALOG	varchar	512	1536	utf8	utf8_general_ci	varchar(512)
+ 3.0000	information_schema	TRIGGERS	TRIGGER_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+ 3.0000	information_schema	TRIGGERS	TRIGGER_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+@@ -370,6 +520,27 @@
+ 3.0000	information_schema	USER_PRIVILEGES	TABLE_CATALOG	varchar	512	1536	utf8	utf8_general_ci	varchar(512)
+ 3.0000	information_schema	USER_PRIVILEGES	PRIVILEGE_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+ 3.0000	information_schema	USER_PRIVILEGES	IS_GRANTABLE	varchar	3	9	utf8	utf8_general_ci	varchar(3)
++3.0000	information_schema	USER_STATISTICS	USER	varchar	16	48	utf8	utf8_general_ci	varchar(16)
++NULL	information_schema	USER_STATISTICS	TOTAL_CONNECTIONS	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	USER_STATISTICS	CONCURRENT_CONNECTIONS	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	USER_STATISTICS	CONNECTED_TIME	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	USER_STATISTICS	BUSY_TIME	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	USER_STATISTICS	CPU_TIME	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	USER_STATISTICS	BYTES_RECEIVED	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	USER_STATISTICS	BYTES_SENT	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	USER_STATISTICS	BINLOG_BYTES_WRITTEN	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	USER_STATISTICS	ROWS_FETCHED	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	USER_STATISTICS	ROWS_UPDATED	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	USER_STATISTICS	TABLE_ROWS_READ	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	USER_STATISTICS	SELECT_COMMANDS	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	USER_STATISTICS	UPDATE_COMMANDS	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	USER_STATISTICS	OTHER_COMMANDS	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	USER_STATISTICS	COMMIT_TRANSACTIONS	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	USER_STATISTICS	ROLLBACK_TRANSACTIONS	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	USER_STATISTICS	DENIED_CONNECTIONS	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	USER_STATISTICS	LOST_CONNECTIONS	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	USER_STATISTICS	ACCESS_DENIED	bigint	NULL	NULL	NULL	NULL	bigint(21)
++NULL	information_schema	USER_STATISTICS	EMPTY_QUERIES	bigint	NULL	NULL	NULL	NULL	bigint(21)
+ 3.0000	information_schema	VIEWS	TABLE_CATALOG	varchar	512	1536	utf8	utf8_general_ci	varchar(512)
+ 3.0000	information_schema	VIEWS	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+ 3.0000	information_schema	VIEWS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+Index: mysql-5.0.86/mysql-test/suite/funcs_1/r/is_tables_is.result
+===================================================================
+--- mysql-5.0.86.orig/mysql-test/suite/funcs_1/r/is_tables_is.result	2009-10-01 20:53:42.000000000 +1000
++++ mysql-5.0.86/mysql-test/suite/funcs_1/r/is_tables_is.result	2009-10-01 20:54:40.000000000 +1000
+@@ -38,6 +38,29 @@
+ Separator	-----------------------------------------------------
+ TABLE_CATALOG	NULL
+ TABLE_SCHEMA	information_schema
++TABLE_NAME	CLIENT_STATISTICS
++TABLE_TYPE	SYSTEM VIEW
++ENGINE	MEMORY
++VERSION	0
++ROW_FORMAT	Fixed
++TABLE_ROWS	#TBLR#
++AVG_ROW_LENGTH	#ARL#
++DATA_LENGTH	#DL#
++MAX_DATA_LENGTH	#MDL#
++INDEX_LENGTH	#IL#
++DATA_FREE	#DF#
++AUTO_INCREMENT	NULL
++CREATE_TIME	#CRT#
++UPDATE_TIME	#UT#
++CHECK_TIME	#CT#
++TABLE_COLLATION	utf8_general_ci
++CHECKSUM	NULL
++CREATE_OPTIONS	#CO#
++TABLE_COMMENT	#TC#
++user_comment	
++Separator	-----------------------------------------------------
++TABLE_CATALOG	NULL
++TABLE_SCHEMA	information_schema
+ TABLE_NAME	COLLATIONS
+ TABLE_TYPE	SYSTEM VIEW
+ ENGINE	MEMORY
+@@ -130,6 +153,98 @@
+ Separator	-----------------------------------------------------
+ TABLE_CATALOG	NULL
+ TABLE_SCHEMA	information_schema
++TABLE_NAME	INDEX_STATISTICS
++TABLE_TYPE	SYSTEM VIEW
++ENGINE	MEMORY
++VERSION	0
++ROW_FORMAT	Fixed
++TABLE_ROWS	#TBLR#
++AVG_ROW_LENGTH	#ARL#
++DATA_LENGTH	#DL#
++MAX_DATA_LENGTH	#MDL#
++INDEX_LENGTH	#IL#
++DATA_FREE	#DF#
++AUTO_INCREMENT	NULL
++CREATE_TIME	#CRT#
++UPDATE_TIME	#UT#
++CHECK_TIME	#CT#
++TABLE_COLLATION	utf8_general_ci
++CHECKSUM	NULL
++CREATE_OPTIONS	#CO#
++TABLE_COMMENT	#TC#
++user_comment	
++Separator	-----------------------------------------------------
++TABLE_CATALOG	NULL
++TABLE_SCHEMA	information_schema
++TABLE_NAME	INNODB_BUFFER_POOL_CONTENT
++TABLE_TYPE	SYSTEM VIEW
++ENGINE	MEMORY
++VERSION	0
++ROW_FORMAT	Fixed
++TABLE_ROWS	#TBLR#
++AVG_ROW_LENGTH	#ARL#
++DATA_LENGTH	#DL#
++MAX_DATA_LENGTH	#MDL#
++INDEX_LENGTH	#IL#
++DATA_FREE	#DF#
++AUTO_INCREMENT	NULL
++CREATE_TIME	#CRT#
++UPDATE_TIME	#UT#
++CHECK_TIME	#CT#
++TABLE_COLLATION	utf8_general_ci
++CHECKSUM	NULL
++CREATE_OPTIONS	#CO#
++TABLE_COMMENT	#TC#
++user_comment	
++Separator	-----------------------------------------------------
++TABLE_CATALOG	NULL
++TABLE_SCHEMA	information_schema
++TABLE_NAME	INNODB_IO_PATTERN
++TABLE_TYPE	SYSTEM VIEW
++ENGINE	MEMORY
++VERSION	0
++ROW_FORMAT	Fixed
++TABLE_ROWS	#TBLR#
++AVG_ROW_LENGTH	#ARL#
++DATA_LENGTH	#DL#
++MAX_DATA_LENGTH	#MDL#
++INDEX_LENGTH	#IL#
++DATA_FREE	#DF#
++AUTO_INCREMENT	NULL
++CREATE_TIME	#CRT#
++UPDATE_TIME	#UT#
++CHECK_TIME	#CT#
++TABLE_COLLATION	utf8_general_ci
++CHECKSUM	NULL
++CREATE_OPTIONS	#CO#
++TABLE_COMMENT	#TC#
++user_comment	
++Separator	-----------------------------------------------------
++TABLE_CATALOG	NULL
++TABLE_SCHEMA	information_schema
++TABLE_NAME	INNODB_RSEG
++TABLE_TYPE	SYSTEM VIEW
++ENGINE	MEMORY
++VERSION	0
++ROW_FORMAT	Fixed
++TABLE_ROWS	#TBLR#
++AVG_ROW_LENGTH	#ARL#
++DATA_LENGTH	#DL#
++MAX_DATA_LENGTH	#MDL#
++INDEX_LENGTH	#IL#
++DATA_FREE	#DF#
++AUTO_INCREMENT	NULL
++CREATE_TIME	#CRT#
++UPDATE_TIME	#UT#
++CHECK_TIME	#CT#
++TABLE_COLLATION	utf8_general_ci
++CHECKSUM	NULL
++CREATE_OPTIONS	#CO#
++TABLE_COMMENT	#TC#
++user_comment	
++Separator	-----------------------------------------------------
++TABLE_CATALOG	NULL
++TABLE_SCHEMA	information_schema
+ TABLE_NAME	KEY_COLUMN_USAGE
+ TABLE_TYPE	SYSTEM VIEW
+ ENGINE	MEMORY
+@@ -153,6 +268,29 @@
+ Separator	-----------------------------------------------------
+ TABLE_CATALOG	NULL
+ TABLE_SCHEMA	information_schema
++TABLE_NAME	PROCESSLIST
++TABLE_TYPE	SYSTEM VIEW
++ENGINE	MyISAM
++VERSION	0
++ROW_FORMAT	Dynamic
++TABLE_ROWS	#TBLR#
++AVG_ROW_LENGTH	#ARL#
++DATA_LENGTH	#DL#
++MAX_DATA_LENGTH	#MDL#
++INDEX_LENGTH	#IL#
++DATA_FREE	#DF#
++AUTO_INCREMENT	NULL
++CREATE_TIME	#CRT#
++UPDATE_TIME	#UT#
++CHECK_TIME	#CT#
++TABLE_COLLATION	utf8_general_ci
++CHECKSUM	NULL
++CREATE_OPTIONS	#CO#
++TABLE_COMMENT	#TC#
++user_comment	
++Separator	-----------------------------------------------------
++TABLE_CATALOG	NULL
++TABLE_SCHEMA	information_schema
+ TABLE_NAME	ROUTINES
+ TABLE_TYPE	SYSTEM VIEW
+ ENGINE	MyISAM
+@@ -314,6 +452,29 @@
+ Separator	-----------------------------------------------------
+ TABLE_CATALOG	NULL
+ TABLE_SCHEMA	information_schema
++TABLE_NAME	TABLE_STATISTICS
++TABLE_TYPE	SYSTEM VIEW
++ENGINE	MEMORY
++VERSION	0
++ROW_FORMAT	Fixed
++TABLE_ROWS	#TBLR#
++AVG_ROW_LENGTH	#ARL#
++DATA_LENGTH	#DL#
++MAX_DATA_LENGTH	#MDL#
++INDEX_LENGTH	#IL#
++DATA_FREE	#DF#
++AUTO_INCREMENT	NULL
++CREATE_TIME	#CRT#
++UPDATE_TIME	#UT#
++CHECK_TIME	#CT#
++TABLE_COLLATION	utf8_general_ci
++CHECKSUM	NULL
++CREATE_OPTIONS	#CO#
++TABLE_COMMENT	#TC#
++user_comment	
++Separator	-----------------------------------------------------
++TABLE_CATALOG	NULL
++TABLE_SCHEMA	information_schema
+ TABLE_NAME	TRIGGERS
+ TABLE_TYPE	SYSTEM VIEW
+ ENGINE	MyISAM
+@@ -360,6 +521,29 @@
+ Separator	-----------------------------------------------------
+ TABLE_CATALOG	NULL
+ TABLE_SCHEMA	information_schema
++TABLE_NAME	USER_STATISTICS
++TABLE_TYPE	SYSTEM VIEW
++ENGINE	MEMORY
++VERSION	0
++ROW_FORMAT	Fixed
++TABLE_ROWS	#TBLR#
++AVG_ROW_LENGTH	#ARL#
++DATA_LENGTH	#DL#
++MAX_DATA_LENGTH	#MDL#
++INDEX_LENGTH	#IL#
++DATA_FREE	#DF#
++AUTO_INCREMENT	NULL
++CREATE_TIME	#CRT#
++UPDATE_TIME	#UT#
++CHECK_TIME	#CT#
++TABLE_COLLATION	utf8_general_ci
++CHECKSUM	NULL
++CREATE_OPTIONS	#CO#
++TABLE_COMMENT	#TC#
++user_comment	
++Separator	-----------------------------------------------------
++TABLE_CATALOG	NULL
++TABLE_SCHEMA	information_schema
+ TABLE_NAME	VIEWS
+ TABLE_TYPE	SYSTEM VIEW
+ ENGINE	MyISAM
+@@ -423,6 +607,29 @@
+ Separator	-----------------------------------------------------
+ TABLE_CATALOG	NULL
+ TABLE_SCHEMA	information_schema
++TABLE_NAME	CLIENT_STATISTICS
++TABLE_TYPE	SYSTEM VIEW
++ENGINE	MEMORY
++VERSION	0
++ROW_FORMAT	Fixed
++TABLE_ROWS	#TBLR#
++AVG_ROW_LENGTH	#ARL#
++DATA_LENGTH	#DL#
++MAX_DATA_LENGTH	#MDL#
++INDEX_LENGTH	#IL#
++DATA_FREE	#DF#
++AUTO_INCREMENT	NULL
++CREATE_TIME	#CRT#
++UPDATE_TIME	#UT#
++CHECK_TIME	#CT#
++TABLE_COLLATION	utf8_general_ci
++CHECKSUM	NULL
++CREATE_OPTIONS	#CO#
++TABLE_COMMENT	#TC#
++user_comment	
++Separator	-----------------------------------------------------
++TABLE_CATALOG	NULL
++TABLE_SCHEMA	information_schema
+ TABLE_NAME	COLLATIONS
+ TABLE_TYPE	SYSTEM VIEW
+ ENGINE	MEMORY
+@@ -515,6 +722,98 @@
+ Separator	-----------------------------------------------------
+ TABLE_CATALOG	NULL
+ TABLE_SCHEMA	information_schema
++TABLE_NAME	INDEX_STATISTICS
++TABLE_TYPE	SYSTEM VIEW
++ENGINE	MEMORY
++VERSION	0
++ROW_FORMAT	Fixed
++TABLE_ROWS	#TBLR#
++AVG_ROW_LENGTH	#ARL#
++DATA_LENGTH	#DL#
++MAX_DATA_LENGTH	#MDL#
++INDEX_LENGTH	#IL#
++DATA_FREE	#DF#
++AUTO_INCREMENT	NULL
++CREATE_TIME	#CRT#
++UPDATE_TIME	#UT#
++CHECK_TIME	#CT#
++TABLE_COLLATION	utf8_general_ci
++CHECKSUM	NULL
++CREATE_OPTIONS	#CO#
++TABLE_COMMENT	#TC#
++user_comment	
++Separator	-----------------------------------------------------
++TABLE_CATALOG	NULL
++TABLE_SCHEMA	information_schema
++TABLE_NAME	INNODB_BUFFER_POOL_CONTENT
++TABLE_TYPE	SYSTEM VIEW
++ENGINE	MEMORY
++VERSION	0
++ROW_FORMAT	Fixed
++TABLE_ROWS	#TBLR#
++AVG_ROW_LENGTH	#ARL#
++DATA_LENGTH	#DL#
++MAX_DATA_LENGTH	#MDL#
++INDEX_LENGTH	#IL#
++DATA_FREE	#DF#
++AUTO_INCREMENT	NULL
++CREATE_TIME	#CRT#
++UPDATE_TIME	#UT#
++CHECK_TIME	#CT#
++TABLE_COLLATION	utf8_general_ci
++CHECKSUM	NULL
++CREATE_OPTIONS	#CO#
++TABLE_COMMENT	#TC#
++user_comment	
++Separator	-----------------------------------------------------
++TABLE_CATALOG	NULL
++TABLE_SCHEMA	information_schema
++TABLE_NAME	INNODB_IO_PATTERN
++TABLE_TYPE	SYSTEM VIEW
++ENGINE	MEMORY
++VERSION	0
++ROW_FORMAT	Fixed
++TABLE_ROWS	#TBLR#
++AVG_ROW_LENGTH	#ARL#
++DATA_LENGTH	#DL#
++MAX_DATA_LENGTH	#MDL#
++INDEX_LENGTH	#IL#
++DATA_FREE	#DF#
++AUTO_INCREMENT	NULL
++CREATE_TIME	#CRT#
++UPDATE_TIME	#UT#
++CHECK_TIME	#CT#
++TABLE_COLLATION	utf8_general_ci
++CHECKSUM	NULL
++CREATE_OPTIONS	#CO#
++TABLE_COMMENT	#TC#
++user_comment	
++Separator	-----------------------------------------------------
++TABLE_CATALOG	NULL
++TABLE_SCHEMA	information_schema
++TABLE_NAME	INNODB_RSEG
++TABLE_TYPE	SYSTEM VIEW
++ENGINE	MEMORY
++VERSION	0
++ROW_FORMAT	Fixed
++TABLE_ROWS	#TBLR#
++AVG_ROW_LENGTH	#ARL#
++DATA_LENGTH	#DL#
++MAX_DATA_LENGTH	#MDL#
++INDEX_LENGTH	#IL#
++DATA_FREE	#DF#
++AUTO_INCREMENT	NULL
++CREATE_TIME	#CRT#
++UPDATE_TIME	#UT#
++CHECK_TIME	#CT#
++TABLE_COLLATION	utf8_general_ci
++CHECKSUM	NULL
++CREATE_OPTIONS	#CO#
++TABLE_COMMENT	#TC#
++user_comment	
++Separator	-----------------------------------------------------
++TABLE_CATALOG	NULL
++TABLE_SCHEMA	information_schema
+ TABLE_NAME	KEY_COLUMN_USAGE
+ TABLE_TYPE	SYSTEM VIEW
+ ENGINE	MEMORY
+@@ -538,6 +837,29 @@
+ Separator	-----------------------------------------------------
+ TABLE_CATALOG	NULL
+ TABLE_SCHEMA	information_schema
++TABLE_NAME	PROCESSLIST
++TABLE_TYPE	SYSTEM VIEW
++ENGINE	MyISAM
++VERSION	0
++ROW_FORMAT	Dynamic
++TABLE_ROWS	#TBLR#
++AVG_ROW_LENGTH	#ARL#
++DATA_LENGTH	#DL#
++MAX_DATA_LENGTH	#MDL#
++INDEX_LENGTH	#IL#
++DATA_FREE	#DF#
++AUTO_INCREMENT	NULL
++CREATE_TIME	#CRT#
++UPDATE_TIME	#UT#
++CHECK_TIME	#CT#
++TABLE_COLLATION	utf8_general_ci
++CHECKSUM	NULL
++CREATE_OPTIONS	#CO#
++TABLE_COMMENT	#TC#
++user_comment	
++Separator	-----------------------------------------------------
++TABLE_CATALOG	NULL
++TABLE_SCHEMA	information_schema
+ TABLE_NAME	ROUTINES
+ TABLE_TYPE	SYSTEM VIEW
+ ENGINE	MyISAM
+@@ -699,6 +1021,29 @@
+ Separator	-----------------------------------------------------
+ TABLE_CATALOG	NULL
+ TABLE_SCHEMA	information_schema
++TABLE_NAME	TABLE_STATISTICS
++TABLE_TYPE	SYSTEM VIEW
++ENGINE	MEMORY
++VERSION	0
++ROW_FORMAT	Fixed
++TABLE_ROWS	#TBLR#
++AVG_ROW_LENGTH	#ARL#
++DATA_LENGTH	#DL#
++MAX_DATA_LENGTH	#MDL#
++INDEX_LENGTH	#IL#
++DATA_FREE	#DF#
++AUTO_INCREMENT	NULL
++CREATE_TIME	#CRT#
++UPDATE_TIME	#UT#
++CHECK_TIME	#CT#
++TABLE_COLLATION	utf8_general_ci
++CHECKSUM	NULL
++CREATE_OPTIONS	#CO#
++TABLE_COMMENT	#TC#
++user_comment	
++Separator	-----------------------------------------------------
++TABLE_CATALOG	NULL
++TABLE_SCHEMA	information_schema
+ TABLE_NAME	TRIGGERS
+ TABLE_TYPE	SYSTEM VIEW
+ ENGINE	MyISAM
+@@ -745,6 +1090,29 @@
+ Separator	-----------------------------------------------------
+ TABLE_CATALOG	NULL
+ TABLE_SCHEMA	information_schema
++TABLE_NAME	USER_STATISTICS
++TABLE_TYPE	SYSTEM VIEW
++ENGINE	MEMORY
++VERSION	0
++ROW_FORMAT	Fixed
++TABLE_ROWS	#TBLR#
++AVG_ROW_LENGTH	#ARL#
++DATA_LENGTH	#DL#
++MAX_DATA_LENGTH	#MDL#
++INDEX_LENGTH	#IL#
++DATA_FREE	#DF#
++AUTO_INCREMENT	NULL
++CREATE_TIME	#CRT#
++UPDATE_TIME	#UT#
++CHECK_TIME	#CT#
++TABLE_COLLATION	utf8_general_ci
++CHECKSUM	NULL
++CREATE_OPTIONS	#CO#
++TABLE_COMMENT	#TC#
++user_comment	
++Separator	-----------------------------------------------------
++TABLE_CATALOG	NULL
++TABLE_SCHEMA	information_schema
+ TABLE_NAME	VIEWS
+ TABLE_TYPE	SYSTEM VIEW
+ ENGINE	MyISAM

=== modified file 'mysql/5.0/ourdelta/mysql_install_db/mysql_install_db.patch'
--- mysql/5.0/ourdelta/mysql_install_db/mysql_install_db.patch	2008-11-03 23:45:07 +0000
+++ mysql/5.0/ourdelta/mysql_install_db/mysql_install_db.patch	2009-10-01 11:15:33 +0000
@@ -1,8 +1,8 @@
-Index: mysql-5.0.67/scripts/mysql_install_db.sh
+Index: mysql-5.0.86/scripts/mysql_install_db.sh
 ===================================================================
---- mysql-5.0.67.orig/scripts/mysql_install_db.sh
-+++ mysql-5.0.67/scripts/mysql_install_db.sh
-@@ -376,11 +376,7 @@ then
+--- mysql-5.0.86.orig/scripts/mysql_install_db.sh	2009-09-10 05:04:45.000000000 +1000
++++ mysql-5.0.86/scripts/mysql_install_db.sh	2009-09-26 12:56:08.000000000 +1000
+@@ -376,11 +376,7 @@
      # At this point, there is no end user, so it does not make sense to print
      # this reminder.
      echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
@@ -15,7 +15,7 @@
      echo "$bindir/mysql_secure_installation"
      echo
      echo "which will also give you the option of removing the test"
-@@ -399,11 +395,16 @@ then
+@@ -399,11 +395,12 @@
        echo "cd mysql-test ; perl mysql-test-run.pl"
        echo
      fi
@@ -25,35 +25,32 @@
 +    echo "submitted in the OurDelta project on Launchpad, simply follow the"
 +    echo "links via http://ourdelta.org/"
      echo
-     echo "The latest information about MySQL is available on the web at"
+-    echo "The latest information about MySQL is available on the web at"
 -    echo "http://www.mysql.com"
 -    echo "Support MySQL by buying support/licenses at http://shop.mysql.com"
-+    echo "http://dev.mysql.com/"
-+    echo "Other information sources are"
-+    echo "- the MySQL Mailing List archives (http://lists.mysql.com/);"
-+    echo "- the MySQL Forums (http://forums.mysql.com/)."
++    echo "For support/consulting/training, see http://ourdelta.org/services"
    fi
    exit 0
  else
-@@ -423,11 +424,17 @@ else
+@@ -422,12 +419,15 @@
+   echo "Try 'mysqld --help' if you have problems with paths. Using --log"
    echo "gives you a log in $ldata that may be helpful."
    echo
-   echo "The latest information about MySQL is available on the web at"
+-  echo "The latest information about MySQL is available on the web at"
 -  echo "http://www.mysql.com"
-+  echo "http://dev.mysql.com/"
-   echo "Please consult the MySQL manual section: 'Problems running mysql_install_db',"
+-  echo "Please consult the MySQL manual section: 'Problems running mysql_install_db',"
++  echo "Please consult the MySQL manual section:"
++  echo "http://dev.mysql.com/doc/refman/5.0/en/mysql-install-db-problems.html"
    echo "and the manual section that describes problems on your OS."
 -  echo "Another information source is the MySQL email archive."
 -  echo "Please check all of the above before mailing us!"
 -  echo "And if you do mail us, you MUST use the @scriptdir@/mysqlbug script!"
-+  echo "Other information sources are"
-+  echo "- the MySQL Mailing List archives (http://lists.mysql.com/);"
-+  echo "- the MySQL Forums (http://forums.mysql.com/)."
-+  echo "Please check all of the above before reporting a bug!"
 +  echo
 +  echo "MySQL bug reports should be submitted through http://bugs.mysql.com/"
 +  echo "Issues related to the OurDelta patches or packaging should be"
 +  echo "submitted in the OurDelta project on Launchpad, simply follow the"
 +  echo "links via http://ourdelta.org/"
++  echo
++  echo "For support/consulting/training, see http://ourdelta.org/services"
    exit 1
  fi

=== added directory 'mysql/5.0/ourdelta/test-no-defaults'
=== added file 'mysql/5.0/ourdelta/test-no-defaults/test-no-defaults.patch'
--- mysql/5.0/ourdelta/test-no-defaults/test-no-defaults.patch	1970-01-01 00:00:00 +0000
+++ mysql/5.0/ourdelta/test-no-defaults/test-no-defaults.patch	2009-10-01 11:15:33 +0000
@@ -0,0 +1,16 @@
+Index: mysql-5.0.86/mysql-test/mysql-test-run-shell.sh
+===================================================================
+--- mysql-5.0.86.orig/mysql-test/mysql-test-run-shell.sh
++++ mysql-5.0.86/mysql-test/mysql-test-run-shell.sh
+@@ -862,9 +862,9 @@ MYSQL_DUMP_DIR="$MYSQL_DUMP"
+ export MYSQL_DUMP_DIR
+ MYSQL_CHECK="$MYSQL_CHECK --no-defaults -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLCHECK_OPT"
+ MYSQL_DUMP="$MYSQL_DUMP --no-defaults -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLDUMP_OPT"
+-MYSQL_SHOW="$MYSQL_SHOW -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLSHOW_OPT"
++MYSQL_SHOW="$MYSQL_SHOW --no-defaults -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLSHOW_OPT"
+ MYSQL_BINLOG="$MYSQL_BINLOG --no-defaults --local-load=$MYSQL_TMP_DIR  --character-sets-dir=$CHARSETSDIR $EXTRA_MYSQLBINLOG_OPT"
+-MYSQL_IMPORT="$MYSQL_IMPORT -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLDUMP_OPT"
++MYSQL_IMPORT="$MYSQL_IMPORT --no-defaults -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLDUMP_OPT"
+ MYSQL_FIX_SYSTEM_TABLES="$MYSQL_FIX_SYSTEM_TABLES --no-defaults --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD --basedir=$BASEDIR --bindir=$CLIENT_BINDIR --verbose"
+ MYSQL="$MYSQL --no-defaults --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD"
+ export MYSQL MYSQL_CHECK MYSQL_DUMP MYSQL_SHOW MYSQL_BINLOG MYSQL_FIX_SYSTEM_TABLES MYSQL_IMPORT

=== modified file 'mysql/5.0/ourdelta/version/version-extra.patch'
--- mysql/5.0/ourdelta/version/version-extra.patch	2009-03-18 06:35:34 +0000
+++ mysql/5.0/ourdelta/version/version-extra.patch	2009-10-01 11:15:33 +0000
@@ -3,7 +3,7 @@
 --- mysql-5.0.67.orig/.ourdelta-version
 +++ mysql-5.0.67/.ourdelta-version
 @@ -1,3 +1,3 @@
- PATCHLEVEL=8
+ PATCHLEVEL=9
  RELEASE_NAME=ourdelta
 -RELEASE_EXTRA=
 +RELEASE_EXTRA=sail

=== modified file 'mysql/5.0/ourdelta/version/version.patch'
--- mysql/5.0/ourdelta/version/version.patch	2009-03-18 06:35:34 +0000
+++ mysql/5.0/ourdelta/version/version.patch	2009-10-01 11:15:33 +0000
@@ -3,6 +3,6 @@
 --- /dev/null
 +++ mysql-5.0.67/.ourdelta-version
 @@ -0,0 +1,3 @@
-+PATCHLEVEL=8
++PATCHLEVEL=9
 +RELEASE_NAME=ourdelta
 +RELEASE_EXTRA=

=== modified file 'mysql/5.0/patches-build-ourdelta'
--- mysql/5.0/patches-build-ourdelta	2009-03-22 22:21:19 +0000
+++ mysql/5.0/patches-build-ourdelta	2009-10-01 11:15:33 +0000
@@ -2,8 +2,11 @@
 # OurDelta (mainline) patches
 #
 ourdelta/version/version.patch
+ourdelta/mysql-test-fixes/mysql-test-fixes.patch
+ourdelta/mysql-test-fixes/ourdelta-test-fixes.patch
 ourdelta/mysql_install_db/mysql_install_db.patch
 ourdelta/configtest/configtest.patch
+ourdelta/test-no-defaults/test-no-defaults.patch
 #
 percona_maintained/show_patches.patch
 #
@@ -13,16 +16,16 @@
 #
 percona_maintained/microslow_innodb.patch
 #
+percona_maintained/profiling_slow.patch
+#
 percona_maintained/userstatv2.patch
 #
 percona_maintained/microsec_process.patch
 #
 percona_maintained/innodb_io_patches.patch
-#
-percona_maintained/mirror_binlog.patch
-#
-# contributed by spinn3r (extracted from Google V2 patch) to ourdelta d7
-#google/if_idlev2/if_idlev2.patch
+# patch still exists but removed from percona patch list (5.0.84-b18)
+#percona_maintained/mirror_binlog.patch
+#
 # disabling freeze because xtrabackup probably deals with all relevant needs
 #google/innodb_freezev2/innodb_freezev2.patch
 
@@ -31,23 +34,29 @@
 #
 percona_maintained/innodb_locks_held.patch
 percona_maintained/innodb_show_bp.patch
-percona_maintained/innodb_show_hashed_memory.patch
 percona_maintained/innodb_check_fragmentation.patch
 percona_maintained/innodb_io_pattern.patch
 percona_maintained/innodb_fsync_source.patch
+percona_maintained/innodb_show_hashed_memory.patch
 percona_maintained/innodb_dict_size_limit.patch
+percona_maintained/innodb_extra_rseg.patch
+percona_maintained/innodb_thread_concurrency_timer_based.patch
+percona_maintained/innodb_use_sys_malloc.patch
+percona_maintained/innodb_recovery_patches.patch
 #
-sphinxsearch/sphinx_engine/sphinx.5.0.77.patch
+sphinxsearch/sphinx_engine/sphinx.5.0.86.patch
 sphinxsearch/sphinx_engine/sphinx_engine.patch
 #
 # contributed by spinn3r (extracted from Google V2 patch) to ourdelta d7
 google/if_idlev2/if_idlev2.patch
 #
+percona_maintained/mysql-test.patch
+#
 # OurDelta Sail (bleeding edge) patches
 #
 ourdelta/version/version-extra.patch
 #
-percona_maintained/split_buf_pool_mutex_fixed_optimistic_safe.patch
+percona_maintained/innodb_split_buf_pool_mutex.patch
 percona_maintained/innodb_rw_lock.patch
 #
 # end of patch file

=== modified file 'mysql/5.0/percona_maintained/innodb_dict_size_limit.patch'
--- mysql/5.0/percona_maintained/innodb_dict_size_limit.patch	2009-03-18 01:10:58 +0000
+++ mysql/5.0/percona_maintained/innodb_dict_size_limit.patch	2009-10-01 11:15:33 +0000
@@ -1,6 +1,134 @@
-diff -ru mysql-5.0.75_base/innobase/dict/dict0boot.c mysql-5.0.75/innobase/dict/dict0boot.c
---- mysql-5.0.75_base/innobase/dict/dict0boot.c	2008-12-19 02:19:35.000000000 +0900
-+++ mysql-5.0.75/innobase/dict/dict0boot.c	2009-01-23 19:28:25.000000000 +0900
+diff -ruN a/innobase/btr/btr0sea.c b/innobase/btr/btr0sea.c
+--- a/innobase/btr/btr0sea.c	2009-08-27 18:42:17.000000000 +0900
++++ b/innobase/btr/btr0sea.c	2009-08-27 18:43:11.000000000 +0900
+@@ -1077,6 +1077,124 @@
+ }
+ 
+ /************************************************************************
++Drops a page hash index based on index */
++
++void
++btr_search_drop_page_hash_index_on_index(
++/*=====================================*/
++	dict_index_t*	index)		/* in: record descriptor */
++{
++	page_t*		page;
++	hash_table_t*	table;
++	buf_block_t*	block;
++	ulint		n_fields;
++	ulint		n_bytes;
++	rec_t*		rec;
++	ulint		fold;
++	ulint		prev_fold;
++	dulint		tree_id;
++	ulint		n_cached;
++	ulint		n_recs;
++	ulint*		folds;
++	ulint		i;
++	mem_heap_t*	heap	= NULL;
++	ulint*		offsets;
++
++	rw_lock_x_lock(&btr_search_latch);
++	mutex_enter(&buf_pool->mutex);
++
++	table = btr_search_sys->hash_index;
++
++	block = UT_LIST_GET_LAST(buf_pool->LRU);
++
++	while (block != NULL) {
++		if (block->index == index && block->is_hashed) {
++			page = block->frame;
++
++			/* from btr_search_drop_page_hash_index() */
++			n_fields = block->curr_n_fields;
++			n_bytes = block->curr_n_bytes;
++
++			ut_a(n_fields + n_bytes > 0);
++
++			n_recs = page_get_n_recs(page);
++
++			/* Calculate and cache fold values into an array for fast deletion
++			from the hash index */
++
++			folds = mem_alloc(n_recs * sizeof(ulint));
++
++			n_cached = 0;
++
++			rec = page_get_infimum_rec(page);
++			rec = page_rec_get_next(rec);
++
++			tree_id = btr_page_get_index_id(page);
++	
++			ut_a(0 == ut_dulint_cmp(tree_id, index->id));
++
++			prev_fold = 0;
++
++			offsets = NULL;
++
++			while (!page_rec_is_supremum(rec)) {
++				/* FIXME: in a mixed tree, not all records may have enough
++				ordering fields: */
++				offsets = rec_get_offsets(rec, index, offsets,
++							n_fields + (n_bytes > 0), &heap);
++				ut_a(rec_offs_n_fields(offsets) == n_fields + (n_bytes > 0));
++				fold = rec_fold(rec, offsets, n_fields, n_bytes, tree_id);
++
++				if (fold == prev_fold && prev_fold != 0) {
++
++					goto next_rec;
++				}
++
++				/* Remove all hash nodes pointing to this page from the
++				hash chain */
++
++				folds[n_cached] = fold;
++				n_cached++;
++next_rec:
++				rec = page_rec_get_next(rec);
++				prev_fold = fold;
++			}
++
++			for (i = 0; i < n_cached; i++) {
++
++				ha_remove_all_nodes_to_page(table, folds[i], page);
++			}
++
++			ut_a(index->search_info->ref_count > 0);
++			index->search_info->ref_count--;
++
++			block->is_hashed = FALSE;
++			block->index = NULL;
++	
++			if (UNIV_UNLIKELY(block->n_pointers)) {
++				/* Corruption */
++				ut_print_timestamp(stderr);
++				fprintf(stderr,
++"  InnoDB: Corruption of adaptive hash index. After dropping\n"
++"InnoDB: the hash index to a page of %s, still %lu hash nodes remain.\n",
++					index->name, (ulong) block->n_pointers);
++			}
++
++			mem_free(folds);
++		}
++
++		block = UT_LIST_GET_PREV(LRU, block);
++	}
++
++	mutex_exit(&buf_pool->mutex);
++	rw_lock_x_unlock(&btr_search_latch);
++
++	if (UNIV_LIKELY_NULL(heap)) {
++		mem_heap_free(heap);
++	}
++}
++
++/************************************************************************
+ Drops a page hash index when a page is freed from a fseg to the file system.
+ Drops possible hash index if the page happens to be in the buffer pool. */
+ 
+diff -ruN a/innobase/dict/dict0boot.c b/innobase/dict/dict0boot.c
+--- a/innobase/dict/dict0boot.c	2009-07-07 21:53:58.000000000 +0900
++++ b/innobase/dict/dict0boot.c	2009-08-27 18:42:59.000000000 +0900
 @@ -247,6 +247,7 @@
  	system tables */
  	/*-------------------------*/
@@ -33,9 +161,9 @@
  
  	dict_mem_table_add_col(table, "INDEX_ID", DATA_BINARY, 0,0,0);
  	dict_mem_table_add_col(table, "POS", DATA_INT, 0, 4, 0);
-diff -ru mysql-5.0.75_base/innobase/dict/dict0crea.c mysql-5.0.75/innobase/dict/dict0crea.c
---- mysql-5.0.75_base/innobase/dict/dict0crea.c	2008-12-19 02:19:35.000000000 +0900
-+++ mysql-5.0.75/innobase/dict/dict0crea.c	2009-01-23 19:41:38.000000000 +0900
+diff -ruN a/innobase/dict/dict0crea.c b/innobase/dict/dict0crea.c
+--- a/innobase/dict/dict0crea.c	2009-07-07 21:53:58.000000000 +0900
++++ b/innobase/dict/dict0crea.c	2009-08-27 18:42:59.000000000 +0900
 @@ -1178,6 +1178,9 @@
              	/* Foreign constraint system tables have already been
              	created, and they are ok */
@@ -46,7 +174,7 @@
  		mutex_exit(&(dict_sys->mutex));
  
              	return(DB_SUCCESS);
-@@ -1266,6 +1269,11 @@
+@@ -1267,6 +1270,11 @@
  	
  	trx->op_info = "";
  
@@ -58,9 +186,9 @@
  	row_mysql_unlock_data_dictionary(trx);
  
    	trx_free_for_mysql(trx);
-diff -ru mysql-5.0.75_base/innobase/dict/dict0dict.c mysql-5.0.75/innobase/dict/dict0dict.c
---- mysql-5.0.75_base/innobase/dict/dict0dict.c	2008-12-19 02:19:35.000000000 +0900
-+++ mysql-5.0.75/innobase/dict/dict0dict.c	2009-01-26 16:03:29.000000000 +0900
+diff -ruN a/innobase/dict/dict0dict.c b/innobase/dict/dict0dict.c
+--- a/innobase/dict/dict0dict.c	2009-07-07 21:53:58.000000000 +0900
++++ b/innobase/dict/dict0dict.c	2009-08-27 18:43:11.000000000 +0900
 @@ -638,6 +638,8 @@
  	mutex_enter(&(dict_sys->mutex));
  
@@ -156,7 +284,7 @@
  	while (table && (dict_sys->size >
  			 buf_pool_get_max_size() / DICT_POOL_PER_VARYING)) {
  
-@@ -1292,6 +1341,7 @@
+@@ -1292,6 +1342,7 @@
  
  		table = prev_table;
  	}
@@ -164,9 +292,20 @@
  }
  
  /**************************************************************************
-diff -ru mysql-5.0.75_base/innobase/ibuf/ibuf0ibuf.c mysql-5.0.75/innobase/ibuf/ibuf0ibuf.c
---- mysql-5.0.75_base/innobase/ibuf/ibuf0ibuf.c	2009-01-23 11:44:18.000000000 +0900
-+++ mysql-5.0.75/innobase/ibuf/ibuf0ibuf.c	2009-01-23 19:22:54.000000000 +0900
+@@ -1565,6 +1616,10 @@
+ #ifdef UNIV_SYNC_DEBUG
+ 	ut_ad(mutex_own(&(dict_sys->mutex)));
+ #endif /* UNIV_SYNC_DEBUG */
++	/* remove all entry of the index from adaptive hash index,
++	because removing from adaptive hash index needs dict_index */
++	if (srv_use_adaptive_hash_indexes && srv_dict_size_limit)
++		btr_search_drop_page_hash_index_on_index(index);
+ 
+ 	/* We always create search info whether or not adaptive
+ 	hash index is enabled or not. */
+diff -ruN a/innobase/ibuf/ibuf0ibuf.c b/innobase/ibuf/ibuf0ibuf.c
+--- a/innobase/ibuf/ibuf0ibuf.c	2009-08-27 18:42:17.000000000 +0900
++++ b/innobase/ibuf/ibuf0ibuf.c	2009-08-27 18:42:59.000000000 +0900
 @@ -535,6 +535,7 @@
  	sprintf(buf, "SYS_IBUF_TABLE_%lu", (ulong) space);
  	/* use old-style record format for the insert buffer */
@@ -175,9 +314,26 @@
  
  	dict_mem_table_add_col(table, "PAGE_NO", DATA_BINARY, 0, 0, 0);
  	dict_mem_table_add_col(table, "TYPES", DATA_BINARY, 0, 0, 0);
-diff -ru mysql-5.0.75_base/innobase/include/dict0dict.h mysql-5.0.75/innobase/include/dict0dict.h
---- mysql-5.0.75_base/innobase/include/dict0dict.h	2008-12-19 02:19:35.000000000 +0900
-+++ mysql-5.0.75/innobase/include/dict0dict.h	2009-01-23 21:46:22.000000000 +0900
+diff -ruN a/innobase/include/btr0sea.h b/innobase/include/btr0sea.h
+--- a/innobase/include/btr0sea.h	2009-07-07 21:54:00.000000000 +0900
++++ b/innobase/include/btr0sea.h	2009-08-27 18:43:11.000000000 +0900
+@@ -97,6 +97,13 @@
+ /*============================*/
+ 	page_t*	page);	/* in: index page, s- or x-latched */
+ /************************************************************************
++Drops a page hash index based on index */
++
++void
++btr_search_drop_page_hash_index_on_index(
++/*=====================================*/
++	dict_index_t*	index);		/* in: record descriptor */
++/************************************************************************
+ Drops a page hash index when a page is freed from a fseg to the file system.
+ Drops possible hash index if the page happens to be in the buffer pool. */
+ 
+diff -ruN a/innobase/include/dict0dict.h b/innobase/include/dict0dict.h
+--- a/innobase/include/dict0dict.h	2009-07-07 21:54:01.000000000 +0900
++++ b/innobase/include/dict0dict.h	2009-08-27 18:42:59.000000000 +0900
 @@ -938,6 +938,11 @@
  	const char*	ptr,	/* in: scan from */
  	const char*	string);/* in: look for this */
@@ -190,9 +346,9 @@
  /* Buffers for storing detailed information about the latest foreign key
  and unique key errors */
  extern FILE*	dict_foreign_err_file;
-diff -ru mysql-5.0.75_base/innobase/include/dict0dict.ic mysql-5.0.75/innobase/include/dict0dict.ic
---- mysql-5.0.75_base/innobase/include/dict0dict.ic	2008-12-19 02:19:35.000000000 +0900
-+++ mysql-5.0.75/innobase/include/dict0dict.ic	2009-01-23 18:35:55.000000000 +0900
+diff -ruN a/innobase/include/dict0dict.ic b/innobase/include/dict0dict.ic
+--- a/innobase/include/dict0dict.ic	2009-07-07 21:54:01.000000000 +0900
++++ b/innobase/include/dict0dict.ic	2009-08-27 18:42:59.000000000 +0900
 @@ -533,6 +533,13 @@
  
  	HASH_SEARCH(name_hash, dict_sys->table_hash, table_fold, table,
@@ -218,19 +374,19 @@
  		/* lock_push(trx, table, LOCK_DICT_MEM_FIX) */
  	}
  	
-diff -ru mysql-5.0.75_base/innobase/include/srv0srv.h mysql-5.0.75/innobase/include/srv0srv.h
---- mysql-5.0.75_base/innobase/include/srv0srv.h	2009-01-23 11:44:19.000000000 +0900
-+++ mysql-5.0.75/innobase/include/srv0srv.h	2009-01-27 10:47:26.000000000 +0900
-@@ -146,6 +146,8 @@
+diff -ruN a/innobase/include/srv0srv.h b/innobase/include/srv0srv.h
+--- a/innobase/include/srv0srv.h	2009-08-27 18:42:17.000000000 +0900
++++ b/innobase/include/srv0srv.h	2009-08-27 18:42:59.000000000 +0900
+@@ -147,6 +147,8 @@
  extern uint	srv_read_ahead;
- extern ulint	srv_adaptive_checkpoint;
+ extern uint	srv_adaptive_checkpoint;
  
 +extern ulint	srv_dict_size_limit;
 +
  extern volatile ibool srv_io_pattern;
  extern ulong	srv_io_pattern_trace;
  extern ulong	srv_io_pattern_trace_running;
-@@ -545,6 +547,7 @@
+@@ -552,6 +554,7 @@
          ulint innodb_data_writes;
          ulint innodb_data_written;
          ulint innodb_data_reads;
@@ -238,19 +394,19 @@
          ulint innodb_buffer_pool_pages_total;
          ulint innodb_buffer_pool_pages_data;
          ulint innodb_buffer_pool_pages_dirty;
-diff -ru mysql-5.0.75_base/innobase/srv/srv0srv.c mysql-5.0.75/innobase/srv/srv0srv.c
---- mysql-5.0.75_base/innobase/srv/srv0srv.c	2009-01-23 11:44:19.000000000 +0900
-+++ mysql-5.0.75/innobase/srv/srv0srv.c	2009-01-27 10:52:19.000000000 +0900
-@@ -345,6 +345,8 @@
+diff -ruN a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c
+--- a/innobase/srv/srv0srv.c	2009-08-27 18:42:17.000000000 +0900
++++ b/innobase/srv/srv0srv.c	2009-08-27 18:42:59.000000000 +0900
+@@ -353,6 +353,8 @@
  uint	srv_read_ahead = 3; /* 1: random  2: linear  3: Both */
- ulint	srv_adaptive_checkpoint = 0; /* 0:disable 1:enable */
+ uint	srv_adaptive_checkpoint = 0; /* 0: none  1: reflex  2: estimate */
  
 +ulint	srv_dict_size_limit = 0;
 +
  volatile ibool srv_io_pattern = FALSE;
  ulint   srv_io_pattern_trace = 0;
  ulint   srv_io_pattern_trace_running = 0;
-@@ -1936,6 +1938,7 @@
+@@ -1953,6 +1955,7 @@
          export_vars.innodb_data_reads= os_n_file_reads;
          export_vars.innodb_data_writes= os_n_file_writes;
          export_vars.innodb_data_written= srv_data_written;
@@ -258,9 +414,153 @@
          export_vars.innodb_buffer_pool_read_requests= buf_pool->n_page_gets;
          export_vars.innodb_buffer_pool_write_requests= srv_buf_pool_write_requests;
          export_vars.innodb_buffer_pool_wait_free= srv_buf_pool_wait_free;
-diff -ru mysql-5.0.75_base/sql/ha_innodb.cc mysql-5.0.75/sql/ha_innodb.cc
---- mysql-5.0.75_base/sql/ha_innodb.cc	2009-01-23 11:44:19.000000000 +0900
-+++ mysql-5.0.75/sql/ha_innodb.cc	2009-01-27 10:54:08.000000000 +0900
+diff -ruN a/mysql-test/r/innodb_dict_size_limit.result b/mysql-test/r/innodb_dict_size_limit.result
+--- /dev/null	1970-01-01 09:00:00.000000000 +0900
++++ b/mysql-test/r/innodb_dict_size_limit.result	2009-08-27 18:42:59.000000000 +0900
+@@ -0,0 +1,60 @@
++DROP TABLE IF EXISTS `test_5`;
++DROP TABLE IF EXISTS `test_4`;
++DROP TABLE IF EXISTS `test_3`;
++DROP TABLE IF EXISTS `test_2`;
++DROP TABLE IF EXISTS `test_1`;
++SET storage_engine=InnoDB;
++SET GLOBAL innodb_dict_size_limit=1;
++FLUSH TABLES;
++CREATE TABLE `test_1` (`a` int, `b` int, PRIMARY KEY  (`a`));
++CREATE TABLE `test_2` (`a` int, `b` int, PRIMARY KEY  (`a`));
++CREATE TABLE `test_3` (`a` int, `b` int, PRIMARY KEY  (`a`));
++CREATE TABLE `test_4` (`a` int, `b` int, PRIMARY KEY  (`a`));
++CREATE TABLE `test_5` (`a` int, `b` int, PRIMARY KEY  (`a`));
++ALTER TABLE `test_5` ADD CONSTRAINT FOREIGN KEY(`b`) REFERENCES `test_4`(`a`);
++ALTER TABLE `test_4` ADD CONSTRAINT FOREIGN KEY(`b`) REFERENCES `test_3`(`a`);
++SHOW GLOBAL STATUS LIKE 'Innodb_dict_tables';
++Variable_name	Value
++Innodb_dict_tables	9
++FLUSH TABLES;
++SELECT * FROM `test_1`;
++a	b
++SHOW GLOBAL STATUS LIKE 'Innodb_dict_tables';
++Variable_name	Value
++Innodb_dict_tables	8
++SELECT * FROM `test_3`;
++a	b
++SHOW GLOBAL STATUS LIKE 'Innodb_dict_tables';
++Variable_name	Value
++Innodb_dict_tables	11
++FLUSH TABLES;
++SELECT * FROM `test_2`;
++a	b
++SHOW GLOBAL STATUS LIKE 'Innodb_dict_tables';
++Variable_name	Value
++Innodb_dict_tables	8
++SELECT * FROM `test_1`;
++a	b
++FLUSH TABLES;
++SELECT * FROM `test_4`;
++a	b
++SHOW GLOBAL STATUS LIKE 'Innodb_dict_tables';
++Variable_name	Value
++Innodb_dict_tables	9
++SELECT * FROM `test_3`;
++a	b
++SHOW GLOBAL STATUS LIKE 'Innodb_dict_tables';
++Variable_name	Value
++Innodb_dict_tables	10
++SET GLOBAL innodb_dict_size_limit=0;
++FLUSH TABLES;
++SELECT * FROM `test_2`;
++a	b
++SHOW GLOBAL STATUS LIKE 'Innodb_dict_tables';
++Variable_name	Value
++Innodb_dict_tables	11
++DROP TABLE `test_5`;
++DROP TABLE `test_4`;
++DROP TABLE `test_3`;
++DROP TABLE `test_2`;
++DROP TABLE `test_1`;
+diff -ruN a/mysql-test/t/innodb_dict_size_limit.test b/mysql-test/t/innodb_dict_size_limit.test
+--- /dev/null	1970-01-01 09:00:00.000000000 +0900
++++ b/mysql-test/t/innodb_dict_size_limit.test	2009-08-27 18:42:59.000000000 +0900
+@@ -0,0 +1,63 @@
++#
++# Test for new variable innodb_dict_size_limit;
++#
++-- source include/have_innodb.inc
++
++--disable_warnings
++DROP TABLE IF EXISTS `test_5`;
++DROP TABLE IF EXISTS `test_4`;
++DROP TABLE IF EXISTS `test_3`;
++DROP TABLE IF EXISTS `test_2`;
++DROP TABLE IF EXISTS `test_1`;
++--enable_warnings
++
++SET storage_engine=InnoDB;
++SET GLOBAL innodb_dict_size_limit=1;
++
++FLUSH TABLES;
++
++CREATE TABLE `test_1` (`a` int, `b` int, PRIMARY KEY  (`a`));
++CREATE TABLE `test_2` (`a` int, `b` int, PRIMARY KEY  (`a`));
++CREATE TABLE `test_3` (`a` int, `b` int, PRIMARY KEY  (`a`));
++CREATE TABLE `test_4` (`a` int, `b` int, PRIMARY KEY  (`a`));
++CREATE TABLE `test_5` (`a` int, `b` int, PRIMARY KEY  (`a`));
++
++ALTER TABLE `test_5` ADD CONSTRAINT FOREIGN KEY(`b`) REFERENCES `test_4`(`a`);
++ALTER TABLE `test_4` ADD CONSTRAINT FOREIGN KEY(`b`) REFERENCES `test_3`(`a`);
++
++SHOW GLOBAL STATUS LIKE 'Innodb_dict_tables';
++
++FLUSH TABLES;
++SELECT * FROM `test_1`;
++
++SHOW GLOBAL STATUS LIKE 'Innodb_dict_tables';
++
++SELECT * FROM `test_3`;
++
++SHOW GLOBAL STATUS LIKE 'Innodb_dict_tables';
++
++FLUSH TABLES;
++SELECT * FROM `test_2`;
++
++SHOW GLOBAL STATUS LIKE 'Innodb_dict_tables';
++
++SELECT * FROM `test_1`;
++FLUSH TABLES;
++SELECT * FROM `test_4`;
++SHOW GLOBAL STATUS LIKE 'Innodb_dict_tables';
++
++SELECT * FROM `test_3`;
++SHOW GLOBAL STATUS LIKE 'Innodb_dict_tables';
++
++SET GLOBAL innodb_dict_size_limit=0;
++FLUSH TABLES;
++SELECT * FROM `test_2`;
++
++SHOW GLOBAL STATUS LIKE 'Innodb_dict_tables';
++
++DROP TABLE `test_5`;
++DROP TABLE `test_4`;
++DROP TABLE `test_3`;
++DROP TABLE `test_2`;
++DROP TABLE `test_1`;
++
+diff -ruN a/patch_info/innodb_dict_size_limit.info b/patch_info/innodb_dict_size_limit.info
+--- /dev/null	1970-01-01 09:00:00.000000000 +0900
++++ b/patch_info/innodb_dict_size_limit.info	2009-08-27 18:42:59.000000000 +0900
+@@ -0,0 +1,9 @@
++File=innodb_dict_size_limit.patch
++Name=Limit dictionary cache size
++Version=1.0
++Author=Percona
++License=GPL
++Comment=Variable innodb_dict_size_limit in bytes
++ChangeLog=
++2009-01-26
++YK: Initial release
+diff -ruN a/sql/ha_innodb.cc b/sql/ha_innodb.cc
+--- a/sql/ha_innodb.cc	2009-08-27 18:42:17.000000000 +0900
++++ b/sql/ha_innodb.cc	2009-08-27 18:42:59.000000000 +0900
 @@ -288,6 +288,8 @@
    (char*) &export_vars.innodb_dblwr_pages_written,        SHOW_LONG},
    {"dblwr_writes",
@@ -270,32 +570,32 @@
    {"log_waits",
    (char*) &export_vars.innodb_log_waits,                  SHOW_LONG},
    {"log_write_requests",
-diff -ru mysql-5.0.75_base/sql/ha_innodb.h mysql-5.0.75/sql/ha_innodb.h
---- mysql-5.0.75_base/sql/ha_innodb.h	2009-01-23 11:44:19.000000000 +0900
-+++ mysql-5.0.75/sql/ha_innodb.h	2009-01-26 15:49:37.000000000 +0900
-@@ -242,6 +242,7 @@
- extern ulong srv_flush_neighbor_pages;
+diff -ruN a/sql/ha_innodb.h b/sql/ha_innodb.h
+--- a/sql/ha_innodb.h	2009-08-27 18:42:17.000000000 +0900
++++ b/sql/ha_innodb.h	2009-08-27 18:42:59.000000000 +0900
+@@ -243,6 +243,7 @@
+ extern ulong srv_enable_unsafe_group_commit;
  extern uint srv_read_ahead;
- extern ulong srv_adaptive_checkpoint;
+ extern uint srv_adaptive_checkpoint;
 +extern ulong srv_dict_size_limit;
  extern ulong srv_show_locks_held;
  extern ulong srv_show_verbose_locks;
  extern ulong srv_io_pattern_trace;
-diff -ru mysql-5.0.75_base/sql/mysqld.cc mysql-5.0.75/sql/mysqld.cc
---- mysql-5.0.75_base/sql/mysqld.cc	2009-01-23 11:44:19.000000000 +0900
-+++ mysql-5.0.75/sql/mysqld.cc	2009-01-26 15:29:45.000000000 +0900
-@@ -5053,6 +5053,7 @@
+diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
+--- a/sql/mysqld.cc	2009-08-27 18:42:17.000000000 +0900
++++ b/sql/mysqld.cc	2009-08-27 18:42:59.000000000 +0900
+@@ -5101,6 +5101,7 @@
    OPT_INNODB_ADAPTIVE_CHECKPOINT,
    OPT_INNODB_READ_IO_THREADS,
    OPT_INNODB_WRITE_IO_THREADS,
 +  OPT_INNODB_DICT_SIZE_LIMIT,
    OPT_INNODB_ADAPTIVE_HASH_INDEX,
-   OPT_RPL_MIRROR_BINLOG,
-   OPT_SYNC_MIRROR_BINLOG,
-@@ -5406,6 +5407,10 @@
+   OPT_FEDERATED,
+   OPT_INNODB_USE_LEGACY_CARDINALITY_ALGORITHM
+@@ -5464,6 +5465,10 @@
     "Number of background write I/O threads in InnoDB.",
     (gptr*) &innobase_write_io_threads, (gptr*) &innobase_write_io_threads,
-    0, GET_LONG, REQUIRED_ARG, 1, 1, 64, 0, 0, 0},
+    0, GET_LONG, REQUIRED_ARG, 8, 1, 64, 0, 0, 0},
 +  {"innodb_dict_size_limit", OPT_INNODB_DICT_SIZE_LIMIT,
 +   "Limit the allocated memory for dictionary cache. (0: unlimited)",
 +   (gptr*) &srv_dict_size_limit, (gptr*) &srv_dict_size_limit, 0,
@@ -303,27 +603,27 @@
    {"innodb_io_pattern_trace", OPT_INNODB_IO_PATTERN_TRACE,
     "Create/Drop the internal hash table for IO pattern tracing.",
     (gptr*) &srv_io_pattern_trace, (gptr*) &srv_io_pattern_trace,
-diff -ru mysql-5.0.75_base/sql/set_var.cc mysql-5.0.75/sql/set_var.cc
---- mysql-5.0.75_base/sql/set_var.cc	2009-01-23 11:44:19.000000000 +0900
-+++ mysql-5.0.75/sql/set_var.cc	2009-01-26 15:46:45.000000000 +0900
-@@ -522,6 +522,8 @@
-                                       &innodb_read_ahead_typelib, fix_innodb_read_ahead);
- sys_var_long_ptr	sys_innodb_adaptive_checkpoint("innodb_adaptive_checkpoint",
-                                                       &srv_adaptive_checkpoint);
+diff -ruN a/sql/set_var.cc b/sql/set_var.cc
+--- a/sql/set_var.cc	2009-08-27 18:42:17.000000000 +0900
++++ b/sql/set_var.cc	2009-08-27 18:42:59.000000000 +0900
+@@ -540,6 +540,8 @@
+ sys_var_enum	sys_innodb_adaptive_checkpoint("innodb_adaptive_checkpoint",
+                            &srv_adaptive_checkpoint,
+                            &innodb_adaptive_checkpoint_typelib, fix_innodb_adaptive_checkpoint);
 +sys_var_long_ptr	sys_innodb_dict_size_limit("innodb_dict_size_limit",
 +                                                   &srv_dict_size_limit);
  sys_var_long_ptr  sys_innodb_show_locks_held(
                                          "innodb_show_locks_held",
                                          &srv_show_locks_held);
-@@ -905,6 +907,7 @@
-   &sys_innodb_flush_neighbor_pages,
+@@ -930,6 +932,7 @@
    &sys_innodb_read_ahead,
+   &sys_innodb_enable_unsafe_group_commit,
    &sys_innodb_adaptive_checkpoint,
 +  &sys_innodb_dict_size_limit,
    &sys_innodb_show_locks_held,
    &sys_innodb_show_verbose_locks,
    &sys_innodb_io_pattern_trace,
-@@ -1056,6 +1059,7 @@
+@@ -1084,6 +1087,7 @@
    {sys_innodb_adaptive_checkpoint.name, (char*) &sys_innodb_adaptive_checkpoint, SHOW_SYS},
    {"innodb_read_io_threads", (char*) &innobase_read_io_threads, SHOW_LONG},
    {"innodb_write_io_threads", (char*) &innobase_write_io_threads, SHOW_LONG},
@@ -331,147 +631,3 @@
    {sys_innodb_io_pattern_trace.name, (char*) &sys_innodb_io_pattern_trace, SHOW_SYS},
    {sys_innodb_io_pattern_trace_running.name, (char*) &sys_innodb_io_pattern_trace_running, SHOW_SYS},
    {sys_innodb_io_pattern_size_limit.name, (char*) &sys_innodb_io_pattern_size_limit, SHOW_SYS},
-diff -ruN mysql-5.0.75_base/mysql-test/r/innodb_dict_size_limit.result mysql-5.0.75/mysql-test/r/innodb_dict_size_limit.result
---- /dev/null	1970-01-01 09:00:00.000000000 +0900
-+++ mysql-5.0.75/mysql-test/r/innodb_dict_size_limit.result	2009-01-27 11:43:46.000000000 +0900
-@@ -0,0 +1,60 @@
-+DROP TABLE IF EXISTS `test_5`;
-+DROP TABLE IF EXISTS `test_4`;
-+DROP TABLE IF EXISTS `test_3`;
-+DROP TABLE IF EXISTS `test_2`;
-+DROP TABLE IF EXISTS `test_1`;
-+SET storage_engine=InnoDB;
-+SET GLOBAL innodb_dict_size_limit=1;
-+FLUSH TABLES;
-+CREATE TABLE `test_1` (`a` int, `b` int, PRIMARY KEY  (`a`));
-+CREATE TABLE `test_2` (`a` int, `b` int, PRIMARY KEY  (`a`));
-+CREATE TABLE `test_3` (`a` int, `b` int, PRIMARY KEY  (`a`));
-+CREATE TABLE `test_4` (`a` int, `b` int, PRIMARY KEY  (`a`));
-+CREATE TABLE `test_5` (`a` int, `b` int, PRIMARY KEY  (`a`));
-+ALTER TABLE `test_5` ADD CONSTRAINT FOREIGN KEY(`b`) REFERENCES `test_4`(`a`);
-+ALTER TABLE `test_4` ADD CONSTRAINT FOREIGN KEY(`b`) REFERENCES `test_3`(`a`);
-+SHOW GLOBAL STATUS LIKE 'Innodb_dict_tables';
-+Variable_name	Value
-+Innodb_dict_tables	9
-+FLUSH TABLES;
-+SELECT * FROM `test_1`;
-+a	b
-+SHOW GLOBAL STATUS LIKE 'Innodb_dict_tables';
-+Variable_name	Value
-+Innodb_dict_tables	8
-+SELECT * FROM `test_3`;
-+a	b
-+SHOW GLOBAL STATUS LIKE 'Innodb_dict_tables';
-+Variable_name	Value
-+Innodb_dict_tables	11
-+FLUSH TABLES;
-+SELECT * FROM `test_2`;
-+a	b
-+SHOW GLOBAL STATUS LIKE 'Innodb_dict_tables';
-+Variable_name	Value
-+Innodb_dict_tables	8
-+SELECT * FROM `test_1`;
-+a	b
-+FLUSH TABLES;
-+SELECT * FROM `test_4`;
-+a	b
-+SHOW GLOBAL STATUS LIKE 'Innodb_dict_tables';
-+Variable_name	Value
-+Innodb_dict_tables	9
-+SELECT * FROM `test_3`;
-+a	b
-+SHOW GLOBAL STATUS LIKE 'Innodb_dict_tables';
-+Variable_name	Value
-+Innodb_dict_tables	10
-+SET GLOBAL innodb_dict_size_limit=0;
-+FLUSH TABLES;
-+SELECT * FROM `test_2`;
-+a	b
-+SHOW GLOBAL STATUS LIKE 'Innodb_dict_tables';
-+Variable_name	Value
-+Innodb_dict_tables	11
-+DROP TABLE `test_5`;
-+DROP TABLE `test_4`;
-+DROP TABLE `test_3`;
-+DROP TABLE `test_2`;
-+DROP TABLE `test_1`;
-diff -ruN mysql-5.0.75_base/mysql-test/t/innodb_dict_size_limit.test mysql-5.0.75/mysql-test/t/innodb_dict_size_limit.test
---- /dev/null	1970-01-01 09:00:00.000000000 +0900
-+++ mysql-5.0.75/mysql-test/t/innodb_dict_size_limit.test	2009-01-27 11:43:36.000000000 +0900
-@@ -0,0 +1,63 @@
-+#
-+# Test for new variable innodb_dict_size_limit;
-+#
-+-- source include/have_innodb.inc
-+
-+--disable_warnings
-+DROP TABLE IF EXISTS `test_5`;
-+DROP TABLE IF EXISTS `test_4`;
-+DROP TABLE IF EXISTS `test_3`;
-+DROP TABLE IF EXISTS `test_2`;
-+DROP TABLE IF EXISTS `test_1`;
-+--enable_warnings
-+
-+SET storage_engine=InnoDB;
-+SET GLOBAL innodb_dict_size_limit=1;
-+
-+FLUSH TABLES;
-+
-+CREATE TABLE `test_1` (`a` int, `b` int, PRIMARY KEY  (`a`));
-+CREATE TABLE `test_2` (`a` int, `b` int, PRIMARY KEY  (`a`));
-+CREATE TABLE `test_3` (`a` int, `b` int, PRIMARY KEY  (`a`));
-+CREATE TABLE `test_4` (`a` int, `b` int, PRIMARY KEY  (`a`));
-+CREATE TABLE `test_5` (`a` int, `b` int, PRIMARY KEY  (`a`));
-+
-+ALTER TABLE `test_5` ADD CONSTRAINT FOREIGN KEY(`b`) REFERENCES `test_4`(`a`);
-+ALTER TABLE `test_4` ADD CONSTRAINT FOREIGN KEY(`b`) REFERENCES `test_3`(`a`);
-+
-+SHOW GLOBAL STATUS LIKE 'Innodb_dict_tables';
-+
-+FLUSH TABLES;
-+SELECT * FROM `test_1`;
-+
-+SHOW GLOBAL STATUS LIKE 'Innodb_dict_tables';
-+
-+SELECT * FROM `test_3`;
-+
-+SHOW GLOBAL STATUS LIKE 'Innodb_dict_tables';
-+
-+FLUSH TABLES;
-+SELECT * FROM `test_2`;
-+
-+SHOW GLOBAL STATUS LIKE 'Innodb_dict_tables';
-+
-+SELECT * FROM `test_1`;
-+FLUSH TABLES;
-+SELECT * FROM `test_4`;
-+SHOW GLOBAL STATUS LIKE 'Innodb_dict_tables';
-+
-+SELECT * FROM `test_3`;
-+SHOW GLOBAL STATUS LIKE 'Innodb_dict_tables';
-+
-+SET GLOBAL innodb_dict_size_limit=0;
-+FLUSH TABLES;
-+SELECT * FROM `test_2`;
-+
-+SHOW GLOBAL STATUS LIKE 'Innodb_dict_tables';
-+
-+DROP TABLE `test_5`;
-+DROP TABLE `test_4`;
-+DROP TABLE `test_3`;
-+DROP TABLE `test_2`;
-+DROP TABLE `test_1`;
-+
-diff -ruN mysql-5.0.75_base/patch_info/innodb_dict_size_limit.info mysql-5.0.75/patch_info/innodb_dict_size_limit.info
---- /dev/null	1970-01-01 09:00:00.000000000 +0900
-+++ mysql-5.0.75/patch_info/innodb_dict_size_limit.info	2009-01-26 15:46:45.000000000 +0900
-@@ -0,0 +1,9 @@
-+File=innodb_dict_size_limit.patch
-+Name=Limit dictionary cache size
-+Version=1.0
-+Author=Percona
-+License=GPL
-+Comment=Variable innodb_dict_size_limit in bytes
-+ChangeLog=
-[phone]
-+YK: Initial release

=== added file 'mysql/5.0/percona_maintained/innodb_extra_rseg.patch'
--- mysql/5.0/percona_maintained/innodb_extra_rseg.patch	1970-01-01 00:00:00 +0000
+++ mysql/5.0/percona_maintained/innodb_extra_rseg.patch	2009-10-01 11:15:33 +0000
@@ -0,0 +1,243 @@
+diff -r 85e7025cf2d1 innobase/include/srv0srv.h
+--- a/innobase/include/srv0srv.h	Fri Jul 03 15:41:41 2009 -0700
++++ b/innobase/include/srv0srv.h	Fri Jul 03 15:41:47 2009 -0700
+@@ -146,6 +146,8 @@
+ extern ulint	srv_enable_unsafe_group_commit;
+ extern uint	srv_read_ahead;
+ extern uint	srv_adaptive_checkpoint;
++
++extern ulint	srv_extra_rsegments;
+ 
+ extern ulint	srv_dict_size_limit;
+ 
+diff -r 85e7025cf2d1 innobase/include/trx0sys.h
+--- a/innobase/include/trx0sys.h	Fri Jul 03 15:41:41 2009 -0700
++++ b/innobase/include/trx0sys.h	Fri Jul 03 15:41:47 2009 -0700
+@@ -105,6 +105,13 @@
+ void
+ trx_sys_create(void);
+ /*================*/
++/*********************************************************************
++Create extra rollback segments when create_new_db */
++
++void
++trx_sys_create_extra_rseg(
++/*======================*/
++	ulint	num);	/* in: number of extra user rollback segments */
+ /********************************************************************
+ Looks for a free slot for a rollback segment in the trx system file copy. */
+ 
+diff -r 85e7025cf2d1 innobase/srv/srv0srv.c
+--- a/innobase/srv/srv0srv.c	Fri Jul 03 15:41:41 2009 -0700
++++ b/innobase/srv/srv0srv.c	Fri Jul 03 15:41:47 2009 -0700
+@@ -352,6 +352,8 @@
+ 
+ uint	srv_read_ahead = 3; /* 1: random  2: linear  3: Both */
+ uint	srv_adaptive_checkpoint = 0; /* 0: none  1: reflex  2: estimate */
++
++ulint	srv_extra_rsegments = 0; /* extra rseg for users */
+ 
+ ulint	srv_dict_size_limit = 0;
+ 
+diff -r 85e7025cf2d1 innobase/srv/srv0start.c
+--- a/innobase/srv/srv0start.c	Fri Jul 03 15:41:41 2009 -0700
++++ b/innobase/srv/srv0start.c	Fri Jul 03 15:41:47 2009 -0700
+@@ -1418,6 +1418,8 @@
+ 		dict_create();
+                 srv_startup_is_before_trx_rollback_phase = FALSE;
+ 
++		if (srv_extra_rsegments)
++			trx_sys_create_extra_rseg(srv_extra_rsegments);
+ #ifdef UNIV_LOG_ARCHIVE
+ 	} else if (srv_archive_recovery) {
+ 		fprintf(stderr,
+diff -r 85e7025cf2d1 innobase/trx/trx0sys.c
+--- a/innobase/trx/trx0sys.c	Fri Jul 03 15:41:41 2009 -0700
++++ b/innobase/trx/trx0sys.c	Fri Jul 03 15:41:47 2009 -0700
+@@ -944,3 +944,28 @@
+ 
+ 	trx_sys_init_at_db_start();
+ }
++
++/*********************************************************************
++Create extra rollback segments when create_new_db */
++
++void
++trx_sys_create_extra_rseg(
++/*======================*/
++	ulint	num)	/* in: number of extra user rollback segments */
++{
++	mtr_t	mtr;
++	ulint	slot_no;
++	ulint	i;
++
++	/* Craete extra rollback segments */
++	mtr_start(&mtr);
++	for (i = 1; i < num + 1; i++) {
++		if(!trx_rseg_create(TRX_SYS_SPACE, ULINT_MAX, &slot_no, &mtr)) {
++			fprintf(stderr,
++"InnoDB: Warning: Failed to create extra rollback segments.\n");
++			break;
++		}
++		ut_a(slot_no == i);
++	}
++	mtr_commit(&mtr);
++}
+diff -r 85e7025cf2d1 patch_info/innodb_extra_rseg.info
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/patch_info/innodb_extra_rseg.info	Fri Jul 03 15:41:47 2009 -0700
+@@ -0,0 +1,6 @@