Update to MySQL Cluster 7.4.7: this is mainly a bug fix release.

pkgsrc change: delete one patch that has been upstreamed

Changes in MySQL Cluster NDB 7.4.7 (5.6.25-ndb-7.4.7) (2015-07-13)

MySQL Cluster NDB 7.4.7 is a new release of MySQL Cluster 7.4,
based on MySQL Server 5.6 and including features in version 7.4 of
the NDB storage engine, as well as fixing recently discovered bugs
in previous MySQL Cluster releases.

This release also incorporates all bugfixes and changes made in
previous MySQL Cluster releases, as well as all bugfixes and feature
changes which were added in mainline MySQL 5.6 through MySQL 5.6.25
(see Changes in MySQL 5.6.25 (2015-05-29)).

Functionality Added or Changed
- Deprecated MySQL Cluster node configuration parameters are now
  indicated as such by ndb_config --configinfo --xml. For each
  parameter currently deprecated, the corresponding <param/> tag
  in the XML output now includes the attribute deprecated="true".
  (Bug #21127135)

Bugs Fixed
- Important Change; Cluster API: The Ndb::getHighestQueuedEpoch()
  method returned the greatest epoch in the event queue instead of
  the greatest epoch found after calling pollEvents2().  (Bug
  #20700220)
- Important Change; Cluster API: Ndb::pollEvents() is now compatible
  with the TE_EMPTY, TE_INCONSISTENT, and TE_OUT_OF_MEMORY event
  types introduced in MySQL Cluster NDB 7.4.3.  For detailed
  information about this change, see the description of this method
  in the MySQL Cluster API Developer Guide. (Bug #20646496)
- Important Change; Cluster API: Added the method
  Ndb::isExpectingHigherQueuedEpochs() to the NDB API to detect
  when additional, newer event epochs were detected by pollEvents2().
  The behavior of Ndb::pollEvents() has also been modified such
  that it now returns NDB_FAILURE_GCI (equal to ~(Uint64)0) when
  a cluster failure has been detected. (Bug #18753887)
- After restoring the database metadata (but not any data) by
  running ndb_restore --restore_meta (or -m), SQL nodes would hang
  while trying to SELECT from a table in the database to which the
  metadata was restored. In such cases the attempt to query the
  table now fails as expected, since the table does not actually
  exist until ndb_restore is executed with --restore_data (-r).
  (Bug #21184102) References: See also Bug #16890703.
- When a great many threads opened and closed blocks in the NDB
  API in rapid succession, the internal close_clnt() function
  synchronizing the closing of the blocks waited an insufficiently
  long time for a self-signal indicating potential additional
  signals needing to be processed. This led to excessive CPU usage
  by ndb_mgmd, and prevented other threads from opening or closing
  other blocks.  This issue is fixed by changing the function
  polling call to wait on a specific condition to be woken up (that
  is, when a signal has in fact been executed). (Bug #21141495)
- Previously, multiple send threads could be invoked for handling
  sends to the same node; these threads then competed for the same
  send lock. While the send lock blocked the additional send threads,
  work threads could be passed to other nodes.  This issue is fixed
  by ensuring that new send threads are not activated while there
  is already an active send thread assigned to the same node. In
  addition, a node already having an active send thread assigned
  to it is no longer visible to other, already active, send threads;
  that is, such a node is longer added to the node list when a send
  thread is currently assigned to it. (Bug #20954804, Bug #76821)
- Queueing of pending operations when the redo log was overloaded
  (DefaultOperationRedoProblemAction API node configuration parameter)
  could lead to timeouts when data nodes ran out of redo log space
  (P_TAIL_PROBLEM errors). Now when the redo log is full, the node
  aborts requests instead of queuing them. (Bug #20782580) References:
  See also Bug #20481140.
- An NDB event buffer can be used with an Ndb object to subscribe
  to table-level row change event streams. Users subscribe to an
  existing event; this causes the data nodes to start sending event
  data signals (SUB_TABLE_DATA) and epoch completion signals
  (SUB_GCP_COMPLETE) to the Ndb object. SUB_GCP_COMPLETE_REP signals
  can arrive for execution in concurrent receiver thread before
  completion of the internal method call used to start a subscription.
  Execution of SUB_GCP_COMPLETE_REP signals depends on the total
  number of SUMA buckets (sub data streams), but this may not yet
  have been set, leading to the present issue, when the counter
  used for tracking the SUB_GCP_COMPLETE_REP signals (TOTAL_BUCKETS_INIT)
  was found to be set to erroneous values. Now TOTAL_BUCKETS_INIT
  is tested to be sure it has been set correctly before it is used.
  (Bug #20575424) References: See also Bug #20561446, Bug #21616263.
- NDB statistics queries could be delayed by the error delay set
  for ndb_index_stat_option (default 60 seconds) when the index
  that was queried had been marked with internal error. The same
  underlying issue could also cause ANALYZE TABLE to hang when
  executed against an NDB table having multiple indexes where an
  internal error occured on one or more but not all indexes.  Now
  in such cases, any existing statistics are returned immediately,
  without waiting for any additonal statistics to be discovered.
  (Bug #20553313, Bug #20707694, Bug #76325)
- The multi-threaded scheduler sends to remote nodes either directly
  from each worker thread or from dedicated send threads, depending
  on the cluster's configuration. This send might transmit all,
  part, or none of the available data from the send buffers. While
  there remained pending send data, the worker or send threads
  continued trying to send in a loop. The actual size of the data
  sent in the most recent attempt to perform a send is now tracked,
  and used to detect lack of send progress by the send or worker
  threads. When no progress has been made, and there is no other
  work outstanding, the scheduler takes a 1 millisecond pause to
  free up the CPU for use by other threads. (Bug #18390321)
  References: See also Bug #20929176, Bug #20954804.
- In some cases, attempting to restore a table that was previously
  backed up failed with a File Not Found error due to a missing
  table fragment file. This occurred as a result of the NDB kernel
  BACKUP block receiving a Busy error while trying to obtain the
  table description, due to other traffic from external clients,
  and not retrying the operation.  The fix for this issue creates
  two separate queues for such requests:  one for internal clients
  such as the BACKUP block or ndb_restore, and one for external
  clients such as API nodes and prioritizing the internal queue.
  Note that it has always been the case that external client
  applications using the NDB API (including MySQL applications
  running against an SQL node) are expected to handle Busy errors
  by retrying transactions at a later time; this expectation is
  not changed by the fix for this issue.  (Bug #17878183) References:
  See also Bug #17916243.
- On startup, API nodes (including mysqld processes running as SQL
  nodes) waited to connect with data nodes that had not yet joined
  the cluster. Now they wait only for data nodes that have actually
  already joined the cluster.  In the case of a new data node
  joining an existing cluster, API nodes still try to connect with
  the new data node within HeartbeatIntervalDbApi milliseconds.
  (Bug #17312761)
- In some cases, the DBDICT block failed to handle repeated
  GET_TABINFOREQ signals after the first one, leading to possible
  node failures and restarts. This could be observed after setting
  a sufficiently high value for MaxNoOfExecutionThreads and low
  value for LcpScanProgressTimeout. (Bug #77433, Bug #21297221)
- Client lookup for delivery of API signals to the correct client
  by the internal TransporterFacade::deliver_signal() function had
  no mutex protection, which could cause issues such as timeouts
  encountered during testing, when other clients connected to the
  same TransporterFacade. (Bug #77225, Bug #21185585)
- It was possible to end up with a lock on the send buffer mutex
  when send buffers became a limiting resource, due either to
  insufficient send buffer resource configuration, problems with
  slow or failing communications such that all send buffers became
  exhausted, or slow receivers failing to consume what was sent.
  In this situation worker threads failed to allocate send buffer
  memory for signals, and attempted to force a send in order to
  free up space, while at the same time the send thread was busy
  trying to send to the same node or nodes. All of these threads
  competed for taking the send buffer mutex, which resulted in the
  lock already described, reported by the watchdog as Stuck in
  Send. This fix is made in two parts, listed here:
  1. The send thread no longer holds the global send thread mutex
  while getting the send buffer mutex; it now releases the global
  mutex prior to locking the send buffer mutex. This keeps worker
  threads from getting stuck in send in such cases.
  2. Locking of the send buffer mutex done by the send threads now
  uses a try-lock. If the try-lock fails, the node to make the send
  to is reinserted at the end of the list of send nodes in order
  to be retried later. This removes the Stuck in Send condition
  for the send threads.  (Bug #77081, Bug #21109605)
- Cluster API: The pollEvents2() method now waits indefinitely for
  events when a negative value is used for the time argument. (Bug
  #20762291)
- Cluster API: NdbEventOperation::isErrorEpoch() incorrectly returned
  false for the TE_INCONSISTENT table event type (see The
  Event::TableEvent Type). This caused a subsequent call to
  getEventType() to fail. (Bug #20729091)
- Cluster API: Creation and destruction of Ndb_cluster_connection
  objects by multiple threads could make use of the same application
  lock, which in some cases led to failures in the global dictionary
  cache. To alleviate this problem, the creation and destruction
  of several internal NDB API objects have been serialized. (Bug
  #20636124)
- Cluster API: A number of timeouts were not handled correctly in
  the NDB API.  (Bug #20617891)
- Cluster API: When an Ndb object created prior to a failure of
  the cluster was reused, the event queue of this object could
  still contain data node events originating from before the failure.
  These events could reference old epochs (from before the failure
  occurred), which in turn could violate the assumption made by
  the nextEvent() method that epoch numbers always increase. This
  issue is addressed by explicitly clearing the event queue in such
  cases. (Bug #18411034) References: See also Bug #20888668.

5 files changed, 138 insertions, 26 deletions

diff --git a/databases/mysql-cluster/Makefile b/databases/mysql-cluster/Makefile
index fcaeb7d651c..f0f34e3087e 100644
--- a/databases/mysql-cluster/Makefile
+++ b/databases/mysql-cluster/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2015/07/13 21:36:35 jperkin Exp $
+# $NetBSD: Makefile,v 1.9 2015/09/07 04:33:06 jnemeth Exp $
 
 PKGNAME=		${DISTNAME:S/-gpl//}
-PKGREVISION=		2
 COMMENT=		MySQL Cluster 7.4, a free SQL clustered database
 
 CONFLICTS=		mysql*-{client,server}-[0-9]*
diff --git a/databases/mysql-cluster/Makefile.common b/databases/mysql-cluster/Makefile.common
index 10a492d3b2e..e77dad516c1 100644
--- a/databases/mysql-cluster/Makefile.common
+++ b/databases/mysql-cluster/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.7 2015/06/22 15:16:24 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.8 2015/09/07 04:33:06 jnemeth Exp $
 #
 # used by databases/mysql-cluster/Makefile
 
-DISTNAME=	mysql-cluster-gpl-7.4.6
+DISTNAME=	mysql-cluster-gpl-7.4.7
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-Cluster-7.4/}
 
diff --git a/databases/mysql-cluster/PLIST b/databases/mysql-cluster/PLIST
index 750f8127b1e..0e857d7270c 100644
--- a/databases/mysql-cluster/PLIST
+++ b/databases/mysql-cluster/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2015/05/25 22:17:36 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.6 2015/09/07 04:33:06 jnemeth Exp $
 bin/innochecksum
 bin/mcc_config.py
 bin/memclient
@@ -6294,6 +6294,7 @@ share/mysql/test/include/analyze-sync_with_master.test
 share/mysql/test/include/analyze-timeout.test
 share/mysql/test/include/assert.inc
 share/mysql/test/include/assert_command_output.inc
+share/mysql/test/include/assert_grep.inc
 share/mysql/test/include/begin_include_file.inc
 share/mysql/test/include/big_test.inc
 share/mysql/test/include/binlog_inject_error.inc
@@ -6551,6 +6552,7 @@ share/mysql/test/include/ndb_restore_master.inc
 share/mysql/test/include/ndb_restore_slave_eoption.inc
 share/mysql/test/include/ndb_setup_slave.inc
 share/mysql/test/include/ndb_wait_connected.inc
+share/mysql/test/include/no_protocol.inc
 share/mysql/test/include/no_running_event_scheduler.inc
 share/mysql/test/include/no_running_events.inc
 share/mysql/test/include/no_valgrind_without_big.inc
@@ -6716,6 +6718,7 @@ share/mysql/test/include/wait_for_slave_sql_to_start.inc
 share/mysql/test/include/wait_for_slave_sql_to_stop.inc
 share/mysql/test/include/wait_for_slave_to_start.inc
 share/mysql/test/include/wait_for_slave_to_stop.inc
+share/mysql/test/include/wait_for_slave_to_sync_with_master.inc
 share/mysql/test/include/wait_for_status_var.inc
 share/mysql/test/include/wait_innodb_all_purged.inc
 share/mysql/test/include/wait_show_condition.inc
@@ -7183,6 +7186,7 @@ share/mysql/test/r/lock_multi_bug38499.result
 share/mysql/test/r/lock_multi_bug38691.result
 share/mysql/test/r/lock_sync.result
 share/mysql/test/r/lock_tables_lost_commit.result
+share/mysql/test/r/log_empty_name.result
 share/mysql/test/r/log_errchk.result
 share/mysql/test/r/log_state.result
 share/mysql/test/r/log_state_bug33693.result
@@ -7320,6 +7324,7 @@ share/mysql/test/r/packet.result
 share/mysql/test/r/parser.result
 share/mysql/test/r/parser_bug21114_innodb.result
 share/mysql/test/r/parser_not_embedded.result
+share/mysql/test/r/parser_old_temporals.result
 share/mysql/test/r/parser_precedence.result
 share/mysql/test/r/parser_stack.result
 share/mysql/test/r/partition.result
@@ -9556,7 +9561,9 @@ share/mysql/test/suite/innodb/r/insert_debug.result
 share/mysql/test/suite/innodb/r/monitor.result
 share/mysql/test/suite/innodb/r/monitor_debug.result
 share/mysql/test/suite/innodb/r/sp_temp_table.result
+share/mysql/test/suite/innodb/r/strict_checksum.result
 share/mysql/test/suite/innodb/r/strict_mode.result
+share/mysql/test/suite/innodb/r/xa_recovery.result
 share/mysql/test/suite/innodb/t/add_foreign_key.test
 share/mysql/test/suite/innodb/t/blob-update-debug.test
 share/mysql/test/suite/innodb/t/blob_redo-master.opt
@@ -9772,7 +9779,9 @@ share/mysql/test/suite/innodb/t/monitor_debug.test
 share/mysql/test/suite/innodb/t/portability_wl5980_linux.zip
 share/mysql/test/suite/innodb/t/portability_wl5980_windows.zip
 share/mysql/test/suite/innodb/t/sp_temp_table.test
+share/mysql/test/suite/innodb/t/strict_checksum.test
 share/mysql/test/suite/innodb/t/strict_mode.test
+share/mysql/test/suite/innodb/t/xa_recovery.test
 share/mysql/test/suite/innodb_fts/r/fts_compatibility.result
 share/mysql/test/suite/innodb_fts/r/fts_compatibility_win.result
 share/mysql/test/suite/innodb_fts/r/fulltext.result
@@ -9841,6 +9850,105 @@ share/mysql/test/suite/innodb_fts/t/innodb_fts_stopword_charset.test
 share/mysql/test/suite/innodb_fts/t/innodb_fts_transaction.test
 share/mysql/test/suite/innodb_fts/t/phrase.test
 share/mysql/test/suite/innodb_fts/t/subexpr.test
+share/mysql/test/suite/innodb_stress/include/innodb_stress.inc
+share/mysql/test/suite/innodb_stress/r/innodb_bigstress.result
+share/mysql/test/suite/innodb_stress/r/innodb_bigstress_blob.result
+share/mysql/test/suite/innodb_stress/r/innodb_bigstress_blob_nocompress.result
+share/mysql/test/suite/innodb_stress/r/innodb_bigstress_crash.result
+share/mysql/test/suite/innodb_stress/r/innodb_bigstress_crash_blob.result
+share/mysql/test/suite/innodb_stress/r/innodb_bigstress_crash_blob_nocompress.result
+share/mysql/test/suite/innodb_stress/r/innodb_bigstress_crash_nocompress.result
+share/mysql/test/suite/innodb_stress/r/innodb_bigstress_nocompress.result
+share/mysql/test/suite/innodb_stress/r/innodb_hugestress.result
+share/mysql/test/suite/innodb_stress/r/innodb_hugestress_blob.result
+share/mysql/test/suite/innodb_stress/r/innodb_hugestress_blob_nocompress.result
+share/mysql/test/suite/innodb_stress/r/innodb_hugestress_crash.result
+share/mysql/test/suite/innodb_stress/r/innodb_hugestress_crash_blob.result
+share/mysql/test/suite/innodb_stress/r/innodb_hugestress_crash_blob_nocompress.result
+share/mysql/test/suite/innodb_stress/r/innodb_hugestress_crash_nocompress.result
+share/mysql/test/suite/innodb_stress/r/innodb_hugestress_nocompress.result
+share/mysql/test/suite/innodb_stress/r/innodb_stress.result
+share/mysql/test/suite/innodb_stress/r/innodb_stress_blob.result
+share/mysql/test/suite/innodb_stress/r/innodb_stress_blob_nocompress.result
+share/mysql/test/suite/innodb_stress/r/innodb_stress_crash.result
+share/mysql/test/suite/innodb_stress/r/innodb_stress_crash_blob.result
+share/mysql/test/suite/innodb_stress/r/innodb_stress_crash_blob_nocompress.result
+share/mysql/test/suite/innodb_stress/r/innodb_stress_crash_nocompress.result
+share/mysql/test/suite/innodb_stress/r/innodb_stress_nocompress.result
+share/mysql/test/suite/innodb_stress/t/Readme
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress.test
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_blob-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_blob-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_blob.test
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_blob_nocompress-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_blob_nocompress-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_blob_nocompress.test
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_crash-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_crash-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_crash.test
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_crash_blob-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_crash_blob-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_crash_blob.test
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_crash_blob_nocompress-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_crash_blob_nocompress-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_crash_blob_nocompress.test
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_crash_nocompress-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_crash_nocompress-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_crash_nocompress.test
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_nocompress-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_nocompress-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_nocompress.test
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress.test
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_blob-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_blob-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_blob.test
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_blob_nocompress-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_blob_nocompress-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_blob_nocompress.test
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_crash-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_crash-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_crash.test
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_crash_blob-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_crash_blob-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_crash_blob.test
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_crash_blob_nocompress-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_crash_blob_nocompress-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_crash_blob_nocompress.test
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_crash_nocompress-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_crash_nocompress-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_crash_nocompress.test
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_nocompress-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_nocompress-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_nocompress.test
+share/mysql/test/suite/innodb_stress/t/innodb_stress-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_stress-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_stress.test
+share/mysql/test/suite/innodb_stress/t/innodb_stress_blob-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_stress_blob-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_stress_blob.test
+share/mysql/test/suite/innodb_stress/t/innodb_stress_blob_nocompress-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_stress_blob_nocompress-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_stress_blob_nocompress.test
+share/mysql/test/suite/innodb_stress/t/innodb_stress_crash-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_stress_crash-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_stress_crash.test
+share/mysql/test/suite/innodb_stress/t/innodb_stress_crash_blob-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_stress_crash_blob-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_stress_crash_blob.test
+share/mysql/test/suite/innodb_stress/t/innodb_stress_crash_blob_nocompress-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_stress_crash_blob_nocompress-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_stress_crash_blob_nocompress.test
+share/mysql/test/suite/innodb_stress/t/innodb_stress_crash_nocompress-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_stress_crash_nocompress-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_stress_crash_nocompress.test
+share/mysql/test/suite/innodb_stress/t/innodb_stress_nocompress-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_stress_nocompress-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_stress_nocompress.test
+share/mysql/test/suite/innodb_stress/t/load_generator.py
 share/mysql/test/suite/innodb_zip/include/innodb_create_tab_indx.inc
 share/mysql/test/suite/innodb_zip/include/innodb_fetch_records.inc
 share/mysql/test/suite/innodb_zip/include/innodb_load_data.inc
@@ -10437,6 +10545,8 @@ share/mysql/test/suite/ndb/r/ndb_types.result
 share/mysql/test/suite/ndb/r/ndb_update.result
 share/mysql/test/suite/ndb/r/ndb_update_no_read.result
 share/mysql/test/suite/ndb/r/ndb_view.result
+share/mysql/test/suite/ndb/r/ndb_wait_until_ready.result
+share/mysql/test/suite/ndb/r/ndb_wl946_compat.result
 share/mysql/test/suite/ndb/r/ndb_wl946_main.result
 share/mysql/test/suite/ndb/r/ndb_wl946_post.result
 share/mysql/test/suite/ndb/r/ndb_wl946_pre.result
@@ -10691,7 +10801,11 @@ share/mysql/test/suite/ndb/t/ndb_update_no_read.test
 share/mysql/test/suite/ndb/t/ndb_view.test
 share/mysql/test/suite/ndb/t/ndb_wait_nostart.inc
 share/mysql/test/suite/ndb/t/ndb_wait_started.inc
+share/mysql/test/suite/ndb/t/ndb_wait_until_ready.cnf
+share/mysql/test/suite/ndb/t/ndb_wait_until_ready.test
 share/mysql/test/suite/ndb/t/ndb_waiter.inc
+share/mysql/test/suite/ndb/t/ndb_wl946_compat-master.opt
+share/mysql/test/suite/ndb/t/ndb_wl946_compat.test
 share/mysql/test/suite/ndb/t/ndb_wl946_create.inc
 share/mysql/test/suite/ndb/t/ndb_wl946_main.test
 share/mysql/test/suite/ndb/t/ndb_wl946_main_query.inc
@@ -10763,6 +10877,8 @@ share/mysql/test/suite/ndb_binlog/r/ndb_binlog_multi.result
 share/mysql/test/suite/ndb_binlog/r/ndb_binlog_purge.result
 share/mysql/test/suite/ndb_binlog/r/ndb_binlog_restore.result
 share/mysql/test/suite/ndb_binlog/r/ndb_binlog_size_based_rotate.result
+share/mysql/test/suite/ndb_binlog/r/ndb_binlog_temporals_new.result
+share/mysql/test/suite/ndb_binlog/r/ndb_binlog_temporals_old.result
 share/mysql/test/suite/ndb_binlog/r/ndb_binlog_test_conflict_flags.result
 share/mysql/test/suite/ndb_binlog/r/ndb_binlog_unique_epoch.result
 share/mysql/test/suite/ndb_binlog/r/ndb_binlog_variants.result
@@ -10803,6 +10919,10 @@ share/mysql/test/suite/ndb_binlog/t/ndb_binlog_purge.test
 share/mysql/test/suite/ndb_binlog/t/ndb_binlog_restore-master.opt
 share/mysql/test/suite/ndb_binlog/t/ndb_binlog_restore.test
 share/mysql/test/suite/ndb_binlog/t/ndb_binlog_size_based_rotate.test
+share/mysql/test/suite/ndb_binlog/t/ndb_binlog_temporals.inc
+share/mysql/test/suite/ndb_binlog/t/ndb_binlog_temporals_new.test
+share/mysql/test/suite/ndb_binlog/t/ndb_binlog_temporals_old-master.opt
+share/mysql/test/suite/ndb_binlog/t/ndb_binlog_temporals_old.test
 share/mysql/test/suite/ndb_binlog/t/ndb_binlog_test_conflict_flags.test
 share/mysql/test/suite/ndb_binlog/t/ndb_binlog_unique_epoch.cnf
 share/mysql/test/suite/ndb_binlog/t/ndb_binlog_unique_epoch.test
@@ -11609,7 +11729,6 @@ share/mysql/test/suite/perfschema/include/event_aggregate_setup.inc
 share/mysql/test/suite/perfschema/include/have_aligned_memory.inc
 share/mysql/test/suite/perfschema/include/hostcache_dump.inc
 share/mysql/test/suite/perfschema/include/hostcache_set_state.inc
-share/mysql/test/suite/perfschema/include/no_protocol.inc
 share/mysql/test/suite/perfschema/include/privilege.inc
 share/mysql/test/suite/perfschema/include/rpl_statements_truncate.inc
 share/mysql/test/suite/perfschema/include/schema.inc
@@ -12521,9 +12640,12 @@ share/mysql/test/suite/rpl/r/rpl_gtid_ignore_table_filter_insensitive.result
 share/mysql/test/suite/rpl/r/rpl_gtid_ignore_table_filter_sensitive.result
 share/mysql/test/suite/rpl/r/rpl_gtid_loaddata_s.result
 share/mysql/test/suite/rpl/r/rpl_gtid_mode.result
+share/mysql/test/suite/rpl/r/rpl_gtid_mode_off_new_master.result
+share/mysql/test/suite/rpl/r/rpl_gtid_mode_on_new_master.result
 share/mysql/test/suite/rpl/r/rpl_gtid_parallel.result
 share/mysql/test/suite/rpl/r/rpl_gtid_purged_fail_to_connect.result
 share/mysql/test/suite/rpl/r/rpl_gtid_purged_maintained.result
+share/mysql/test/suite/rpl/r/rpl_gtid_replay_relaylog.result
 share/mysql/test/suite/rpl/r/rpl_gtid_row_event_max_size.result
 share/mysql/test/suite/rpl/r/rpl_gtid_row_show_relaylog_events.result
 share/mysql/test/suite/rpl/r/rpl_gtid_server_sighup.result
@@ -13026,11 +13148,14 @@ share/mysql/test/suite/rpl/t/rpl_gtid_ignore_table_filter_sensitive.test
 share/mysql/test/suite/rpl/t/rpl_gtid_loaddata_s-slave.opt
 share/mysql/test/suite/rpl/t/rpl_gtid_loaddata_s.test
 share/mysql/test/suite/rpl/t/rpl_gtid_mode.test
+share/mysql/test/suite/rpl/t/rpl_gtid_mode_off_new_master.test
+share/mysql/test/suite/rpl/t/rpl_gtid_mode_on_new_master.test
 share/mysql/test/suite/rpl/t/rpl_gtid_parallel.test
 share/mysql/test/suite/rpl/t/rpl_gtid_purged_fail_to_connect-master.opt
 share/mysql/test/suite/rpl/t/rpl_gtid_purged_fail_to_connect-slave.opt
 share/mysql/test/suite/rpl/t/rpl_gtid_purged_fail_to_connect.test
 share/mysql/test/suite/rpl/t/rpl_gtid_purged_maintained.test
+share/mysql/test/suite/rpl/t/rpl_gtid_replay_relaylog.test
 share/mysql/test/suite/rpl/t/rpl_gtid_row_event_max_size-master.opt
 share/mysql/test/suite/rpl/t/rpl_gtid_row_event_max_size-slave.opt
 share/mysql/test/suite/rpl/t/rpl_gtid_row_event_max_size.test
@@ -15305,6 +15430,8 @@ share/mysql/test/t/lock_sync-master.opt
 share/mysql/test/t/lock_sync.test
 share/mysql/test/t/lock_tables_lost_commit-master.opt
 share/mysql/test/t/lock_tables_lost_commit.test
+share/mysql/test/t/log_empty_name.opt
+share/mysql/test/t/log_empty_name.test
 share/mysql/test/t/log_errchk.test
 share/mysql/test/t/log_state-master.opt
 share/mysql/test/t/log_state.test
@@ -15478,6 +15605,8 @@ share/mysql/test/t/packet.test
 share/mysql/test/t/parser.test
 share/mysql/test/t/parser_bug21114_innodb.test
 share/mysql/test/t/parser_not_embedded.test
+share/mysql/test/t/parser_old_temporals-master.opt
+share/mysql/test/t/parser_old_temporals.test
 share/mysql/test/t/parser_precedence.test
 share/mysql/test/t/parser_stack.test
 share/mysql/test/t/partition.test
diff --git a/databases/mysql-cluster/distinfo b/databases/mysql-cluster/distinfo
index f43e5171c99..d0ca1fac2be 100644
--- a/databases/mysql-cluster/distinfo
+++ b/databases/mysql-cluster/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2015/05/25 22:17:36 jnemeth Exp $
+$NetBSD: distinfo,v 1.5 2015/09/07 04:33:06 jnemeth Exp $
 
-SHA1 (mysql-cluster-gpl-7.4.6.tar.gz) = 7b2ccaf9b0a473b7e46994cd3687b31689fc4e65
-RMD160 (mysql-cluster-gpl-7.4.6.tar.gz) = 4cad13015557f1befbceed2b9ccd85d3b371d49c
-Size (mysql-cluster-gpl-7.4.6.tar.gz) = 42752111 bytes
+SHA1 (mysql-cluster-gpl-7.4.7.tar.gz) = be4d697eae16c1c75b287a07cf758f9e3bd00e0f
+RMD160 (mysql-cluster-gpl-7.4.7.tar.gz) = bc36b6758ca1bb4ccfd026ffc0abf630fb5f2d1e
+Size (mysql-cluster-gpl-7.4.7.tar.gz) = 42943769 bytes
 SHA1 (patch-CMakeLists.txt) = fabc427d8e7974cb8af1ce057f994b1436628443
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
 SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
@@ -36,4 +36,3 @@ SHA1 (patch-storage_myisammrg_CMakeLists.txt) = 0a56a16ccaff3fa9de996fec6ffc324a
 SHA1 (patch-storage_ndb_mcc_frontend_dojo_dojox_mobile_build_build.sh) = 1aa09b34d5f9cef6fb244a2ca8d675a22f30a9a8
 SHA1 (patch-storage_ndb_mcc_host__info_CMakeLists.txt) = c21711c96387d0e9ddda9eff01691f7fbf08cab3
 SHA1 (patch-strings_decimal.c) = 069c9d930c735f74510702baa9bef38aec425903
-SHA1 (patch-vio_viossl.c) = 538c08e6ec85d02a7eeead2bb940c91c7f701321
diff --git a/databases/mysql-cluster/patches/patch-vio_viossl.c b/databases/mysql-cluster/patches/patch-vio_viossl.c
deleted file mode 100644
index 91e998f725c..00000000000
--- a/databases/mysql-cluster/patches/patch-vio_viossl.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-vio_viossl.c,v 1.1.1.1 2014/12/01 05:58:03 jnemeth Exp $
-
-Compatibility fix.
-
---- vio/viossl.c.orig	2013-04-05 12:27:17.000000000 +0000
-+++ vio/viossl.c
-@@ -391,7 +391,7 @@ static int ssl_do(struct st_VioSSLFd *pt
-   SSL_clear(ssl);
-   SSL_SESSION_set_timeout(SSL_get_session(ssl), timeout);
-   SSL_set_fd(ssl, sd);
--#ifndef HAVE_YASSL
-+#if !defined(HAVE_YASSL) && defined(SSL_OP_NO_COMPRESSION)
-   SSL_set_options(ssl, SSL_OP_NO_COMPRESSION);
- #endif
-