Changes 5.6.14:

* MySQL 5.7 changed audit log file output to a new format that has better compatibility with Oracle Audit Vault. This format has been backported to MySQL 5.6 and it is possible to select either the old or new format using the new audit_log_format system variable, which has permitted values of OLD and NEW (default OLD). For details about each format, see The Audit Log File.
* Important Change; Replication: START SLAVE UNTIL SQL_AFTER_GTIDS did not cause the slave to stop until the next GTID event was received following execution of the transaction having the indicated GTID, which could cause issues in the case when the next GTID event is delayed, or does not exist. Now the slave stops after completing the transaction with that GTID.
* InnoDB; Partitioning: Following any query on the INFORMATION_SCHEMA.PARTITIONS table, InnoDB index statistics as shown in the output of statements such as SELECT * FROM INFORMATION_SCHEMA.STATISTICS were read from the last partition, instead of from the partition containing the greatest number of rows.
* InnoDB: When logging the delete-marking of a record during online ALTER TABLE...ADD PRIMARY KEY, InnoDB writes the transaction ID to the log as it was before the deletion or delete-marking of the record. When doing this, InnoDB would overwrite the DB_TRX_ID field in the original table, which could result in locking issues.
* InnoDB: The row_sel_sec_rec_is_for_clust_rec function would incorrectly prepare to compare a NULL column prefix in a secondary index with a non-NULL column in a clustered index.
* InnoDB: An incorrect purge would occur when rolling back an update to a delete-marked record.
* InnoDB: An assertion would be raised in fil_node_open_file due to a missing .ibd file. Instead of asserting, InnoDB should return false and the caller of fil_node_open_file should handle the return message.
* InnoDB: The assertion ut_ad(oldest_lsn <= cur_lsn) in file buf0flu.cc would fail because the current max LSN would be retrieved from the buffer pool before the oldest LSN.
* InnoDB: InnoDB memcached add and set operations would perform more slowly than SQL INSERT operations.
* InnoDB: The InnoDB memcached plugin could be initialized to insert into an InnoDB table with an INTEGER primary key.
More...

5 files changed, 31 insertions, 22 deletions

diff --git a/databases/mysql56-client/Makefile b/databases/mysql56-client/Makefile
index 0a5d0f42923..5825c417f0f 100644
--- a/databases/mysql56-client/Makefile
+++ b/databases/mysql56-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2013/08/31 02:09:25 taca Exp $
+# $NetBSD: Makefile,v 1.8 2013/10/01 10:26:39 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
-PKGREVISION=	1
 SVR4_PKGNAME=	mysqc
 COMMENT=	MySQL 5, a free SQL database (client)
 
diff --git a/databases/mysql56-client/Makefile.common b/databases/mysql56-client/Makefile.common
index b042f95f63d..5bc975ce8ef 100644
--- a/databases/mysql56-client/Makefile.common
+++ b/databases/mysql56-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.9 2013/07/31 09:51:38 adam Exp $
+# $NetBSD: Makefile.common,v 1.10 2013/10/01 10:26:39 adam Exp $
 #
 # used by databases/mysql56-client/Makefile
 # used by databases/mysql56-server/Makefile
 
-DISTNAME=	mysql-5.6.13
+DISTNAME=	mysql-5.6.14
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.6/}
 
diff --git a/databases/mysql56-client/distinfo b/databases/mysql56-client/distinfo
index 271694d6a7c..69f78a7e3fc 100644
--- a/databases/mysql56-client/distinfo
+++ b/databases/mysql56-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2013/07/31 09:51:38 adam Exp $
+$NetBSD: distinfo,v 1.10 2013/10/01 10:26:39 adam Exp $
 
-SHA1 (mysql-5.6.13.tar.gz) = 06e1d856cfb1f98844ef92af47d4f4f7036ef294
-RMD160 (mysql-5.6.13.tar.gz) = 22411eda9da0d931a44ab0710ded76c065cd05e6
-Size (mysql-5.6.13.tar.gz) = 35951160 bytes
+SHA1 (mysql-5.6.14.tar.gz) = 7cf44fb2a7733b52559f66c00446122bc79321d2
+RMD160 (mysql-5.6.14.tar.gz) = e1827858c60d674ac1ddeb4f71e689d49855eec9
+Size (mysql-5.6.14.tar.gz) = 36005278 bytes
 SHA1 (patch-CMakeLists.txt) = 1889afcd79a271d3f9ac0e234c449ef6aa8ca818
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
 SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
