Changes 5.1.60:

* Upgrading from an Advanced GPL RPM package to an Advanced RPM package did not
  work. Now on Linux it is possible to use rpm -U to replace any installed MySQL
  product by any other of the same release family. It is not necessary to remove
  the old produce with rpm -e first.
* MEMORY table creation time is now available in the CREATE_TIME column of the
  INFORMATION_SCHEMA.TABLES table and the Create_time column of SHOW TABLE
  STATUS output.
Bugs Fixed
* Important Change: InnoDB Storage Engine: Data from BLOB columns could be lost   if the server crashed at a precise moment when other columns were being
  updated in an InnoDB table.
* InnoDB Storage Engine: This fix improves the performance of instrumentation
  code for InnoDB buffer pool operations.
* InnoDB Storage Engine: Lookups using secondary indexes could give incorrect
  matches under a specific set of conditions. The conditions involve an index
  defined on a column prefix, for a BLOB or other long column stored outside
  the index page, with a table using the Barracuda file format.
* InnoDB Storage Engine: This fix corrects cases where the MySQL server could
  hang or abort with a long semaphore wait message. (This is a different issue
  than when these symptoms occurred during a CHECK TABLE statement.)
* Replication: Issuing the following statements, in the order shown, could cause  a deadlock between the user thread and I/O thread.
* more...

5 files changed, 35 insertions, 22 deletions

diff --git a/databases/mysql51-client/Makefile.common b/databases/mysql51-client/Makefile.common
index cb456a1a74c..28da49482dc 100644
--- a/databases/mysql51-client/Makefile.common
+++ b/databases/mysql51-client/Makefile.common
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile.common,v 1.20 2011/08/02 14:10:34 taca Exp $
+# $NetBSD: Makefile.common,v 1.21 2011/12/02 14:25:09 adam Exp $
 #
 # used by databases/mysql51-client/Makefile
 # used by databases/mysql51-server/Makefile
-#
 
-DISTNAME=		mysql-5.1.58
-CATEGORIES=		databases
-MASTER_SITES=		${MASTER_SITE_MYSQL:=MySQL-5.1/}
+DISTNAME=	mysql-5.1.60
+CATEGORIES=	databases
+MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.1/}
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.mysql.com/
-LICENSE=		gnu-gpl-v2
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.mysql.com/
+LICENSE=	gnu-gpl-v2
 
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
diff --git a/databases/mysql51-client/distinfo b/databases/mysql51-client/distinfo
index 329937473ef..913a46c24e1 100644
--- a/databases/mysql51-client/distinfo
+++ b/databases/mysql51-client/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.18 2011/08/02 14:10:34 taca Exp $
+$NetBSD: distinfo,v 1.19 2011/12/02 14:25:10 adam Exp $
 
-SHA1 (mysql-5.1.58.tar.gz) = cfd70bee07ad99576eecde01785b7b2a74ec87ab
-RMD160 (mysql-5.1.58.tar.gz) = 199729c701c764cd22584c2b952230c07d0f31a6
-Size (mysql-5.1.58.tar.gz) = 24333490 bytes
+SHA1 (mysql-5.1.60.tar.gz) = 26ae4d2f7e7066644eb343ab519cbef1626069c2
+RMD160 (mysql-5.1.60.tar.gz) = 7bbfce4fecc2a8e1ca081169e70c1a298ab1b75a
+Size (mysql-5.1.60.tar.gz) = 24408313 bytes
 SHA1 (patch-aa) = 344bc9ab7013fbf64be6adbe8a9fc6279887beb1
 SHA1 (patch-ab) = a1c699ebd9dc7e2cec9354035cbd9fdc2a411175
 SHA1 (patch-ac) = a250b9797fbaad51d054cbb324feb0f7c29096d4
 SHA1 (patch-ad) = 4e98f696b8b5098456e53a8de710a6bcd547997c
-SHA1 (patch-ae) = 5373aeea5d67d8d1cbee1fa4d04c03227b544e3d
+SHA1 (patch-ae) = e1d9051555e331ccc5d74295780a0b8c47c63ced
 SHA1 (patch-af) = cc6cd10021b63564b893b02e1967d3c470f0e0b2
 SHA1 (patch-ag) = 20e4f5ac5e7b7927339b8c46329533f29a3df56f
 SHA1 (patch-ah) = 715bef16c95e26f4abb39eb05fd23dbc9f7fa96b
