Changes 5.1.61:

* InnoDB Storage Engine: Issuing INSERT...ON DUPLICATE KEY statements for
  InnoDB tables from concurrent threads could cause a deadlock, particularly
  with the INSERT...ON DUPLICATE KEY UPDATE form. The fix avoids deadlocks
  caused by the same row being accessed by more than one transaction. Deadlocks
  could still occur when multiple rows are inserted and updated simultaneously
  by different transactions in inconsistent order; those types of deadlocks
  require the standard error handling on the application side, of re-trying the
  transaction.
* An incorrect InnoDB assertion could cause the server to halt. This issue only
  affected debug builds. The assertion referenced the source file btr0pcur.ic
  and the variable cursor->pos_state.
* The handle_segfault() signal-handler code in mysqld could itself crash due to
  calling unsafe functions.
* ARCHIVE tables with NULL columns could cause server crashes or become corrupt
  under concurrent load.
* Enabling myisam_use_mmap could cause the server to crash.
* Concurrent access to ARCHIVE tables could cause corruption.

2 files changed, 12 insertions, 5 deletions

diff --git a/databases/mysql51-server/PLIST b/databases/mysql51-server/PLIST
index 20fa54698d7..9f558c568f4 100644
--- a/databases/mysql51-server/PLIST
+++ b/databases/mysql51-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2011/12/02 14:25:10 adam Exp $
+@comment $NetBSD: PLIST,v 1.18 2012/01/12 17:41:21 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -2700,6 +2700,7 @@ share/mysql-test/suite/innodb/r/innodb_multi_update.result
 share/mysql-test/suite/innodb/r/innodb_mysql.result
 share/mysql-test/suite/innodb/r/innodb_mysql_rbk.result
 share/mysql-test/suite/innodb/r/innodb_notembedded.result
+share/mysql-test/suite/innodb/r/innodb_replace.result
 share/mysql-test/suite/innodb/r/innodb_timeout_rollback.result
 share/mysql-test/suite/innodb/r/innodb_trx_weight.result
 share/mysql-test/suite/innodb/t/disabled.def
@@ -2766,6 +2767,7 @@ share/mysql-test/suite/innodb/t/innodb_mysql.test
 share/mysql-test/suite/innodb/t/innodb_mysql_rbk-master.opt
 share/mysql-test/suite/innodb/t/innodb_mysql_rbk.test
 share/mysql-test/suite/innodb/t/innodb_notembedded.test
+share/mysql-test/suite/innodb/t/innodb_replace.test
 share/mysql-test/suite/innodb/t/innodb_timeout_rollback-master.opt
 share/mysql-test/suite/innodb/t/innodb_timeout_rollback.test
 share/mysql-test/suite/innodb/t/innodb_trx_weight.test
@@ -2841,6 +2843,7 @@ share/mysql-test/suite/innodb_plugin/r/innodb_bug59307.result
 share/mysql-test/suite/innodb_plugin/r/innodb_bug59410.result
 share/mysql-test/suite/innodb_plugin/r/innodb_bug59641.result
 share/mysql-test/suite/innodb_plugin/r/innodb_bug60049.result
+share/mysql-test/suite/innodb_plugin/r/innodb_cmp_drop_table.result
 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
@@ -2850,6 +2853,7 @@ 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
 share/mysql-test/suite/innodb_plugin/r/innodb_notembedded.result
+share/mysql-test/suite/innodb_plugin/r/innodb_replace.result
 share/mysql-test/suite/innodb_plugin/r/innodb_timeout_rollback.result
 share/mysql-test/suite/innodb_plugin/r/innodb_trx_weight.result
 share/mysql-test/suite/innodb_plugin/t/disabled.def
@@ -2935,6 +2939,8 @@ 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_cmp_drop_table-master.opt
+share/mysql-test/suite/innodb_plugin/t/innodb_cmp_drop_table.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
@@ -2949,6 +2955,7 @@ share/mysql-test/suite/innodb_plugin/t/innodb_mysql.test
 share/mysql-test/suite/innodb_plugin/t/innodb_mysql_rbk-master.opt
 share/mysql-test/suite/innodb_plugin/t/innodb_mysql_rbk.test
 share/mysql-test/suite/innodb_plugin/t/innodb_notembedded.test
+share/mysql-test/suite/innodb_plugin/t/innodb_replace.test
 share/mysql-test/suite/innodb_plugin/t/innodb_timeout_rollback-master.opt
 share/mysql-test/suite/innodb_plugin/t/innodb_timeout_rollback.test
 share/mysql-test/suite/innodb_plugin/t/innodb_trx_weight.test
diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo
index 473138891dd..69efc634c81 100644
--- a/databases/mysql51-server/distinfo
+++ b/databases/mysql51-server/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.21 2011/12/02 14:25:10 adam Exp $
+$NetBSD: distinfo,v 1.22 2012/01/12 17:41:21 adam Exp $
 
-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 (mysql-5.1.61.tar.gz) = a528cf822af84601dd95d3e1cb3277815685ac65
+RMD160 (mysql-5.1.61.tar.gz) = 392b7394a0f7821134f177a3ba4580a29d60e3f4
+Size (mysql-5.1.61.tar.gz) = 24462261 bytes
 SHA1 (patch-aa) = 2a5321738e637a56e57cd6b1b40908d2bf275506
 SHA1 (patch-ab) = 4c485a74d55553d63fc3dbc0350d0aa0068e1fcf
 SHA1 (patch-ac) = bfb6eec77d7c5aa8d2b849632769005dcf2e272c