@@ -93,7 +93,7 @@ SHA1 (patch-sql_sql__update.cc) = 9a56187727fd1538b059e2d87ca0ec15ebf3e0ff
 SHA1 (patch-sql_sql_string.h) = 1ce4d4db59310ea45e384f34e33c0d61935059bf
 SHA1 (patch-sql_sys__vars.cc) = f122050ef87e673763db4fa64202139834400d2c
 SHA1 (patch-sql_table.cc) = ec9bb0891319918c306b0349fe43647e979bec4c
-SHA1 (patch-sql_transaction.cc) = 76316a7f0e7a81f47d194a0a1693b07873922969
+SHA1 (patch-sql_transaction.cc) = 34823a32f42472cf46df10e04294cd907170b41e
 SHA1 (patch-sql_tztime.cc) = b17a31afe95cc220b57906d263c5783793c169f4
 SHA1 (patch-sql_unireg.cc) = 0d94b247c36838abe5cb683782dd16c05b322f32
 SHA1 (patch-storage_federated_ha__federated.cc) = 17e575d4382a6d4c9005be77e7b4254380226e7c
diff --git a/databases/mysql56-client/patches/patch-sql_transaction.cc b/databases/mysql56-client/patches/patch-sql_transaction.cc
index 35b7bf6b530..7b3c78dc4bf 100644
--- a/databases/mysql56-client/patches/patch-sql_transaction.cc
+++ b/databases/mysql56-client/patches/patch-sql_transaction.cc
@@ -1,8 +1,8 @@
-$NetBSD: patch-sql_transaction.cc,v 1.1 2013/05/06 14:41:08 joerg Exp $
+$NetBSD: patch-sql_transaction.cc,v 1.2 2013/10/01 10:26:39 adam Exp $
 
 --- sql/transaction.cc.orig	2013-05-05 20:56:04.000000000 +0000
 +++ sql/transaction.cc
-@@ -134,7 +134,7 @@ bool trans_begin(THD *thd, uint flags)
+@@ -143,7 +143,7 @@ bool trans_begin(THD *thd, uint flags)
      thd->server_status&=
        ~(SERVER_STATUS_IN_TRANS | SERVER_STATUS_IN_TRANS_READONLY);
      DBUG_PRINT("info", ("clearing SERVER_STATUS_IN_TRANS"));
@@ -11,7 +11,7 @@ $NetBSD: patch-sql_transaction.cc,v 1.1 2013/05/06 14:41:08 joerg Exp $
    }
  
    thd->variables.option_bits&= ~OPTION_BEGIN;
-@@ -163,7 +163,7 @@ bool trans_begin(THD *thd, uint flags)
+@@ -172,7 +172,7 @@ bool trans_begin(THD *thd, uint flags)
        compatibility.
      */
      const bool user_is_super=
@@ -20,7 +20,7 @@ $NetBSD: patch-sql_transaction.cc,v 1.1 2013/05/06 14:41:08 joerg Exp $
      if (opt_readonly && !user_is_super)
      {
        my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "--read-only");
-@@ -182,7 +182,7 @@ bool trans_begin(THD *thd, uint flags)
+@@ -191,7 +191,7 @@ bool trans_begin(THD *thd, uint flags)
    if (flags & MYSQL_START_TRANS_OPT_WITH_CONS_SNAPSHOT)
      res= ha_start_consistent_snapshot(thd);
  
@@ -29,7 +29,7 @@ $NetBSD: patch-sql_transaction.cc,v 1.1 2013/05/06 14:41:08 joerg Exp $
  }
  
  
-@@ -221,7 +221,7 @@ bool trans_commit(THD *thd)
+@@ -230,7 +230,7 @@ bool trans_commit(THD *thd)
    thd->transaction.all.reset_unsafe_rollback_flags();
    thd->lex->start_transaction_opt= 0;
  
@@ -38,7 +38,7 @@ $NetBSD: patch-sql_transaction.cc,v 1.1 2013/05/06 14:41:08 joerg Exp $
  }
  
  
-@@ -263,7 +263,7 @@ bool trans_commit_implicit(THD *thd)
+@@ -278,7 +278,7 @@ bool trans_commit_implicit(THD *thd)
      thd->server_status&=
        ~(SERVER_STATUS_IN_TRANS | SERVER_STATUS_IN_TRANS_READONLY);
      DBUG_PRINT("info", ("clearing SERVER_STATUS_IN_TRANS"));