diff --git a/databases/mysql51-client/patches/patch-ae b/databases/mysql51-client/patches/patch-ae
index 8d37ef2b123..6cbee0676da 100644
--- a/databases/mysql51-client/patches/patch-ae
+++ b/databases/mysql51-client/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.2 2010/09/21 15:57:30 taca Exp $
+$NetBSD: patch-ae,v 1.3 2011/12/02 14:25:10 adam Exp $
 
 * Portability: include <bstring.h> if exists.
 
---- client/mysqlbinlog.cc.orig	2010-02-04 11:36:52.000000000 +0000
+--- client/mysqlbinlog.cc.orig	2011-10-29 18:09:49.000000000 +0000
 +++ client/mysqlbinlog.cc
-@@ -34,6 +34,9 @@
- #include "mysql_priv.h" 
+@@ -37,6 +37,9 @@
  #include "log_event.h"
  #include "sql_common.h"
+ #include <welcome_copyright_notice.h> // ORACLE_WELCOME_COPYRIGHT_NOTICE
 +#ifdef NEEDS_BSTRING_H
 +#include <bstring.h> /* defines bzero() */
 +#endif
diff --git a/databases/mysql51-server/PLIST b/databases/mysql51-server/PLIST
index 4c0441afb2c..20fa54698d7 100644
--- a/databases/mysql51-server/PLIST
+++ b/databases/mysql51-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2011/08/02 14:10:34 taca Exp $
+@comment $NetBSD: PLIST,v 1.17 2011/12/02 14:25:10 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -260,6 +260,7 @@ share/mysql-test/include/have_eucjpms.inc
 share/mysql-test/include/have_euckr.inc
 share/mysql-test/include/have_example_plugin.inc
 share/mysql-test/include/have_exampledb.inc
+share/mysql-test/include/have_federated_plugin.inc
 share/mysql-test/include/have_gb2312.inc
 share/mysql-test/include/have_gbk.inc
 share/mysql-test/include/have_geometry.inc
@@ -2261,6 +2262,9 @@ share/mysql-test/suite/federated/federated_debug.test
 share/mysql-test/suite/federated/federated_innodb-slave.opt
 share/mysql-test/suite/federated/federated_innodb.result
 share/mysql-test/suite/federated/federated_innodb.test
+share/mysql-test/suite/federated/federated_plugin-master.opt
+share/mysql-test/suite/federated/federated_plugin.result
+share/mysql-test/suite/federated/federated_plugin.test
 share/mysql-test/suite/federated/federated_server.result
 share/mysql-test/suite/federated/federated_server.test
 share/mysql-test/suite/federated/federated_transactions-slave.opt
@@ -2656,6 +2660,7 @@ share/mysql-test/suite/innodb/r/innodb-semi-consistent.result
 share/mysql-test/suite/innodb/r/innodb-ucs2.result
 share/mysql-test/suite/innodb/r/innodb.result
 share/mysql-test/suite/innodb/r/innodb_autoinc_lock_mode_zero.result
+share/mysql-test/suite/innodb/r/innodb_bug12661768.result
 share/mysql-test/suite/innodb/r/innodb_bug21704.result
 share/mysql-test/suite/innodb/r/innodb_bug30423.result
 share/mysql-test/suite/innodb/r/innodb_bug30919.result
@@ -2710,6 +2715,7 @@ share/mysql-test/suite/innodb/t/innodb-ucs2.test
 share/mysql-test/suite/innodb/t/innodb.test
 share/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero-master.opt
 share/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test
+share/mysql-test/suite/innodb/t/innodb_bug12661768.test
 share/mysql-test/suite/innodb/t/innodb_bug21704.test
 share/mysql-test/suite/innodb/t/innodb_bug30423.test
 share/mysql-test/suite/innodb/t/innodb_bug30919-master.opt
@@ -2839,6 +2845,7 @@ share/mysql-test/suite/innodb_plugin/r/innodb_file_format.result
 share/mysql-test/suite/innodb_plugin/r/innodb_gis.result
 share/mysql-test/suite/innodb_plugin/r/innodb_information_schema.result
 share/mysql-test/suite/innodb_plugin/r/innodb_lock_wait_timeout_1.result
+share/mysql-test/suite/innodb_plugin/r/innodb_misc1.result
 share/mysql-test/suite/innodb_plugin/r/innodb_multi_update.result
 share/mysql-test/suite/innodb_plugin/r/innodb_mysql.result
 share/mysql-test/suite/innodb_plugin/r/innodb_mysql_rbk.result