@@ -47,7 +47,7 @@ $NetBSD: patch-sql_transaction.cc,v 1.1 2013/05/06 14:41:08 joerg Exp $
    }
    else if (tc_log)
      tc_log->commit(thd, true);
-@@ -319,7 +319,7 @@ bool trans_rollback(THD *thd)
+@@ -334,7 +334,7 @@ bool trans_rollback(THD *thd)
    thd->transaction.all.reset_unsafe_rollback_flags();
    thd->lex->start_transaction_opt= 0;
  
@@ -56,7 +56,16 @@ $NetBSD: patch-sql_transaction.cc,v 1.1 2013/05/06 14:41:08 joerg Exp $
  }
  
  
-@@ -382,7 +382,7 @@ bool trans_commit_stmt(THD *thd)
+@@ -380,7 +380,7 @@ bool trans_rollback_implicit(THD *thd)
+   /* Rollback should clear transaction_rollback_request flag. */
+   DBUG_ASSERT(! thd->transaction_rollback_request);
+ 
+-  DBUG_RETURN(test(res));
++  DBUG_RETURN(my_test(res));
+ }
+ 
+ 
+@@ -443,7 +443,7 @@ bool trans_commit_stmt(THD *thd)
  
    thd->transaction.stmt.reset();
  
@@ -65,7 +74,7 @@ $NetBSD: patch-sql_transaction.cc,v 1.1 2013/05/06 14:41:08 joerg Exp $
  }
  
  
-@@ -588,7 +588,7 @@ bool trans_rollback_to_savepoint(THD *th
+@@ -647,7 +647,7 @@ bool trans_rollback_to_savepoint(THD *th
    if (!res && !binlog_on)
      thd->mdl_context.rollback_to_savepoint(sv->mdl_savepoint);
  
@@ -74,7 +83,7 @@ $NetBSD: patch-sql_transaction.cc,v 1.1 2013/05/06 14:41:08 joerg Exp $
  }
  
  
-@@ -630,7 +630,7 @@ bool trans_release_savepoint(THD *thd, L
+@@ -689,7 +689,7 @@ bool trans_release_savepoint(THD *thd, L
  
    thd->transaction.savepoints= sv->prev;
  
@@ -83,7 +92,7 @@ $NetBSD: patch-sql_transaction.cc,v 1.1 2013/05/06 14:41:08 joerg Exp $
  }
  
  
-@@ -794,7 +794,7 @@ bool trans_xa_commit(THD *thd)
+@@ -853,7 +853,7 @@ bool trans_xa_commit(THD *thd)
    else if (xa_state == XA_IDLE && thd->lex->xa_opt == XA_ONE_PHASE)
    {
      int r= ha_commit_trans(thd, TRUE);
@@ -92,7 +101,7 @@ $NetBSD: patch-sql_transaction.cc,v 1.1 2013/05/06 14:41:08 joerg Exp $
        my_error(r == 1 ? ER_XA_RBROLLBACK : ER_XAER_RMERR, MYF(0));
    }
    else if (xa_state == XA_PREPARED && thd->lex->xa_opt == XA_NONE)
-@@ -822,9 +822,9 @@ bool trans_xa_commit(THD *thd)
+@@ -881,9 +881,9 @@ bool trans_xa_commit(THD *thd)
        DEBUG_SYNC(thd, "trans_xa_commit_after_acquire_commit_lock");
  
        if (tc_log)
diff --git a/databases/mysql56-server/PLIST b/databases/mysql56-server/PLIST
index f7e780fcf04..40eecd47399 100644
--- a/databases/mysql56-server/PLIST
+++ b/databases/mysql56-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2013/07/31 09:51:38 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2013/10/01 10:26:39 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -501,6 +501,7 @@ share/mysql/test/include/have_utf16.inc
 share/mysql/test/include/have_utf32.inc
 share/mysql/test/include/have_utf8.inc
 share/mysql/test/include/have_utf8mb4.inc
+share/mysql/test/include/have_valgrind.inc
 share/mysql/test/include/have_validate_password_plugin.inc
 share/mysql/test/include/ib_logfile_size_check.inc
 share/mysql/test/include/icp_tests.inc