@@ -2896,6 +2903,7 @@ share/mysql-test/suite/innodb_plugin/t/innodb_bug44571.test
 share/mysql-test/suite/innodb_plugin/t/innodb_bug45357.test
 share/mysql-test/suite/innodb_plugin/t/innodb_bug46000.test
 share/mysql-test/suite/innodb_plugin/t/innodb_bug46676.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug47167-master.opt
 share/mysql-test/suite/innodb_plugin/t/innodb_bug47167.test
 share/mysql-test/suite/innodb_plugin/t/innodb_bug47621.test
 share/mysql-test/suite/innodb_plugin/t/innodb_bug47622.test
@@ -2927,11 +2935,14 @@ share/mysql-test/suite/innodb_plugin/t/innodb_bug59410.test
 share/mysql-test/suite/innodb_plugin/t/innodb_bug59641.test
 share/mysql-test/suite/innodb_plugin/t/innodb_bug60049-master.opt
 share/mysql-test/suite/innodb_plugin/t/innodb_bug60049.test
+share/mysql-test/suite/innodb_plugin/t/innodb_file_format-master.opt
 share/mysql-test/suite/innodb_plugin/t/innodb_file_format.test
 share/mysql-test/suite/innodb_plugin/t/innodb_gis.test
 share/mysql-test/suite/innodb_plugin/t/innodb_information_schema.test
 share/mysql-test/suite/innodb_plugin/t/innodb_lock_wait_timeout_1-master.opt
 share/mysql-test/suite/innodb_plugin/t/innodb_lock_wait_timeout_1.test
+share/mysql-test/suite/innodb_plugin/t/innodb_misc1-master.opt
+share/mysql-test/suite/innodb_plugin/t/innodb_misc1.test
 share/mysql-test/suite/innodb_plugin/t/innodb_multi_update.test
 share/mysql-test/suite/innodb_plugin/t/innodb_mysql-master.opt
 share/mysql-test/suite/innodb_plugin/t/innodb_mysql.test
@@ -3771,6 +3782,7 @@ share/mysql-test/suite/rpl/r/rpl_row_blob_innodb.result
 share/mysql-test/suite/rpl/r/rpl_row_blob_myisam.result
 share/mysql-test/suite/rpl/r/rpl_row_colSize.result
 share/mysql-test/suite/rpl/r/rpl_row_conflicts.result
+share/mysql-test/suite/rpl/r/rpl_row_corruption.result
 share/mysql-test/suite/rpl/r/rpl_row_create_table.result
 share/mysql-test/suite/rpl/r/rpl_row_delayed_ins.result
 share/mysql-test/suite/rpl/r/rpl_row_drop.result
@@ -4090,6 +4102,8 @@ share/mysql-test/suite/rpl/t/rpl_row_blob_innodb.test
 share/mysql-test/suite/rpl/t/rpl_row_blob_myisam.test
 share/mysql-test/suite/rpl/t/rpl_row_colSize.test
 share/mysql-test/suite/rpl/t/rpl_row_conflicts.test
+share/mysql-test/suite/rpl/t/rpl_row_corruption-slave.opt
+share/mysql-test/suite/rpl/t/rpl_row_corruption.test
 share/mysql-test/suite/rpl/t/rpl_row_create_table.test
 share/mysql-test/suite/rpl/t/rpl_row_delayed_ins.test
 share/mysql-test/suite/rpl/t/rpl_row_drop.test
diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo
index 70eb8a5921c..473138891dd 100644
--- a/databases/mysql51-server/distinfo
+++ b/databases/mysql51-server/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.20 2011/08/02 14:10:35 taca Exp $
+$NetBSD: distinfo,v 1.21 2011/12/02 14:25:10 adam Exp $
 
-SHA1 (mysql-5.1.58.tar.gz) = cfd70bee07ad99576eecde01785b7b2a74ec87ab
-RMD160 (mysql-5.1.58.tar.gz) = 199729c701c764cd22584c2b952230c07d0f31a6
-Size (mysql-5.1.58.tar.gz) = 24333490 bytes
+SHA1 (mysql-5.1.60.tar.gz) = 26ae4d2f7e7066644eb343ab519cbef1626069c2
+RMD160 (mysql-5.1.60.tar.gz) = 7bbfce4fecc2a8e1ca081169e70c1a298ab1b75a
+Size (mysql-5.1.60.tar.gz) = 24408313 bytes
 SHA1 (patch-aa) = 2a5321738e637a56e57cd6b1b40908d2bf275506
 SHA1 (patch-ab) = 4c485a74d55553d63fc3dbc0350d0aa0068e1fcf
 SHA1 (patch-ac) = bfb6eec77d7c5aa8d2b849632769005dcf2e272c