commit 1340381b5912328bc375a615a35f2aabba56bcb3
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Wed Jun 21 15:14:09 2017 +0200

    BUG#26321303: Fix of patch
    
    (cherry picked from commit 2c2d214a05cbbc25f74623771c55a52de4a2a2a8)

commit 4c2957c6e96e3f2b8798b3cafa94d1aada3b370f
Author: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
Date:   Wed Jun 21 17:20:40 2017 +0530

    Added ndb_top to cluster 7.6 docker rpms
    
    (cherry picked from commit eebe6fcd6ec5a336575e9082ce86af3ca4110d73)

commit e8e4dd26a601326e35bbc1d522cce0cd09a16bc6
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu Jun 22 15:19:49 2017 +0200

    WL#8069: Fix compiler warning
    
    (cherry picked from commit 5ee807718bd6596e9a14f05f56e0e00445c4b061)

commit 076f1d36251d2259fd26346d8acb01dd1f32fc0c
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu Jun 22 14:11:50 2017 +0200

    WL#8069
    Fix such that we don't report MaxGciCompleted that is smaller
    than the restorable GCI at start of LCP. This ensures that
    the LCP is not having problems with too little REDO log
    available at restart.
    Added a bit more debug code around this.
    Ensured that tests in testSystemRestart works also when
    nodes not connected to active node group is around.
    
    (cherry picked from commit 96db001e8f754608375719fa8eaf7b8143fa73df)

commit 19057ca18478e522dde1529087c5d4a292207b32
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Wed Jun 21 13:21:00 2017 +0200

    BUG#26321303: Fix OM_CREATE on Windows
    
    (cherry picked from commit 73515a0eb325cc8b66816c859eb9e0031988c1f6)

commit 4629a32351a0fbfdd167eeb9acd00477c96a2428
Author: Maitrayi Sabaratnam <maitrayi.sabaratnam@oracle.com>
Date:   Tue Jun 20 09:48:46 2017 +0200

    Bug#25811493 - REPLACE FAILS ON SPARC WITH: ERROR 1114 THE TABLE IS FULL
    
    The test inserts two tuples which end up in two different fragments in
    sparc, but one in x86s, due to hash differences.
    
    Each fragment uses its own extent from the tablespace and this minimal
    test has only one extent available for normal usage, causing the test failure.
    
    Changing the test to be independent of tuple-fragment connection.
    
    (cherry picked from commit 6b762b352bcd96686860f68103b295a0f367d6eb)

commit 4c0fd996695341b08fbb4d9a7016d21c9b83d3dd
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Mon Jun 19 17:34:05 2017 +0200

    WL#10302: One more fix of variable handling around started LCPs in DIH
    
    (cherry picked from commit fcd822689c7137c2daa657964de0dbbdec09b31e)

commit 50905aa5f80c7822e1eb7a0fe318c816e5693a39
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Tue Jun 13 22:13:50 2017 +0200

    WL#10302: Fixed some ndbrequire handling in DIH
    
    (cherry picked from commit 9225b46c0059b8b920ca0b4c58a9ead62efc5722)

commit 01866368f8751ddcd8f96cb339270d85be4e88c2
Author: Piotr Obrzut <piotr.obrzut@oracle.com>
Date:   Mon Jun 19 13:21:05 2017 +0200

    Add ndb_tob to DEB_NDB_CLIENT_EXTRA
    
    (cherry picked from commit 04f61d9acb74b394efd2831a09d83a925a868f19)

commit b26b2125a983abc81807567fec773c701d97bf99
Author: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
Date:   Thu Jun 15 10:56:22 2017 +0530

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6
    
    (cherry picked from commit 0faff41685dd457561f98e6c72c879357086ead3)

commit e3ef2ba030d3362fd4bbf20a3989bafbe90018e0
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Mon Jun 12 12:21:46 2017 +0200

    WL#10302: Fix to avoid crashing when using nodes without node groups

commit 88402e73d8182b202bb465e05ac48e7850b26de2
Merge: deaa7a4 1e7a8ab
Author: John David Duncan <john.duncan@oracle.com>
Date:   Sun Jun 11 10:04:31 2017 -0700

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit 1e7a8ab96cb1003c95186c36ac725ee8b7c16f60
Merge: 429b879 027ffa3
Author: John David Duncan <john.duncan@oracle.com>
Date:   Sun Jun 11 10:03:56 2017 -0700

    Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5

commit 027ffa3818489ce798411669ee9458fa4d8a91c0
Author: John David Duncan <john.duncan@oracle.com>
Date:   Sun Jun 11 09:59:44 2017 -0700

    DIRECTORY was added in 2.8.12.
    CMake 2.8.2 must be supported on linux for MySQL 5.7.
    For MySQL 5.6 CMake 2.8 must be supported.

commit deaa7a42f910b5fa62b517a9c5cd8f7d23216a5d
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Sat Jun 10 20:28:34 2017 +0200

    WL#10302 Ensure that things works also when not executing local LCP first

commit 7e8207ba183cbac438f9f5f4226936341c36a3e0
Merge: 8eadd63 429b879
Author: Mauritz Sundell <mauritz.sundell@oracle.com>
Date:   Fri Jun 9 14:51:49 2017 +0200

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6 (Bug#26138592)

commit 429b879d0cfadf2d9dd15d6c6f40a36db93ec545
Merge: 47cbf84 4f13aee
Author: Mauritz Sundell <mauritz.sundell@oracle.com>
Date:   Fri Jun 9 14:49:10 2017 +0200

    Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5 (Bug#26138592)

commit 4f13aeefee7ecdfc03d8ebef1eeeb79f39cb723c
Author: Mauritz Sundell <mauritz.sundell@oracle.com>
Date:   Thu May 25 00:37:58 2017 +0200

    Bug#26138592 MANY DELETES (OR MANY INSERTS) THEN DROP TABLE MAY CAUSE UNDEFINED BEHAVIOUR
    
    When a fragment is about to be released (releaseFragResources), make sure
    that there are no pending expand or shrink on fragment.
    
    As optimization change fragment state so that expand or shrink will do
    nothing.
    
    In addition to the above bug fix, in execEXPANDCHECK2 and execSHRINKCHECK2
    check of fragment level is moved before potentially pages allocation.

commit 8eadd63ad9a74120175b28ad9bc6f612b1add21c
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Fri Jun 9 13:24:40 2017 +0200

    WL#10302: Updated version numbers for partial LCP and local sysfile introduction

commit 1d62250530b21a54dfff626d4f6c79a479517706
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Fri Jun 9 12:29:59 2017 +0200

    WL#10302: Various cleanups to prepare for push, many printouts moved g_eventLogger->debug instead of info

commit f05ebceae5d3bd505a00d640763ca9c85c4e76dc
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu Jun 8 23:30:49 2017 +0200

    WL#10302: Disable automatic start of LCP after copy fragment phase

commit 665b0b79a5a55bfad005122157e085c616074c06
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu Jun 8 23:22:00 2017 +0200

    WL#10302 Disabled all extra debug output in preparation for push

commit 57f6b946ea7571bb3859363ebbbaf613b9998b5b
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Wed Jun 7 15:53:00 2017 +0200

    WL#10302 BUG#26115576: Had to use LQHs version of nodeState, Backup's version of node state is not sufficiently up-to-date

commit e8cb679bd9cc4c3971a85c9846aa71084c556822
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Tue Jun 6 14:30:52 2017 +0200

    BUG#26198089: Fix initialisation mistake in previous patch

commit 4ef6d36f7ed14c548a91c7e3ccdc968c06de4c5d
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Tue Jun 6 13:04:17 2017 +0200

    BUG#26198089: Added ndbrequire such that we crash instead of hang when a node fails to set activeTakeOver variable correctly, this will assist in finding bug around this code

commit 7b0eb9a341418f599b15c05848dd6933d1411dd2
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Tue Jun 6 11:37:25 2017 +0200

    WL#10302 BUG#26201284: WRITE_LOCAL_SYSFILE_REQ could happen concurrently from LQH and NDBCNTR, so simple delay signal used to handle concurrency

commit 9889b928eca5197d43ebd8884bd5830199155246
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Mon Jun 5 13:27:49 2017 +0200

    WL#10302: Fix of previous fix for hanging LCPs, the new code cannot be called for master take over case

commit 8b1559625e34ccb5e5d7d1b314bc207304b4db3b
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Mon Jun 5 12:49:03 2017 +0200

    WL#10302 BUG#26115576: Have to ignore RESTORABLE_GCI_REP in SL_STOPPING_4 in backup block since not all senders check for SL_STOPPING_4

commit 3a399c7963d572ddaabc172a5a4bc025b249dfb1
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Mon Jun 5 11:10:27 2017 +0200

    BUG#26193525 WL#10302: Fixed a missing set of m_restart_seq to 1 at initial node restarts

commit 73cb42fbee173856f6ecd8cc3e27febecb8cd6a0
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Fri Jun 2 14:27:41 2017 +0200

    WL#10302: Fixed an issue with an earlier push around initial node restart that caused almost all LCPs to be of a drop case which obviously wasn't intended

commit e3f905ccb844db3cf9da7bc6917c49c3fd8d3eeb
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Fri Jun 2 13:49:31 2017 +0200

    WL#10302: BUG#26166901: Possible to get hang of LCP due to a node failure at a very inopportune timing when all nodes waited for this node to complete its last fragments

commit a6909387c6415a5db0532932c4e96b19d6e06240
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Fri Jun 2 13:21:12 2017 +0200

    WL#10302:
    Fixed such that m_restart_seq starts at 1 and is printed also in initial node restarts.
    Also set to 1 always at initial node restarts as well.
    Extra check that we don't try to use a page with m_restart_seq == 0.

commit ac9947ea50f580a10b29ad36dab1fd55a678b17a
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Fri Jun 2 12:18:05 2017 +0200

    WL#10302:
    Added more debug printouts and new test case for testing of disk data in relation to initial node restarts.
    Added handling of removing old LCP files at initial node restart

commit f4c1f5d5d7afa6b718db23b22e4cd3add89fded7
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu Jun 1 15:15:12 2017 +0200

    WL#10302: A bit more debugging info to find extent bug

commit 96460c4e641796739a4f44c9ba9f75485ba7d7f4
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu Jun 1 14:56:06 2017 +0200

    WL#10302: More debug printouts to trace down the hanging LCP that causes node restarts to hang

commit f1340edce7566e664efd945ebbeba01688ebb1fd
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Mon May 29 17:01:39 2017 +0200

    WL#10302: BUG#26162253: Fixes of some problems with warning in compilation and had to use unsigned char

commit 0f157c10f95b0a1f147c81bcb7fd5bf604a23004
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Mon May 29 15:32:24 2017 +0200

    WL#10302:
    Used fewer bytes for representing part pairs to be able to fit more in the same space
    BUG#26162253 Fixed minor ndbassert problem in conjunction with LCP watchdog printouts

commit 7bdf55d1e0729b87892ff948d63691a660727f9a
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Sat May 27 08:25:40 2017 +0200

    WL#10302: Added a bit more debug info for analysing crash in DIH

commit 75f03a99036f3395060ea50365da753bf3e00977
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Wed May 24 12:40:27 2017 +0200

    WL#10302: Fixed bug introduced by cleanup

commit ae12a12e645139af2f3a398b7f031ae3f3ce44a8
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Wed May 24 11:10:12 2017 +0200

    WL#10302: Added a bit more debugging around number of extents

commit 1642bef0d6edc9ec52751b73251d5664064b59e4
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Wed May 24 10:58:14 2017 +0200

    WL#10302 BUG#26130117: Backup block needs to check both LCP id and local LCP id to see if a new LCP have started

commit 79bb539622fe9516d6e529f6c1956046c1d82b50
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Wed May 24 10:02:04 2017 +0200

    WL#8069 WL#10302: Various push preparations, clean up

commit 390891c4399128e7bea1628a68544cbe96008b84
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Tue May 23 17:01:47 2017 +0200

    WL#10302: Added more debug printouts around allocation and free of extents

commit a1b83a7b24f809d042d9274da5bf416ed83de308
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Tue May 23 16:41:52 2017 +0200

    BUG#25923125: Problem with allocation of extent during restart

commit 2a35e6fa19e172fa79c527cbb0725b09bdc0838a
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Tue May 23 09:10:38 2017 +0200

    BUG#26115576 BUG#26115813, fixed problem with writing old GCI into local sysfile and not calculating free_log_words correctly with add_entry_complex, removed a bit more debugging info

commit c924fde0d234604f8cc51c01ead54b46afa38f26
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Tue May 16 00:28:53 2017 +0200

    WL#10302: Fix for BUG#26074593: Remove another ndbrequire that was wrong

commit d3e659d53d45ed520fdb6bad9d548b3bcfa0cf8e
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Tue May 16 00:22:56 2017 +0200

    WL#10302: Fix for BUG#26074593: Remove ndbrequire that was wrong

commit 29369c8ab15a5a826d33bcdaf4aa653f23fef531
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Mon May 15 23:30:14 2017 +0200

    WL#10302: First step in decreasing amount of debug logging

commit 98b07801090b55bce1ae46bafc1cecfa62ff5cf4
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Mon May 15 23:04:33 2017 +0200

    WL#10302: BUG#26076862: A table that was dropped and not properly dropped by DICT caused restore to crash, fixed by adding a drop case also to restore code such that all control files and data files are deleted if we find an LCP file from an old table version

commit 18256c287b36ee0cce67df30acd5fcbbead047ba
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Mon May 15 15:42:24 2017 +0200

    WL#10302: BUG#26074593: Ensure that fragment state is properly setup for executing LCP after ensuring no more REDO log is to be executed

commit da18a8d9889de35bc9fe95a6b9eb0f71eb1308b2
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Fri May 12 15:54:43 2017 +0200

    WL#10302: Important to not report restorable GCI to BACKUP before restart is completed, also we are not allowed to report a GCI as restorable during restart until we have written the local sysfile, otherwise we might remove LCP files that is the last restorable one.

commit a8a45c886ed26e54ec49b41c596ac92f966d5592
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 11 18:13:11 2017 +0200

    WL#10302: More work on when to report restorable GCI to Backup block, had to carefully consider the handling of graceful shutdown and the phase SL_STOPPING_4 when LQH no longer does GCPs but still runs both transactions and LCPs. Thus it is important to NOT update Backup block with any new RESTORABLE_GCI_REP signals while in this phase, this ensures that we cannot overwrite LCP files to get into a situation where no restorable LCP files exists. The LCP will stop waiting for the restorable GCI to arrive that allows delete of old files and this will never come in this state.

commit 6172f5c092b6d40273b4d3fe6c22670d5bba9693
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 11 12:14:56 2017 +0200

    WL#10302: Removed an erroneus ndbrequire, fixed another ndbrequire that was no longer accurate

commit 5dd763c96b35ad877913f37ac3e521e9f159914d
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 11 09:41:36 2017 +0200

    WL#10302: Must ensure that m_newestRestorableGci is properly set before executing any LCPs

commit 18a307348a691cfdfe7e1f9ac6bfad5bc172d831
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 11 09:06:07 2017 +0200

    WL#10302: When changing MaxGciCompleted locally it is important to also change it such that DIH is informed of the changed value

commit fc2e78ca3f402d079a543c10ad37bcd8a210b8bb
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 11 09:05:29 2017 +0200

    WL#10302: Minor fix of debug printout

commit eeeeec5e53c95fa87105f078443fc773382a9333
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 11 09:04:26 2017 +0200

    WL#9775: Fix test case test_event -n Bug33793 to also work with 3-4 replicas

commit d556dbc5c5361bf5d955c7fc2f84f15e7657841a
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 11 09:03:15 2017 +0200

    WL#10302: Fix problems with error-insert on ndb_restore for testcase testBackup -n Bug19202654

commit f7e7de1d9d34d1519bedf4c8700e2b59cb1fd4bf
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 11 09:02:00 2017 +0200

    WL#10302: Ensure that we don't write any MaxGciCompleted that isn't restorable unless we actually have written any transactions in an unrestorable GCI

commit 09031175f5328814d9ef11bbfacf42f256dfe7e0
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 11 09:01:13 2017 +0200

    WL#10302: When performing system restart we can sometimes start from an old GCI, in this case we need to update the m_max_completed_gci at reception of CNTR_START_CONF since no GCPs will be executed during a SR. Fixed a bug in lgman.cpp introduced by WL#10302, after this it is better understood how the LGMAN actually uses head and tail.

commit 0d47d3e5a68967df28df264373b5bade503cb92d
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 11 09:00:16 2017 +0200

    WL#10302: Disabled test case Bug18612SR until we have fixed a permanent fix for handling of partitioned clusters, this test case wasn't really working, also fixed some printouts from Qmgr to node log and cluster log that had mixed up parameters

commit 69a01473ef6407bdccbd0eac022e0decb6b2cb7e
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 11 08:57:11 2017 +0200

    WL#9775: One more test case that couldn't handle 3-4 replicas

commit 9b3ba636b69b70e41fdb7fd4d390b204b2638e54
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 11 08:56:17 2017 +0200

    WL#10302: We needed to ensure that MaxGciCompleted was always incremented or kept the same as we create new LCP control files. Special considerations needed when restoring from not restorable on its own nodes

commit dd46493f16fb02d1cbe8214c1919be5dd55b401d
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 11 08:39:29 2017 +0200

    WL#10302:
    Fixed problem with initial node restart where we didn't discover that first
    LCP_PREPARE_REQ was a start of a new LCP since backupId of this LCP is 0,1
    and backupId is initialised to 0, added new variable m_initial_lcp_started
    to always discover first LCP_PREPARE_REQ as a start of a new LCP
    Need to set also local LCP id when setting LCP id to stop UNDO log at

commit 79f32e42f3379d09552955cd8ddbe8628f8d9ce9
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 11 08:38:43 2017 +0200

    WL#10302: Now LCP ids and local LCP ids completely controlled by LQH, NDBCNTR gets max LCP ids restored and for local LCPs it uses the maximum lcp id and adds one to the local LCP id for this local lcp id pair

commit be80ccc22c4b102d6aade13ddebbd2935d5416ca
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 11 08:14:53 2017 +0200

    WL#10302: Tail and head should be equal when all of UNDO log have been executed

commit aeb65422cc6a7060a48e12ce442cb49ec7d7a515
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 11 08:14:09 2017 +0200

    WL#9775: testNodeRestart -n ClusterSplitLatency is only developed to test with 2 replicas

commit 5882c7096acdb87999f90d54df11a24f915fcf7c
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 11 08:12:45 2017 +0200

    WL#9775: Fixed test case testNodeRestart -n NodeFailGCPIOpen that can only run with 2 replicas

commit 328bda7fdf8592ad22b1c97fd7013cc5406bf629
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 11 08:11:47 2017 +0200

    WL#9775: Fixed test case MNF in testNodeRestart to also handle 3 and 4 replicas

commit 91b6d966b729453f65f4bbc18376c6e218617ad1
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 11 08:11:09 2017 +0200

    WL#10302: Merge fix, compiler warning fix

commit 48b1b78f5eaea2a1f89f05163a3814adca220e65
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 11 08:08:53 2017 +0200

    WL#10302:
    Ensured that Copy Fragment and REDO log execution can use the full UNDO log
    to avoid crashes due to out of UNDO log.
    Adapted the calculation of space and also fixed some remaining merge issues.
    Set the log levels for halting copy fragment and starting local LCPs during node restart properly.

commit e6e755f70de0ff8fe8cb46d769574bce184c652b
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 11 08:07:22 2017 +0200

    WL#10302: Merge of some changes from WL#8069 tree into the context in WL#10302

commit ca548be011ec5925e0586cb58d733f8b3ae07e4d
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 11 08:06:42 2017 +0200

    WL#10302: With local LCPs possible the deviation between m_dih_lcp_no and m_used_ctl_file_no can be bigger and we have to take care of that in the code. Also documented restore variables a lot more

commit 2d02f7d9214cd987063863bd50256e33ae33f9b8
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 11 08:05:54 2017 +0200

    WL#10302: More debug info to be able to find disk data crash

commit 5698bcb1fdf8faeef315b2fb0b67fe875c7e4605
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 11 08:05:09 2017 +0200

    WL#10302: Temporary crash injection to analyse bug

commit dce45d7a5087d918e35194649cd206b9980a58fb
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 11 08:03:58 2017 +0200

    WL#10302
    Added more printouts around maxRecordSize changes of LCP records

commit a40a4af281c73038b302dda12049e8a4e3e88dde
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 11 08:03:05 2017 +0200

    Changed mikael2 to use 4 nodes and added new test case to devel--07

commit 73dfc13a03035435141f2506b86c820541fdfeea
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 11 08:00:43 2017 +0200

    WL#10302 baseline

commit 7c388247087dbc395fa279275fc7bbbe91a1001c
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Fri May 12 00:07:05 2017 +0200

    WL#8069: One more fix of send handling in mt.cpp

commit 98084e07cc534dd42fcb496a409fc4f2a1115e10
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 11 07:15:46 2017 +0200

    WL#8069: Improved handling of waiting for end LCP, had a few problems around drop table that needed fixing and also to ensure that we can guarantee that m_wait_end_lcp is cleared immediately when queue is made empty

commit 46513c1f96218885fc08eed3bbc6e826ceac25b2
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Wed May 10 23:16:52 2017 +0200

    WL#8069: Some adaptions of reporting restorable GCIs to speed it up, ensured that we don't report LCP watchdog issues when the real issue is a GCP stop issue

commit af8588907b5b0a9b2100c3930061a0c22c1afc65
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 4 20:13:22 2017 +0200

    WL#8069 BUG#26001020: Fixed wrong ndbrequire in previous patch

commit aac99a731f763248921cd28bb06ad47e0485eb1b
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 4 19:57:28 2017 +0200

    WL#8069: BUG#26001020: Missing state ScanOp::Aborting in is_rowid_in_remaining_lcp_set

commit f246f170d1dd694cb01d673a8e0d9eacf32f62c9
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 4 18:05:22 2017 +0200

    WL#8069: Fixed issue with ndbrequire's around checks of CreateTableVersion, LCPs can be created while table is being dropped, so have to take that into account when checking CreateTableVersion validity

commit a17e712e53d4f01617508fe9943f0ac16702c294
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 4 13:00:47 2017 +0200

    WL#8069: Use of block variable in getCreateSchemaVersion caused havoc when called from rep thread, moved to use stack variable instead

commit f773df3b48cb89515d7ed48fb1a182593cbc4305
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 4 11:36:19 2017 +0200

    WL#8069: LCP scanned bit was set and not reset when the partition was empty when the LCP scan started, fixed by ensuring that we perform scan even if the partition is empty and there have been pages in it at the LCP scan start

commit 93668fb899b64c3d97dfe10b86070d6a37d03cd2
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu May 4 09:41:35 2017 +0200

    WL#8069: The attempt to use CreateGci as unique identifier of table together with table id and fragment id failed since it can change after a system restart since the DIHs in the cluster doesn't synchronize on one CreateGci, instead using CreateTableVersion that should be synchronised since the dawn of NDB, so now checking that the LCP is really from same table using the triplet TableId, FragmentId, CreateTableVersion

commit ce7ec9b259ac6a988f1edee7444149600ede788a
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Wed May 3 14:11:09 2017 +0200

    WL#8069: Fixed problem that when finding a drop case we didn't manage to get cleaned up, so hanged in the restart due to LCP stopping finally causing LCP watchdog crash, actually we should never have entered this case. So added code to ensure that the LCP control file contains CreateGci of the table to ensure that we know if we are dealing with the correct table

commit e30d424feef35a2fbbdc5746b0c02f4f2ce25bf9
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Tue May 2 12:52:53 2017 +0200

    WL#8069: Used ntohl to check page version in UNDO log execution, this led to executing log records on never written pages and later to overwriting extent information

commit 65e64424b27b3f948782e83df144bc25e82c4909
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Tue May 2 11:22:04 2017 +0200

    WL#8069: More debug printouts when reporting error 1501

commit ee7c73dcf0e3c15f1571f205bb449e499e87b8a6
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Tue May 2 10:46:16 2017 +0200

    WL#8069: Fixed wrong condition on handle_lcp_skip_bit, also added more debug printouts and more ndbrequire's

commit df6e1f1fb57a0b6c1570cd3c901d56e73c4cb318
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Tue May 2 09:54:04 2017 +0200

    WL#8069: Fixed a test case that dropped SCAN_NEXTREQ signals, sometimes this dropped a SCAN_NEXTREQ as part of a LCP scan and this caused the wrong error to occur and thus test case to fail

commit 95903ed20e9a65ae686573d84d66c162c278ca1c
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Tue May 2 08:23:46 2017 +0200

    WL#8069
    Fixed bug in DIH where we assumed that no LCP could have been saved
    and still no LCP valid found. With 8069 we report LCP completed much
    later, so this means that this is a perfectly legitimate event.
    
    We kept around some checks that we didn't start an LCP with a queue.
    This kept around check was buggy, so removed it and replaced it with
    a simple check at start of LCP that queue is empty.
    
    Fixed one bug previously with handling of skipped pages, however this
    meant that the variable all_parts got to be always false and we entered
    into the Partial LCP code. The partial LCP code needed to initialise the
    m_tableId in the scan record, but we also needed to always set the
    all_parts to true to ensure that we don't use the Partial LCP code just
    yet. Will require some fixing later on when adding Partial LCP for real.

commit 4a53da9bed8fc804f90cdc7154a2cc83e6e00e29
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Sat Apr 29 12:08:59 2017 +0200

    WL#8069: LCP_SCANNED_BIT was set when the page had already been LCP scanned due to using wrong function to discover if it was LCP scanned, the is_rowid_in_remaining_lcp_set is the fully featured function that handles all state variants

commit 4ba40468977e22e53fb41127ae474837a6b3678d
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Sat Apr 29 07:06:05 2017 +0200

    WL#8069: Fix merge issue

commit 920f76d4175865a8733aed3d15114b0c60a8a48a
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Fri Apr 28 10:26:09 2017 +0200

    WL#8069: The test case testSystemRestart -n Bug54611 relied on local checkpoints to pause one GCP between them, this is no longer certain, so to make sure test case passes even when running with constant LCPs we change it to move on after 15 attempts to get the right test condition

commit 00d7395dcff1b89f59978628fef8a4608d93007b
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Fri Apr 28 09:13:00 2017 +0200

    WL#8069: Fixed an issue introduced by removing the double m_next_lsn variables, now checking the total_log_space to see if UNDO log is ready, also added check that UNDO log entry is only created for disk data tables, this should decrease risk of unnecessary UNDO log sync's to remove space in UNDO log

commit bd466c528c22c401aa8f0cf3a04eb5a699799eb9
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu Apr 27 19:22:11 2017 +0200

    WL#8069: Also idle LCPs have to respect the sync_lsn calls, it means that we have to detect if table is disk data table and ensure that LSN is synced before we write a validFlag in the LCP control file

commit 83df574c33455e1875efbfe17599292f40171b4d
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu Apr 27 12:53:13 2017 +0200

    WL#8069: Minor change of interface to handle_send_node and setting of node to 0 in send thread loop for absolutely safe handling of stop node handling

commit 7aff621a3c57204529a39f28065d1cd63b307b2e
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu Apr 27 12:51:23 2017 +0200

    WL#8069: Temporary change of MTR defaults

commit 84f3de781d6c8f8300282c6d87dc5d2cc407207a
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu Apr 27 10:03:34 2017 +0200

    WL#8069: More debugging to find lcp_scanned_bit crash

commit c1c7b307e9eadb21ff2e9a1a45a29ea7e2662d7d
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Wed Apr 26 16:10:34 2017 +0200

    WL#8069: Fixed issue when rewriting LCP file after waiting for GCI to complete, it could interact with drop table in bad way, added synchronisation from LQH to BACKUP to ensure that delete LCP file queue removed all entries from queue before drop table started removing all LCP files

commit 2306e6ef64cc6c898dad94fb4097871104999e95
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Fri Apr 21 01:10:18 2017 +0200

    WL#8069: The new UNDO_FREE_PART + UNDO_UPDATE_PART pair had problems when the UNDO_UPDATE_PART was too big and overwrote the free list information before the UNDO_FREE_PART had a chance to make use of that information. Fixed by ensuring that UNDO_FREE_PART is at least covering 6 words (only 2 words was absolutely necessary now, added 4 more for future use). No need to extend the overhead space since that already accounted for at least 15 words of wasted space per page break

commit dc78f4a3bf534b987f50293d657afa1a479deded
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu Apr 20 22:20:42 2017 +0200

    WL#8069:
    A problem in handling of Delete LCP files queue,
    it removed from first when don,
    it could be inserted a new first while it executed,
    so it should not use removeFirst,
    needed to make list double linked list with prevList element
    
    In addition a simplification of the LCP scan code where I removed
    the function set_lcp_scanned_state since it was only used to
    set and directly reset. So instead I always reset immediately
    and jump out of loop to ensure that I also keep track of
    loop counting.

commit f7e605b57e447bb228898a58b071706a2a1d23e3
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu Apr 20 19:28:47 2017 +0200

    WL#8069: Some rework of Bug48474 test case

commit 96e2d0c58e62127254b729f82309a5ea8bbcff31
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu Apr 20 14:49:43 2017 +0200

    WL#8069: Added more jam's to trace bugs in DIH

commit 9da35d085a7de35083a9605d5373c21c2a36a253
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu Apr 20 14:01:10 2017 +0200

    WL#8069:
    Added check that we don't stop UNDO log execution in the middle of a two-part UNDO log record
    Ensured that all LCP files were handled before reporting LCP_COMPLETE_REP to DIH to ensure
    that DIH always have an older and never a newer view of the real LCP state
    Fixed issues with UNDO log
    Fixed missing initialisation of m_lcp_loop_ongoing
    Removed m_next_lsn from LGMAN object, only in logfile group now
    Ensured that 25% of the log space is not used for normal transactions
    during restart and 33% during normal operation. This log space is
    dedicated to handling sync_lsn of already dirty pages, handling
    copy fragment actions
    Fixed restore issues
    Removed support for Type 2 UNDO log records

commit ebb32d9ef41d00241e1bc267dde1b14c705dbeab
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Wed Apr 19 16:30:03 2017 +0200

    WL#8069: Ensure that we have a large part of the UNDO log saved up to ensure that we can always complete an LCP (an LCP can cause use of log space due to sync_lsn calls, also ensure that we have more space in UNDO log during recovery

commit f41ba72fc8883b6943326ece21a7142f9b2a2744
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Wed Apr 19 14:09:09 2017 +0200

    WL#8069: Delay the sync_lsn by about 2 GCPs, this requires a double write of the LCP control file in many cases where the LSN haven't been flushed to disk while we scanned the fragment. It does have the advantage that we don't waste a lot of UNDO log space for each fragment LCP, this only applies to fragments with disk data columns

commit f820c4c0b5538729f7e6c0677c00216cb6ce2143
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Tue Apr 18 15:52:09 2017 +0200

    WL#8069: Introduced pre_sync_lsn interface to LGMAN, ensure that LCP use of sync_lsn always also syncs up the maximum sent in pre_sync_lsn

commit aff15f0120dada2b503c51fa430897b92fe5ee18
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Tue Apr 18 15:11:57 2017 +0200

    WL#8069: Turned out that it is possible to prove that it isn't necessary to call sync_lsn at DROP TABLE of a fragment in TUP, this is good since each such sync_lsn can potentially waste an entire page of log space, thus making it very hard to prove that we can't run out of UNDO log space

commit 497a9816bcb91977b78c12ad17bbcb24227448cc
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Tue Apr 18 13:23:09 2017 +0200

    WL#8069: Removed one more part of struct no longer needed

commit c4f94f284d50ee35f0961ff836fe8f75a3ef6de8
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Tue Apr 18 12:24:51 2017 +0200

    WL#8069: Ensure that normal transactions overallocate space in UNDO log to ensure that we don't run out of UNDO log due to page breaks during commit of a large transaction

commit 7b138ee5b9d0d1b7b67f3b40b4e6a8e2251eadfa
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Mon Apr 17 23:27:00 2017 +0200

    WL#8069: Use UNDO log more efficiently by splitting UNDO log records into two records at page breaks

commit 144930b8fef0cfbe1c9f90efd832259b290dc650
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Sat Apr 15 14:22:25 2017 +0200

    WL#8069
    Remove unused parts of the UNDO logging code

commit 212c41e39f568200688c6f6b6f54411b3a4dada5
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Fri Apr 14 22:52:13 2017 +0200

    WL#8069: A lot more debugging to find problems in UNDO log execution, and handling of extents

commit f12e7416ae844503d7aa47238ffd2a1360551246
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu Apr 13 08:57:28 2017 +0200

    WL#8069: Found one more potential glitch in start of LCP scan that could cause inconsistency between LCP main memory rows and the disk data parts by adding rows to LCP inserted after start of LCP

commit 76037530c551bcec22bc0a1c024d797d682945c4
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu Apr 13 08:26:30 2017 +0200

    WL#8069: Minor improvement of debug printout for disk_page_alloc

commit 27bf731974ec5cc13167bb9395afcf05196fe818
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu Apr 13 08:16:28 2017 +0200

    WL#8069: Improved debug printouts of LSNs and their synch:ing, activated LGMAN debugging

commit d34eb080b7c3ceb9747eb68bb11deb750d20e53b
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu Apr 13 08:02:02 2017 +0200

    WL#8069: Fix rowid debug printout to use logical page id and not real page id

commit d583a3443ac37a22482fb24a8deb178bac36fa5f
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Wed Apr 12 21:41:22 2017 +0200

    WL#8069: Fix check of newestGci changed since last LCP and more fixes around
    calculating number of changed rows.

commit ceed3915f3df73f38bd751bd23479828def113bf
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Wed Apr 12 17:35:34 2017 +0200

    WL#8069: Ensure that we don't use an idle LCP when newestGci have been updated since last LCP, this is an indication of that a transaction have been committed since last LCP on the fragment.

commit 6b1bdde5c31aa0cd006217024bc658001f8a8e02
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Wed Apr 12 15:04:32 2017 +0200

    WL#8069, WL#9778: Added debug printout for finding file size issue

commit e121688035fdb9870ff9ff692bcf87f5ba99b41e
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Wed Apr 12 13:32:28 2017 +0200

    WL#8069: More debugging info to find hanging node restarts

commit 77383dd1ae43201408ecd5d0f51a38574b89d6c2
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Wed Apr 12 12:01:07 2017 +0200

    WL#8069:
    Decreased test time for TableAddAttrs tests, got a bit too long, some debug changes
    BUG#25860002:
    Fixed an issue where I missed to initialise the lcpPtr

commit 887d04d32ba501d41164a37572f531e96178b47f
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Tue Apr 11 22:54:20 2017 +0200

    WL#8069: Remove unnecessary printouts, fix erroneus error check

commit 04e8320e2b487224e3adc86373ec9c16484b6f08
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Tue Apr 11 15:01:21 2017 +0200

    BUG#25860002: Fixed problem during online add column where we need to update maxRecordSize regularly in LCP scans to ensure we don't overrun memory buffer

commit b4cc7b7e251b61b0c17f305bd5341da74eb33882
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Tue Apr 11 14:55:35 2017 +0200

    WL#8069: One more round of fixes to ensure that LCPs are started with all parts synchronized in one signal execution

commit 679f3186c3c519e23af487d363071df60d79667d
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Fri Apr 7 18:41:24 2017 +0200

    WL#8069: More fixes for which rows to LCP scan

commit dd1f2a0ce773f8862a289afd49e7b2bf4f5103aa
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Fri Apr 7 17:00:07 2017 +0200

    WL#8069: We missed setting LCP_SKIP bit in a very short time interval between ScanOp::First to setting ScanOp::Next, in this interval we reported all rows as being scanned and thus no need to set LCP_SKIP bits, led to inconsistent data much later in a restart

commit b16da5f8d97d6dea812db8d39e6b5fbc8b7fbc81
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu Apr 6 11:00:04 2017 +0200

    WL#8069: More debug output to find problems with allocation of records on disk pages

commit 4a54058c99b1130f1bc90fc6de5a1f0d0aeb9c3e
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Wed Apr 5 16:03:47 2017 +0200

    WL#8069: Fix errors after merging with 7.6

commit b7d771f4aa95f782b90f4a6cbb722bd90c2cab4f
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Wed Apr 5 14:42:53 2017 +0200

    WL#8069: Treat FSREADREF as reading a file with length 0

commit ffa5f8a96875c03fbe6138fc840d982b47548663
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Wed Apr 5 14:38:55 2017 +0200

    WL#8069: Fix test case for Bug48474 to handle out of REDO log

commit e51e7ff17efeda2618cb4e3e00f094e45e0809ce
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Tue Apr 4 00:39:42 2017 +0200

    WL#8069: One more possible variant to gather data files after autotest run

commit f2a72a54e50214982fcaef1c6c38fb3ca9fd1fd5
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Tue Apr 4 00:33:04 2017 +0200

    WL#8069: More debug printouts to understand connection between row id and disk reference, in particular during execution of REDO log, but also in general

commit 6e243a24e909a9ab468523c10b94b6dc14d37247
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Mon Apr 3 16:20:26 2017 +0200

    WL#8069: Crash when not EXEC_FRAGCONF have arrived in time instead of entering eternal wait loop

commit d549f5bdaeb4c64770dc60278c365c65a7ed16d3
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Mon Apr 3 15:54:13 2017 +0200

    WL#8069: Missing initialisation of some variables in LcpRecord

commit ec9475a0e5dcabd1d73a5931f420fff110b4eea3
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Mon Apr 3 12:33:13 2017 +0200

    WL#8069: Fix LQHKEYREQ printer, add new comment line for how to gather autotest results, make asserts in tuppage.cpp into require's for autotest runs, activate alloc and free of disk record debug printouts, fix few things for improved output of ndb_print_backup_file

commit 917c762d4c619f3ce2a509672c0923cde4a34b51
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Sat Apr 1 07:24:24 2017 +0200

    WL#8069: Turn assert into require to ensure that we catch overwrites of memory at the source

commit ab661072135010100d291c4ca75af29aa959a4a3
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu Mar 30 15:13:58 2017 +0200

    WL#8069: For some peculiar reason I had NOT disabled REDO logging during COPY_FRAGREQ, must have been a typo

commit a7347eead839e89d6f4eaf003737e2ede2ea1fef
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu Mar 30 12:28:44 2017 +0200

    WL#8069: Added more debug printouts and activated getting core files when crashing to get chance to find some hard bugs

commit f4f1974f5c70c4b184d49708a6e71f82e159456b
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Wed Mar 29 16:42:03 2017 +0200

    WL#8069: Covered one more problem with extents written by old tables

commit bcce28b141d9d13be1eda88740144a1c84b9ce15
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Wed Mar 29 14:25:36 2017 +0200

    WL#8069: More debug printouts to find error

commit a43615547134e3f7e0c94e6c556420633ec8f267
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Wed Mar 29 14:10:36 2017 +0200

    WL#8069: Added more debug printouts when failing Bug34216 test case

commit dcf4fbf1655d5bea905c267871c3cb8f17ff969d
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Wed Mar 29 13:31:28 2017 +0200

    WL#8069: Temporarily disable new logger thread

commit ec5a27fa568214d2d8dc3a569430db1da8e12e9d
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Mon Mar 27 23:39:35 2017 +0200

    WL#8069: Fix state handling of when to apply an UNDO log record in the context of CREATE and DROP TABLE

commit 4967d166f7c2f356c65ac827bfa8c822abc213e5
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Mon Mar 27 21:28:29 2017 +0200

    WL#8069: More debug to find crash in DIH

commit 66bb320420addfb7c2ea7d398da88f4a5d53ea6a
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Mon Mar 27 17:06:30 2017 +0200

    WL#8069: Added latest GCI printouts to a number of test cases to more easily track verification errors

commit 82e970d108bb5bc891bb05d7206d7856fc3fc30a
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Mon Mar 27 13:21:44 2017 +0200

    WL#8069: Fixed testcase testNodeRestart -n TestLCPFSErr to use CRASH_INSERTION at proper place

commit d325a67fb4535fc943bb4e7489f31675f00e3577
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Mon Mar 27 10:19:21 2017 +0200

    WL#8069: Some debug improvements, fixed potential issue in testRedo when calculating remaining redo log usage

commit f92cc902493f0f768515ad660508563dfd151c34
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Mon Mar 27 09:01:46 2017 +0200

    WL#8069: Ensure that RESTORE block reports restoredLcpId == 0 and restoredLocalLcpId == 0 when no LCP was found to execute in RESTORE block, otherwise we can go wrong in handling move_start_gci_forward

commit 6f0e17c471687cda16b5529e51b90aad59d196d1
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Fri Mar 24 13:50:17 2017 +0100

    WL#8069: Fixed testNodeRestart -n RestoreOlderLCP T1, had changed variable of keeping track of restart LCP id, in addition we now restores the most recent LCP and the second most recent LCP

commit 7fd2cb833b6e376bf0a71875fb94df7829bac4cd
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu Mar 23 18:44:07 2017 +0100

    When PREPARE_DROP state was set it wasn't ready to start off the new LCP, the CTL files had to be closed first. So added a state PREPARE_DROP_CLOSE during which it isn't possible to start off a new LCP. Once the close is completed we move the files to delete into the queue and set the state to PREPARE_DROP.

commit 5b1798a7ec35dc723b98696f7e173b7746f25505
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu Mar 23 02:32:08 2017 +0100

    WL#8069: One more fix of RESTORABLE_GCI_REP fix

commit 741cf69b0b8b3df8761836c0d598a9e5adb5add7
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu Mar 23 01:21:23 2017 +0100

    WL#8069: Fixed problem with new RESTORABLE_GCI_REP signal sent from NDBCNTR

commit 99a54e330fd90ff26f8d4bb244159742fba8766b
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Wed Mar 22 15:45:57 2017 +0100

    WL#8069: Added more debugging information and crash information and also more
    checks of consistency when reading disk pages to ensure that we find
    inconsistencies ASAP.
    
    Fixed a bug in deletion of LCP files. The deletion of LCP files relies on
    the RESTORABLE_GCI_REP being sent to the BACKUP block as soon as a GCP is
    fully completed. However at System Restart no such signals are sent.
    Thus we won't delete any LCP files during System Restart. This is bad in
    itself, but even worse is that the System Restart hangs in LCP handling
    in the PREPARE_DROP state when a table is dropped as part of the
    System Restart. Fixed by NDBCNTR sending RESTORABLE_GCI_REP to BACKUP
    block with the restorable GCI.

commit e5eab86b545d1016dde6a375f5076b2cea4de28c
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Mon Mar 20 16:40:56 2017 +0100

    WL#8069: Made idle LCPs at restarts when changing records that had GCI set to higher than MaxGciCompleted but smaller than MaxGciWritten, adapted set_lcp_start_gci to take MaxGciWritten into account as well when figuring out if an LCP is an idle LCP

commit 7e89934d97632b54e7f1c3cdcf8822ccd8754460
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Fri Mar 17 14:22:53 2017 +0100

    WL#8069: Handling of LCPs cannot be done while processing update_lsn calls, this can cause state changes in TUP of pages currently worked on and thus cause complex state handling, so we ensure that we only process LCPs from independent signals, mostly CONTINUEB signals, FSREADCONF signals, FSWRITECONF signals and also SYNC_PAGE_CACHE_REQ and SYNC_PAGE_EXTENT_REQ signals

commit 31a1b5897c6ea1d4aacae83f5503e9bf49829838
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu Mar 16 00:49:37 2017 +0100

    WL#8069:
    Ensure that extents are used at restart for proper tables,
    ensure that extents are written properly at restart if not written before crash.
    We skipped extents in error when no LCP had been executed on the fragment before
    the crash. This led to extents being owned by several fragments and thus causing
    errors. Removed reset of table exists flag in DbtupProxy block, assumes that
    DICT will only restore the proper tables.
    
    Ensure that DIRTY flag is kept for extent pages when DIRTY bit is set during
    pageout. In this case the page was written, but during its write we made more
    changes to the page, so we need to keep the DIRTY bit even after completing
    the pageout.
    
    Various debug stuff to understand code better.
    
    Large new comment statements describing various variables supporting
    disk data extents.

commit b14c38966e8a7818c8a6bf6e555646e3449bf454
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Wed Mar 15 10:42:35 2017 +0100

    WL#8069: Fixed problem that extent information might not have been written before node stopped, UNDO log records will in this case ensure that we write the extent as part of UNDO log execution

commit 46a2109b6b723a07c22a84d6ec9725209f44b52c
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Wed Mar 15 10:13:48 2017 +0100

    WL#8069: More debugging and aligned various debug messages

commit c3ba0d852a17901735bec6d6b7f40b4e394e1531
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Fri Mar 10 10:50:06 2017 +0100

    WL#8069: Fixes transported from WL#10302 tree

commit c909d11c86742990bcf800c6746060b98adb496a
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Tue Jan 31 11:21:56 2017 +0100

    WL#8069: Fix to ensure that we can handle LCPs to remove that reused the same data file although GCP written changed

commit 3821438c0b643809dffc2e2a09ca92b8dbbd85ba
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Tue Jan 31 11:20:56 2017 +0100

    WL#8069: Temporary fix for BUG#25353234

commit 76a6da92a3b22662790c6a44a4d0dca56c406ae6
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Tue Jan 31 11:20:14 2017 +0100

    WL#8069: Set EMPTY_PAGE on all requests for empty pages, after a restart we don't have full control of which have been used before

commit a2d1f2b5fd32281d6c42d39f8b4f54d7e9a992b3
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Tue Jan 31 11:19:42 2017 +0100

    WL#8069: Reuse of a LCP id is possible since DIH will do that if the LCP wasn't completed before the crash. However in local LCP we need each LCP id to be unique, so we need to increment the local LCP id when the LCP id is the same as the last one

commit 7fbef98c2aff146efa6821fbd2df12ec80b5abae
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Tue Jan 31 11:19:16 2017 +0100

    WL#8069: Fix problem that RESTORABLE_GCI_REP was sent during restarts when actually GCIs were not yet completed leading to deleted LCPs that were still necessary to keep

commit 34c2d4dbe4c0dcca284ec9943608dc78d031a012
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Tue Jan 31 11:18:43 2017 +0100

    WL#8069: Fix problem with using IDLE LCPs even when they weren't idle, missed setting m_lcp_start_gci properly in restart situations

commit bcb8a0194fa74c0107f3d18584c4803e8cab087c
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Tue Jan 31 11:12:59 2017 +0100

    WL#8069 merged with 7.6 after WL#9778 pushed

commit c83ff61eccba292c0d0944f63995f3462f4c28c6
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Fri Jun 9 10:57:48 2017 +0200

    WL#10426: Separate credentials for different hosts in Auto Installer

commit ac4e7f8c25b00686a2ed44908ff53cf0a4bc0a1c
Merge: 61b431d 47cbf84
Author: Ole John Aske <ole.john.aske@oracle.com>
Date:   Fri Jun 9 09:10:25 2017 +0200

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit 47cbf84f79a9c4545fa1899426e63175abd80e73
Merge: 5a0883b ec06283
Author: Ole John Aske <ole.john.aske@oracle.com>
Date:   Fri Jun 9 09:09:45 2017 +0200

    Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5

commit ec06283b6ee98031416c52fa74e707a96493df0e
Author: Ole John Aske <ole.john.aske@oracle.com>
Date:   Fri Jun 9 08:56:07 2017 +0200

    Bug#26239591 ALLOW JOIN-PUSHDOWN OF JOIN IN COMBINATION WITH 'GROUP BY'
    
    Due to previous unclear seperation between the optimize
    and execute phases when the query involved a 'GROUP BY',
    the 'join-pushable evaluator' couldn't previously be sure
    whether the optimized QEP (Query Execution Plan) was pushable
    or not. Thus it choosed to not push 'grouped joins'.
    
    This has been cleaned up by WL5558 long ago, so we can
    now remove this limitation.

commit 61b431d217af03f5c8290f95b74a0cccbbdc1eea
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu Jun 8 16:59:15 2017 +0200

    WL#9788:
    More build changes
    Error handling fixes
    More help text fixes
    New attempt at disabling ndb_top on Solaris

commit f5fbec46d52beab23fda807639089d9c2bb7e30d
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Thu Jun 8 14:37:13 2017 +0200

    WL#9788: Temporarily disabled Solaris for ndb_top

commit e8d9c5ce96a2efd8a4c634b210b0e3ae36bc7f62
Merge: 3d3749a 5a0883b
Author: John David Duncan <john.duncan@oracle.com>
Date:   Wed Jun 7 19:49:29 2017 -0700

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit 5a0883bda26b7f16b850c4de8beb2811724561ad
Merge: 639ca2c 5f5a711
Author: John David Duncan <john.duncan@oracle.com>
Date:   Wed Jun 7 19:49:07 2017 -0700

    Null merge from mysql-5.6-cluster-7.4

commit 5f5a71104fbd954b25e014be5931b07871111211
Author: John David Duncan <john.duncan@oracle.com>
Date:   Tue Jun 6 19:55:23 2017 -0700

    For Cluster 7.4 only, fix ndb nodejs build errors on Solaris

commit 3d3749a0cd47f49b513a72059d002acaeb131c9f
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Wed Jun 7 16:53:16 2017 +0200

    WL#9788: One more minor change of help text

commit d4facb299ce398045c66c3c4c96ac0ee126d7d7e
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Wed Jun 7 16:36:05 2017 +0200

    WL#9788: Minor addition to the help text

commit 757b3cc916d186685cb4ecf20a0868acb5e3ebd5
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Wed Jun 7 16:14:55 2017 +0200

    WL#9788: A new tool ndb_top that uses ASCII graphics to display how much CPU threads in the NDB data nodes uses

commit 33aa1fc372934a1c3c3acd6a517f7d09637f8a0e
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Wed Jun 7 14:07:06 2017 +0300

    wl#7614 win32-12.diff
    
    add windows note to usage message

commit 593e0afbcdb1f50c36d30e4e9da750cafb1ed714
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Tue Jun 6 14:05:34 2017 +0300

    wl#7614 win32-11.diff
    
    test windows directory separator

commit 0c589117753d6eebdb72c4cf9dff9757b29e80c2
Merge: 93e04f6 639ca2c
Author: Frazer Clement <frazer.clement@oracle.com>
Date:   Mon Jun 5 16:45:13 2017 +0100

    Merge ../mysql-5.7-cluster-7.5 into mysql-5.7-cluster-7.6

commit 639ca2c5d404b6881686d8c7f8aa418ed43cd6ea
Merge: 042e0d4 9c9444b
Author: Frazer Clement <frazer.clement@oracle.com>
Date:   Mon Jun 5 16:44:59 2017 +0100

    Merge ../mysql-5.6-cluster-7.4 into mysql-5.7-cluster-7.5

commit 9c9444b7097b5c86768e8b79687c5692c851884e
Merge: eac1d87 3e2a580
Author: Frazer Clement <frazer.clement@oracle.com>
Date:   Mon Jun 5 16:44:48 2017 +0100

    Merge ../mysql-5.6-cluster-7.3 into mysql-5.6-cluster-7.4

commit 3e2a580e9bbcd961d6fc6c4b1224ec86687c848a
Author: Frazer Clement <frazer.clement@oracle.com>
Date:   Mon Jun 5 16:43:51 2017 +0100

    Fix include/have_ndb_debug.inc to avoid leaving a table behind
    in failed-require cases.
    Drop the table before checking the require case.

commit 93e04f69638f7b5769d4098f3f6c0d2a7cecc7f9
Merge: 8f3cd17 042e0d4
Author: Frazer Clement <frazer.clement@oracle.com>
Date:   Mon Jun 5 12:00:56 2017 +0100

    Merge ../mysql-5.7-cluster-7.5 into mysql-5.7-cluster-7.6

commit 042e0d4a7d534387312d6fb213741ee2ddeb4ebe
Merge: afbcd2a eac1d87
Author: Frazer Clement <frazer.clement@oracle.com>
Date:   Mon Jun 5 11:59:42 2017 +0100

    Merge ../mysql-5.6-cluster-7.4 into mysql-5.7-cluster-7.5

commit eac1d87951d09df3e29797de53a86ea09e615c3b
Merge: df540e1 60fdd0f
Author: Frazer Clement <frazer.clement@oracle.com>
Date:   Mon Jun 5 11:58:54 2017 +0100

    Merge ../mysql-5.6-cluster-7.3 into mysql-5.6-cluster-7.4
    
    Conflicts:
    	storage/ndb/src/kernel/blocks/backup/Backup.cpp

commit 60fdd0f31e74b04de579bc1b0e89891489824c96
Author: Frazer Clement <frazer.clement@oracle.com>
Date:   Mon Jun 5 11:49:57 2017 +0100

    Bug#25891014 NDB : ONLINE BACKUP LOG CONTAINS EXTRA ENTRIES
    
    Current ndbmtd online backup is including too many entries in the
    backup log.
    
    Specifically, row changes occurring to fragments managed by LDM
    instance 1 are always recorded in the log, even if they are for
    non-primary fragments.
    
    This wastes resources at restore time, and can result in other
    problems when e.g. staging tables are used for schema transforms
    during ndb_restore.
    
    This patch corrects the problem, and adds an MTR testcase which
    checks that the backup log contains only the expected entries,
    and no duplicates.

commit 8f3cd17bd30f3b892d233d36ae68b5aab0ef5e10
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Sat Jun 3 17:33:42 2017 +0300

    wl#7614 win32-10.diff
    
    binary byte 032 and CR-LF testing

commit 69af14eaaa778d9b8a94f36be87152a255a32a03
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Fri Jun 2 15:47:18 2017 +0300

    wl#7614 win32-09.diff
    
    use _O_BINARY for all files

commit 0a3478f4ab65766d88a50d5725a293100576fbd6
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Thu Jun 1 19:01:30 2017 +0300

    wl#7614 win32-08.diff
    
    always use perl :raw io

commit a37dfc39557a25ddec059ed787724bf1c8eab941
Merge: 86fb864 afbcd2a
Author: John David Duncan <john.duncan@oracle.com>
Date:   Fri Jun 2 11:21:18 2017 -0700

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit afbcd2ab37ac15acc233b774f38b33b93d6c3ad2
Merge: 32bf61a df540e1
Author: John David Duncan <john.duncan@oracle.com>
Date:   Fri Jun 2 11:20:46 2017 -0700

    Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5
    
    Conflicts:
    	storage/ndb/src/ndbjtie/jtie/test/myjapi/CMakeLists.txt
    	storage/ndb/src/ndbjtie/test/CMakeLists.txt

commit df540e1b623e03cbc5adbe1bf1349abb19c6bece
Author: John David Duncan <john.duncan@oracle.com>
Date:   Fri Jun 2 11:15:49 2017 -0700

    bug#26088583 jtie unit tests do not run
    
    Remove TAP scaffolding including command shell scripts and wrapper programs
    from jtie unit tests. Configure the executable unit tests as CTest tests.

commit 86fb86434310843411d9731e41f28a537f4a412a
Merge: 0dfc0f4 32bf61a
Author: Piotr Obrzut <piotr.obrzut@oracle.com>
Date:   Fri Jun 2 18:26:40 2017 +0200

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit 32bf61ab992cc81ed3e6c67e612940ddc3f8b417
Merge: 90b37ac a5965ef
Author: Piotr Obrzut <piotr.obrzut@oracle.com>
Date:   Fri Jun 2 18:24:50 2017 +0200

    Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5

commit a5965efa40f95f01bbbc59ba886288da1e1ee4ba
Merge: 1343cd2 f5fbd57
Author: Piotr Obrzut <piotr.obrzut@oracle.com>
Date:   Fri Jun 2 18:21:28 2017 +0200

    Merge branch 'mysql-5.6-cluster-7.3' into mysql-5.6-cluster-7.4

commit f5fbd575e4f708b9d7811dc551b6c610d73798dd
Merge: 9050e2a 00fca74b
Author: Piotr Obrzut <piotr.obrzut@oracle.com>
Date:   Fri Jun 2 18:17:00 2017 +0200

    Merge branch 'mysql-5.5-cluster-7.2' into mysql-5.6-cluster-7.3

commit 00fca74ba8028d079296e48e26a37dad5ce026d2
Author: Piotr Obrzut <piotr.obrzut@oracle.com>
Date:   Fri Jun 2 18:13:15 2017 +0200

    Bug#26181622 MSI BUILD FAIL DUE TO DUPLICATED FILE ID
    
    Fixed generated mysql_server.wxs not to contain duplicates, or too long ids

commit 0dfc0f41b6ad25986f4e9b1685c860019b78878c
Author: Piotr Obrzut <piotr.obrzut@oracle.com>
Date:   Fri Jun 2 17:55:46 2017 +0200

    Bug#26181622 MSI BUILD FAIL DUE TO DUPLICATED FILE ID
    
    Fixed generated mysql_server.wxs not to contain duplicates, or too long ids

commit ee3d46841b915e6e2e7d38eb4b89affc9e5de98d
Author: Lakshmi Narayanan Sreethar <lakshmi.narayanan.sreethar@oracle.com>
Date:   Fri Jun 2 03:48:00 2017 +0530

    Refractoring get_foreign_key_create_info().
    
    In an followup to the patch for the Bug#16371292, the
    ha_ndcluster::get_foreign_key_create_info() function is refactored here
    to use the new method from Ndb_fk_util to generate fk info.

commit 4c016fa941b3cd5fb70c4bda666df6b364147ac0
Author: Lakshmi Narayanan Sreethar <lakshmi.narayanan.sreethar@oracle.com>
Date:   Fri Jun 2 03:47:31 2017 +0530

    Bug#16371292 : Print FK violation information (PART II : ha_ndbcluster fix)
    
    Part II of the fix.
    This patch updates the get_error_message() method of the ha_ndbcluster to
    fetch the proper details of the FK constraint on an fk constraint violation
    error and print it back to the server's buffer. The fk details is got
    either from the last transaction stored in thd_ndb for DML erros or from
    ndb's dictionary for DDL errors.
    
    A new method is also added to the Ndb_fk_util class to generate the FK
    constraint info in required format when an FK object is passed to it.
    
    This patch also updates all the MTR testcases and replaces the `Unknown
    error codes` text with proper FK info.

commit 7b7eea928c28df4aa8cb091e1e6fbe49ebfaedce
Author: Lakshmi Narayanan Sreethar <lakshmi.narayanan.sreethar@oracle.com>
Date:   Fri Jun 2 03:42:22 2017 +0530

    Bug#16371292 : Print FK violation information (PART I : ndbd + ndbapi fix)
    
    When there is an error in a SQL query on an NDB table due to a Foreign
    Key constraint violation, the details of the foreign key are not shown
    in the error message. The server actually asks the ndb handler about
    the FK details before printing it but the handler itself doesn't know
    the FK details, so, it sends back a 'Unknown error code' message. In
    fact the violation information never leaves the DBTC block.
    
    This patch fixes the ndbd and ndbapi side to handle and return the fk
    id on a fk constraint violation.
    
    The DBDICT block now sets the apiConnectPtr's errorData variable to the
    fk id on failure. Rest of the code is already in place. This fk id
    reaches back to the ndbapi via the TCROLLBACKREP signal and gets read.
    The ndbapi adds this additional details to the transactions's ndberror.
    
    Also now during a drop table failure due to an FK constraint, the fk id
    is saved into the NdbDictionary's ndberror by the ndbapi.
    
    This patch also updates the getNdbErrorDetails function of the ndb so
    that now it returns the Foreign Key's fully qualified name when an
    NdbError filled with a FK constraint violation error is sent to it.

commit 91f64e219c312f912ee2bc90c9caa15fdb0c82ce
Author: Lakshmi Narayanan Sreethar <lakshmi.narayanan.sreethar@oracle.com>
Date:   Fri Jun 2 03:41:53 2017 +0530

    Bug#26029485 : FIX ERROR FOR INPLACE ALTER ADD FK
    
    When an inplace alter add foreign key fails, due to a child row not
    present in parent, the error "Cannot add or update a child row" is
    displayed.
    
    This patch changes it to "Cannot add Foreign Key Constraint" - which is
    more suited to the situation.

commit dbb6d6936b69c11bdc7d35bc60bb212c040387db
Author: Maitrayi Sabaratnam <maitrayi.sabaratnam@oracle.com>
Date:   Wed May 31 11:32:56 2017 +0200

    Debug to follow Bug#25811493 REPLACE FAILS ON SPARC WITH: ERROR 1114 THE TABLE IS FULL

commit d8c50d5222af5e5c304b6be8980a6f5cb24bfa8d
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Tue May 30 16:20:43 2017 +0300

    wl#7614 win32-07.diff
    
    check UTF8 output, avoid byte 032

commit 7d9107cc906dc64685c0a626fec8be1194787089
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Mon May 29 18:29:46 2017 +0300

    wl#7614 util-list1.diff
    
    make Util::List type-safe
    no functional changes

commit 37b18042c9be65179522cb0f4935d55c1d5e8262
Author: Maitrayi Sabaratnam <maitrayi.sabaratnam@oracle.com>
Date:   Mon May 29 13:35:58 2017 +0200

    Fixing the test by increasing data file's initial size to allow
    reservation (followup of the fix for Bug#25923125).

commit 2a80c2ca6df360515b70477343eda2ab6da87ad8
Merge: 6240b62 90b37ac
Author: John David Duncan <john.duncan@oracle.com>
Date:   Tue May 23 11:13:26 2017 -0700

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit 90b37ac15ef888a8a057de1760072ed377896f34
Merge: ae4ae95 1343cd2
Author: John David Duncan <john.duncan@oracle.com>
Date:   Tue May 23 11:12:36 2017 -0700

    Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5

commit 1343cd2fbeab0f8241bd148e2f4983d51bad621b
Merge: a842d2e 9050e2a
Author: John David Duncan <john.duncan@oracle.com>
Date:   Tue May 23 10:29:08 2017 -0700

    Merge branch 'mysql-5.6-cluster-7.3' into mysql-5.6-cluster-7.4

commit 9050e2a6d80a970d3725917e52b6ac3166f23540
Author: John David Duncan <john.duncan@oracle.com>
Date:   Mon May 22 21:46:08 2017 -0700

    Bug#26080804 jtie unit test compile failure
    Remove deliver_null_ref() and take_null_ref() from C++ myapi and Java myjapi

commit 6240b6248a3201e55388d077a21a211bf44e648b
Author: Mauritz Sundell <mauritz.sundell@oracle.com>
Date:   Mon May 22 11:46:44 2017 +0200

    Bug#26116231 INTERNAL ERROR 631 IS EXPOSED TO APPLICATION
    
    test_event -l 10 -n Bug27169 T1 failed due to error 631.
    
    Test failure is due to 631 was a permanent (internal) error.
    
    Error 631 is now reclassified as Node Recovery error which is a temporary
    error class and visible to applications.

commit 2fecdda12252f25a47278e7fce4bf39570effc42
Author: Maitrayi Sabaratnam <maitrayi.sabaratnam@oracle.com>
Date:   Mon May 22 11:25:59 2017 +0200

    Bug#25923125 - 7.6.2: NODE CRASHED DURING RESTART WITH ERROR "COPYFRAG FAILED, ERROR: 1601
    
    If the tablespace of a disk table is fully consumed when a node goes
    down and the table rows are deleted and inserted while the node is
    away (or updated with shrinking/expanding disk column values), the
    node restart may fail with error 1601 - "Out of extents, tablespace
    full".
    
    This is fixed by reserving 4% of the tablespace to be used during
    node starts.

commit 779913ead1a1f94df52e5f229197c161b024d3fe
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Sat May 20 15:29:49 2017 +0300

    wl#7614 win32-06.diff
    
    test quoting and escapes in windows

commit f9a89a4d2acc9c930fa90f07cfb40d12cdeb39be
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Fri May 19 21:42:50 2017 +0300

    wl#7614 csvopt1.diff
    
    option --csvopt

commit ec8fc26b9d3c2ed242566976d9fd19097c699989
Author: Mauritz Sundell <mauritz.sundell@oracle.com>
Date:   Sat Apr 8 00:39:33 2017 +0200

    Bug#26107514 SOME ERROR MESSAGES STILL REFER TO INDEXMEMORY INSTEAD OF DATAMEMORY PARAMETER
    
    Change 'increase IndexMemory' to 'increase DataMemory' in error messages.

commit de2d3e508a5510a85c9e2da7b463e32d267ecc79
Author: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
Date:   Thu May 18 14:00:32 2017 +0530

    Added ndb_import man page to deb builds

commit 6e76fc5cc46e2407b1bc1a01678d609c458e9022
Merge: d838507 ae4ae95
Author: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
Date:   Thu May 18 11:34:07 2017 +0530

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit ae4ae95af50d86e99c0f2c28a5d88fbad3726454
Merge: 837f23b a842d2e
Author: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
Date:   Thu May 18 11:33:27 2017 +0530

    Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5

commit a842d2e4ece547b677866edd757298aaa2ae0704
Merge: 06a9db9 ccea5dc
Author: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
Date:   Thu May 18 11:25:17 2017 +0530

    Merge branch 'mysql-5.6-cluster-7.3' into mysql-5.6-cluster-7.4

commit ccea5dc958d8578561585accb03277e951f2f2e6
Merge: 6ed6c21 31f4015
Author: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
Date:   Thu May 18 11:24:12 2017 +0530

    Merge branch 'mysql-5.5-cluster-7.2' into mysql-5.6-cluster-7.3

commit 31f401585959bfa540b8cf629c7ee018eef42a90
Author: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
Date:   Thu May 18 11:22:26 2017 +0530

    Added ndb_move_data man page

commit d838507a635b084f1d83db527283c18d7aa91bed
Merge: 2d74ba1 837f23b
Author: Craig L Russell <craig.russell@oracle.com>
Date:   Wed May 17 17:16:41 2017 -0700

    Merge ../mysql-5.7-cluster-7.5 into mysql-5.7-cluster-7.6
    
    Adapt clusterj for connector-j 5.1.38

commit 837f23b8bd785ebe938f1c1d60e4fca33e4a4107
Author: Craig L Russell <craig.russell@oracle.com>
Date:   Wed May 17 17:14:19 2017 -0700

    Adapt clusterj for connector-j 5.1.38
    
    Using default connection properties results in:
    WARN: Establishing SSL connection without server's identity
    verification is not recommended. According to MySQL 5.5.45+, 5.6.26+
    and 5.7.6+ requirements SSL connection must be established by
    default if explicit option isn't set. For compliance with existing
    applications not using SSL the verifyServerCertificate property is
    set to 'false'. You need either to explicitly disable SSL by setting
    useSSL=false, or set useSSL=true and provide truststore for server
    certificate verification.
    
    AbstractClusterJTest.java
      add useSSL=false to connection properties

commit 2d74ba11348e37cab29668f734e0240342b5dc06
Merge: 6fb94ea 0cdd58c
Author: Mauritz Sundell <mauritz.sundell@oracle.com>
Date:   Wed May 17 15:52:43 2017 +0200

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6 (Bug#26092639)

commit 0cdd58c19d337964e81a329c19a93fa7aa98eb94
Merge: e0abf39 06a9db9
Author: Mauritz Sundell <mauritz.sundell@oracle.com>
Date:   Wed May 17 15:52:01 2017 +0200

    Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5 (Bug#26092639)

commit 06a9db9ce22cc2b5d4a05c72ca3c61397f5ca8bd
Author: Mauritz Sundell <mauritz.sundell@oracle.com>
Date:   Tue May 16 17:31:59 2017 +0200

    Bug#26092639 READ BEYOND BUFFER IN EXECUTE_SIGNALS
    
    Only read section pointers passed with signal.

commit 6fb94ea9ba3051e904292025aad21aad4a67b16d
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Tue May 16 00:32:59 2017 +0300

    wl#7614 connect-wait.diff
    
    correct con->wait_until_ready

commit 3916b39953873e92e776bc768e798c1c1ebe3458
Merge: 341e363 e0abf39
Author: Lakshmi Narayanan Sreethar <lakshmi.narayanan.sreethar@oracle.com>
Date:   Tue May 16 01:52:14 2017 +0530

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit e0abf396e73f2d21bc900d383a7cc0f4348e98cc
Merge: 48a6759 9776797
Author: Lakshmi Narayanan Sreethar <lakshmi.narayanan.sreethar@oracle.com>
Date:   Tue May 16 01:51:31 2017 +0530

    Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5

commit 97767970e4293ef9ea303ff53a603e052f3317ef
Author: Lakshmi Narayanan Sreethar <lakshmi.narayanan.sreethar@oracle.com>
Date:   Tue May 16 01:46:43 2017 +0530

    Bug#25859977 : WRONG ERROR MESSAGE SHOWN AFTER ALTER ADD FK FAILURE
    
    Post-push fix
    The actual fix wrongly picked up the fk name from Foreign_key object of
    the server. Moreover the name there was a LEX_STRING which caused the
    test case to fail in windows. This patch fixes that by reading the fk
    name from the actual NDBFK object.

commit 341e36375f3dfb08761255eba5925183daa7bbd6
Merge: dd87fc4 48a6759
Author: Mauritz Sundell <mauritz.sundell@oracle.com>
Date:   Mon May 15 17:18:28 2017 +0200

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6 (Bug#22627519)

commit 48a675940f5b28f5f91cf8600cf6e50678831c40
Author: Mauritz Sundell <mauritz.sundell@oracle.com>
Date:   Mon May 15 17:12:28 2017 +0200

    Post push fix for bug#22627519.
    
    Result mismatch when running with Query Cache enabled (#scan)

commit dd87fc49a93fbc24f31dbc962498b4af92fb28f9
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Sat May 13 22:10:13 2017 +0300

    wl#7614 win32-05.diff
    
    enable windows in ndb_import*test

commit d0896b31f4847020f6893a8bc9b294012357801a
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Sat May 13 15:44:34 2017 +0300

    wl#7614 win32-04.diff
    
    no signals on windows yet

commit ba392179cd993591670218f8b853f5737ac6d587
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Sat May 13 13:36:34 2017 +0300

    wl#7614 win32-03.diff
    
    hope for stdint.h

commit 2c56f20e6256e51b21de7f25a4d835b3a70a42cb
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Sat May 13 00:42:56 2017 +0300

    wl#7614 win32-02.diff
    
    use BaseString snprintf for windows

commit 1a214065821ffea99974290d8b43c319ae2a657c
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Fri May 12 21:29:17 2017 +0300

    wl#7614 win32-01.diff
    
    fix windows build, part 01

commit b45539ef4b7e03cb39426438630565383819a94e
Merge: 4d9897a 4779b67
Author: John David Duncan <john.duncan@oracle.com>
Date:   Fri May 12 08:38:49 2017 -0700

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit 4779b678063a0f514e123e14b634d068c2268b2b
Merge: 17a5a18 f9f7338
Author: John David Duncan <john.duncan@oracle.com>
Date:   Fri May 12 08:36:31 2017 -0700

    Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5

commit f9f733841b591d57ae4ad35ba01e40c75a28a6eb
Merge: ba455e3 6ed6c21
Author: John David Duncan <john.duncan@oracle.com>
Date:   Fri May 12 08:36:06 2017 -0700

    Merge branch 'mysql-5.6-cluster-7.3' into mysql-5.6-cluster-7.4

commit 6ed6c21054e0b15da8034438e40be93c8440c0a7
Author: John David Duncan <john.duncan@oracle.com>
Date:   Fri May 12 08:33:38 2017 -0700

    Workaround for bug#25690926
    For gcc 6.x and newer, compile NDB kernel with -flifetime-dse=1

commit 4d9897aab35e0cfdc16c638e82fa0187279eee7e
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Fri May 12 18:02:36 2017 +0300

    wl#7614 relay-tx3.diff
    
    handle start trans temp errors better

commit 2928d342885ce3ab5eb09cd77277b0454f309745
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Fri May 12 18:01:59 2017 +0300

    wl#7614 relay-tx2.diff
    
    avoid trans in relay-op node select

commit 4809df4a1213f5050972a7346380053cb54ab70e
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Fri May 12 17:58:52 2017 +0300

    wl#7614 relay-tx1.diff
    
    move auto-incr from relay-op to exec-op

commit caf865ce13f7a24b22e99ee0261777dbfe745024
Merge: e5b3663 17a5a18
Author: Frazer Clement <frazer.clement@oracle.com>
Date:   Thu May 11 23:10:27 2017 +0100

    Merge ../mysql-5.7-cluster-7.5 into mysql-5.7-cluster-7.6

commit 17a5a181eb2a551fcfaca832c22855720b40d261
Merge: d43c7f8 ba455e3
Author: Frazer Clement <frazer.clement@oracle.com>
Date:   Thu May 11 23:10:15 2017 +0100

    Merge ../mysql-5.6-cluster-7.4 into mysql-5.7-cluster-7.5

commit ba455e358ee46b706b3912131b856dd057f945b2
Author: Frazer Clement <frazer.clement@oracle.com>
Date:   Thu May 11 23:08:11 2017 +0100

    Remove invalid inline marker from method in .cpp file
    
    Stray inline marker stops linker finding definition for .so

commit e5b36635e9875b3394117efce643d2db4aacbb9e
Merge: b8824ed d43c7f8
Author: Frazer Clement <frazer.clement@oracle.com>
Date:   Thu May 11 17:25:41 2017 +0100

    Merge ../mysql-5.7-cluster-7.5 into mysql-5.7-cluster-7.6

commit d43c7f8f9f31072cd6901405622ad19e65cf51b1
Merge: ea2fca1 6565095
Author: Frazer Clement <frazer.clement@oracle.com>
Date:   Thu May 11 17:24:51 2017 +0100

    Merge ../mysql-5.6-cluster-7.4 into mysql-5.7-cluster-7.5

commit 65650959b98f2b5691d1467026ebf151b91fd09e
Author: Frazer Clement <frazer.clement@oracle.com>
Date:   Thu May 11 17:10:17 2017 +0100

    Bug #24829435 	NDB : NDBTABLE::GETCOLUMN(CONST CHAR*) IS INEFFICIENT
    
    The getColumn functionality in the NdbApi dictionary is used to
    map from a column name to a column object.
    This can be used explicitly by users, or implicitly as part of
    passing a column name to an NdbApi function.
    The current implementation uses a linear search of an array of
    strings (column names), whose cost scales O(n) in the number of
    columns.  This has been seen to waste cpu in real-world NdbApi
    applications.
    It is possible for applications to lookup column objects or ids
    upfront, and then use them which gives O(1) access to a column
    object.
    However to improve the experience of users using column name strings
    at runtime, a column name hash is implemented.  This should give
    ~O(1) lookup performance from name strings to column objects.
    
    It is still recommended to perform name->object/id lookups upfront,
    but the cost of doing them at runtime is reduced.
    
    A new test is added to testNdbApi which can be used to show
    that column lookup performance is independent of the #columns.

commit b8824edbc73b69524e8708a39a6a7612288b8ba0
Author: Mauritz Sundell <mauritz.sundell@oracle.com>
Date:   Fri May 5 23:37:01 2017 +0200

    Test case verifying that drop table do not leak data memory pages.
    
    Bug#26030894 ERROR[NDB-827]: OUT OF MEMORY IN NDB KERNEL, TABLE DATA (INCREASE DATAMEMORY)

commit 587802371d3b17c68789c2092c5ec04b998fe5c3
Author: Mauritz Sundell <mauritz.sundell@oracle.com>
Date:   Mon May 8 23:53:16 2017 +0200

    Make all hash index pages be freed when table is dropped.
    
    Bug#26030894 ERROR[NDB-827]: OUT OF MEMORY IN NDB KERNEL, TABLE DATA (INCREASE DATAMEMORY)
    
    Prior fix, there was at most one attempt in Dbacc to remove the freed pages.
    
    For big partitions using more than 32 pages there were always some pages lost.

commit 2356619fa22e313bd4ac017bcce85ef8c7828a76
Merge: 405dcc8 ea2fca1
Author: Mauritz Sundell <mauritz.sundell@oracle.com>
Date:   Wed May 10 18:16:50 2017 +0200

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6 (Bug#25974560)

commit ea2fca1f4258411518ab2e85f4ee9f2ed30b3219
Author: Mauritz Sundell <mauritz.sundell@oracle.com>
Date:   Wed May 10 15:47:02 2017 +0200

    Resolve symbol Int32 clash between nodejs/v8 and NDB.
    
    Post push fix for Bug#25974560.

commit 405dcc81f7edea2f7ffe49feab19268f8b79159a
Author: Arnab Ray <arnab.r.ray@oracle.com>
Date:   Wed May 10 18:29:01 2017 +0530

    WL#8500 Adapt MySQL Cluster to 8.0
    
    - Suppress warnings for undefined identifiers in bison output in
      ndb_import

commit 4d6e6fe1bdb430074e56488bac869985f3e7fc8d
Merge: 52f2691 54a9809
Author: Mauritz Sundell <mauritz.sundell@oracle.com>
Date:   Wed May 10 14:51:37 2017 +0200

    Null merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6 (bug#25974560)

commit 52f2691db5934057694dec73475aac2cb3a4beaa
Author: Mauritz Sundell <mauritz.sundell@oracle.com>
Date:   Wed May 10 14:50:38 2017 +0200

    Use {UINT,INT}32_{MIN,MAX} from stdint.h
    
    Bug#25974560 COMPILER WARNINGS ON WINDOWS: WARNING C4005: 'INT32_MAX' : MACRO REDEFINITION
    
    Remove the definitions for the above from ndb_constants.h.
    
    This should get rid of build warnings on Windows.

commit 54a9809235dbcaec41499a60fad21b2a3609bb19
Author: Mauritz Sundell <mauritz.sundell@oracle.com>
Date:   Wed May 10 14:07:58 2017 +0200

    Use {UINT,INT}32_{MIN,MAX} from stdint.h
    
    Bug#25974560 COMPILER WARNINGS ON WINDOWS: WARNING C4005: 'INT32_MAX' : MACRO REDEFINITION
    
    Remove the definitions for the above from ndb_constants.h.
    
    This should get rid of build warnings on Windows.

commit fd4c971da301058fbb585405d5eca4ea942e000e
Merge: 7699fd6 8381d5c
Author: Maitrayi Sabaratnam <maitrayi.sabaratnam@oracle.com>
Date:   Wed May 10 14:22:24 2017 +0200

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit 8381d5c5b2fbad35343cc78e2fc20b08d4c7c5ee
Merge: 51865ae 7cb07f6
Author: Maitrayi Sabaratnam <maitrayi.sabaratnam@oracle.com>
Date:   Wed May 10 14:20:33 2017 +0200

    Null-merge from 7.4.

commit 7cb07f61eb8778e401e3793e03721e9a31d7b7c0
Author: Maitrayi Sabaratnam <maitrayi.sabaratnam@oracle.com>
Date:   Wed May 10 14:09:37 2017 +0200

    Fixing build break after Bug#25806659.

commit 7699fd609d4ffcb4b0d1cb16ef2282db4874ab4e
Author: Sanjana DS <sanjana.ds@oracle.com>
Date:   Wed May 10 16:31:06 2017 +0530

    Bug #25923164 : FIX BROKEN --UNQUALIFIED OPTION IN NDB_SHOW_TABLES
    
    Post-push fix.
    Remove --unqualified option from ndb_show_tables.
    This option is deprecated in 7.4 and 7.5.

commit e68acd1d19aa4562f03f66d21333227aca8b534a
Merge: 1e1e019 51865ae
Author: Sanjana DS <sanjana.ds@oracle.com>
Date:   Wed May 10 16:04:28 2017 +0530

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit 51865ae35fbf00f791890b91ab84e142dc77d9ae
Merge: 9592f32 601e20a
Author: Sanjana DS <sanjana.ds@oracle.com>
Date:   Wed May 10 16:01:01 2017 +0530

    Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5
    
    Conflicts:
    	mysql-test/suite/ndb/r/ndb_show_tables.result
    	mysql-test/suite/ndb/t/ndb_show_tables.test
    	storage/ndb/include/ndbapi/NdbDictionary.hpp
    	storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp

commit 601e20af5fde7384826f301b31ca0ea5d54ace73
Author: Sanjana DS <sanjana.ds@oracle.com>
Date:   Wed May 3 16:39:46 2017 +0530

    Bug #25923164 : FIX BROKEN --UNQUALIFIED OPTION IN NDB_SHOW_TABLES
    
    Problem
    -------
    The fully qualified table and index names were not being displayed
    when the --unqualified option was set to 0.
    
    Fix
    ---
    Fixed --unqualified so that fully qualified table names get displayed
    when it is set to 0.
    Also added new option --fully-qualified to display fully qualified table names.
    Made --unqualified deprecated since it's easier to use --fully-qualified
    than --unqualified=0 when the fully qualified table names need to be displayed.

commit 1e1e0194115e35a028c506b339161c4c1d318437
Merge: 5b77908 9592f32
Author: Ole John Aske <ole.john.aske@oracle.com>
Date:   Wed May 10 12:18:45 2017 +0200

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit 9592f32ec97bc95e6f180759b773938776da6319
Merge: be15450 2ad6750
Author: Ole John Aske <ole.john.aske@oracle.com>
Date:   Wed May 10 12:13:37 2017 +0200

    Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5

commit 2ad67501483db38df4804ad2311b41f4f4d6c35e
Author: Ole John Aske <ole.john.aske@oracle.com>
Date:   Wed May 10 12:05:53 2017 +0200

    Bug #22627519 NDB : SPJ INSTANCE USAGE IMBALANCE
    
    If number of configured LDM blocks is not divisible by number
    of TC/SPJ blocks, the SPJ requests will not be evenly distributed
    over the available SPJ instances.
    
    This patch introduce a round-robin distribution of the SPJ
    requests over the available SPJ instances.

commit 5b779084da6673df096a003802056faecd1ed8ae
Author: Magnus Blåudd <magnus.blaudd@oracle.com>
Date:   Tue May 9 15:37:56 2017 +0200

    Bug #21074209 SLAVE STOPS, ERROR_CODE: 1296; HANDLER ERROR
    HA_ERR_ROWS_EVENT_APPLY
    
     - remove parts of test which has no effect

commit 1f2ea82f722870c4d7f686890c512760445d1198
Author: Ole John Aske <ole.john.aske@oracle.com>
Date:   Mon May 8 15:06:50 2017 +0200

    Bug#25703113, Follow up patch.
    
    Partly revert minor part of patch for this bug.
    m_rowSize can leagally be '== 0' if no ndbRecord has been
    set up. Thus remove assert, and change back init of 'unknown'
    m_rowSize to '0xfffffff'

commit e006d48413650c502f69445e06280de6a4ad0fa0
Author: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
Date:   Mon May 8 15:02:53 2017 +0530

    Added ndb_import man page to rpm builds

commit 7eeb0c324229d27d921bd10360790b35be88f4f7
Merge: dd83bdd be15450
Author: John David Duncan <john.duncan@oracle.com>
Date:   Fri May 5 15:22:46 2017 -0700

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit be1545097ccfad7a65eed0fbf5de82197b2a22fa
Author: John David Duncan <john.duncan@oracle.com>
Date:   Fri May 5 15:21:05 2017 -0700

    ndb nodejs: CMakeLists.txt bugfix

commit dd83bdd45999c8d2a6f4be59fd657edff5b7b1e7
Merge: 844d5f8 797b7d3
Author: John David Duncan <john.duncan@oracle.com>
Date:   Fri May 5 13:56:12 2017 -0700

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6
    
    Conflicts:
    	storage/ndb/nodejs/CMakeLists.txt

commit 797b7d3c5fc9246639f187dba71d5388436dc2d3
Author: John David Duncan <john.duncan@oracle.com>
Date:   Wed May 3 17:38:05 2017 -0700

    Platform portability fixes for ndb nodejs
    Upgrade node.js dependent version to 6.10.2 where newer gcc supports it
    Compiler and linker fixes for Windows and Solaris

commit 844d5f80218da25708353a73f17174a0958e689c
Author: Magnus Blåudd <magnus.blaudd@oracle.com>
Date:   Fri May 5 16:02:23 2017 +0200

    WL#8500 Adapt MySQL Cluster to 8.0
    
     - mtr.pl no longer allows # in test file names:
        'Invalid test file name 'ndb.bug#24926009'. Test file
         name should consist of only alpha-numeric characters,
         dash (-) or underscore (_), but should not start with
         dash or underscore.'
    
     - fix by renamong bug#24926009 test case -> bug24926009
       '

commit 8316d104e51a3202311092eb6d229c239866057f
Merge: 9f58504 b943a6b
Author: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
Date:   Fri May 5 18:06:20 2017 +0530

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit b943a6b8c86dd934d16906d9f6f51b263c9635d4
Author: Arnab Ray <arnab.r.ray@oracle.com>
Date:   Thu May 4 15:09:23 2017 +0530

    Bug#25749218: PACKAGE(MYSQL-CLUSTER-COMMUNITY-TEST-7.6.1-1.EL7.X86_64.RPM )MISSING DEPENDENCY
    
    - For server, DEB_NDB_CONTROL_TEST_DEPS is empty so that leaves
      an empty line which is a syntax error causing the debian builds
      to fail
    - Fix is to move it to the end of the line above such that there's
      no empty line
    
    (cherry picked from commit 454343c19318c4b3b6d2cd2249285ed9033fc155)

commit 9f58504aa7a9da71b28add367878a1e37c5e74b3
Merge: 3b393c8 87c918f
Author: Dinesh Surya Prakash <dinesh.prakash@oracle.com>
Date:   Thu May 4 19:20:29 2017 +0530

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit 87c918fcd3c239c672b333685650d9c62af483ac
Merge: c783642 f40bb0e
Author: Dinesh Surya Prakash <dinesh.prakash@oracle.com>
Date:   Thu May 4 19:17:02 2017 +0530

    Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5

commit 3b393c8042a60bdabbd6919a726626c3d6eb88fb
Merge: 454343c c783642
Author: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
Date:   Thu May 4 16:34:28 2017 +0530

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit c7836428d202e48606f2902e5493b70b1f3c39ae
Author: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
Date:   Thu May 4 16:32:04 2017 +0530

    Bug#25998285 - ADD MYSQLADMIN DOCKER/MINIMAL SERVER BUILDS
    
    - mysqladmin is needed by InnoDB Cluster, add tool to docker/minimal package.

commit f40bb0e613ea92b4080367d749aecb682e57bfc6
Author: Dinesh Surya Prakash <dinesh.prakash@oracle.com>
Date:   Thu Apr 27 23:58:47 2017 +0530

    Bug#11766869 NDB_CONFIG TO DUMP COMPLETE CURRENT CONFIGURATION
    
    Problem
    =======
    
    1)Ndb_error_reporter internally uses ndb_config with a deprecated parameter
    "id". Hence ndb_config returns null and that breaks the testcase
    "ndb.ndb_error_reporter".
    
    2)ndb_config accepts deprecated parameter "id" but now it does not support
    it and it is not compactable with the earlier version.
    
    Fix
    ===
    
    1)Replaced the deprecated parameter "id" with new parameter "Nodeid" also
    added checks in the Ndb_error_reporter to fail in right place when the
    config file is wrong.
    
    
    2)have changed ndb_config to be compactable to earlier version.

commit 454343c19318c4b3b6d2cd2249285ed9033fc155
Author: Arnab Ray <arnab.r.ray@oracle.com>
Date:   Thu May 4 15:09:23 2017 +0530

    Bug#25749218: PACKAGE(MYSQL-CLUSTER-COMMUNITY-TEST-7.6.1-1.EL7.X86_64.RPM )MISSING DEPENDENCY
    
    - For server, DEB_NDB_CONTROL_TEST_DEPS is empty so that leaves
      an empty line which is a syntax error causing the debian builds
      to fail
    - Fix is to move it to the end of the line above such that there's
      no empty line

commit 20fdc0305688d37642d464d202787c5b29f4988b
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Wed May 3 21:06:21 2017 +0300

    wl#7614 connect1.diff
    
    remove confusing unused method

commit 08af60891d7d9b2fe503cc28b96088e613098a15
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Wed May 3 21:05:39 2017 +0300

    wl#7614 job-continue2.diff
    
    move global table id to job level
    fix --continue on missing table

commit 70b9c79e078e20339a5fdce2d5b217d2b8bb64ab
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Wed May 3 21:03:20 2017 +0300

    wl#7614 opt-stats.diff
    
    make stats file .stt optional

commit c4ad24490fcf9a266e0f1c924b812efe68547411
Merge: 3fcd475 9af1b21
Author: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
Date:   Wed May 3 22:04:11 2017 +0530

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit 9af1b21684601864ff4eb3c13869cee5dced2a08
Author: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
Date:   Wed May 3 22:03:08 2017 +0530

    Added nodejs package for debian

commit 3fcd475640838a95ef942c9d53bb754d732ed253
Merge: c417e6a 5a45793
Author: Arnab Ray <arnab.r.ray@oracle.com>
Date:   Wed May 3 16:16:58 2017 +0530

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6
    
    (WL#8500 Adapt MySQL Cluster to 8.0
    
     - Fix windows build
     - Replace popen and pclose with _popen and _pclose respectively
       on windows platforms)

commit 5a4579365a94eeda21f48842c5b396cde98ced66
Merge: f08dd6c 8fd341f
Author: Arnab Ray <arnab.r.ray@oracle.com>
Date:   Wed May 3 16:15:54 2017 +0530

    Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5
    
    (WL#8500 Adapt MySQL Cluster to 8.0
    
     - Fix windows build
     - Replace popen and pclose with _popen and _pclose respectively
       on windows platforms)

commit 8fd341fe4976f28f337da5713ceb5eea741ef7c6
Merge: bc1071a df71dc2
Author: Arnab Ray <arnab.r.ray@oracle.com>
Date:   Wed May 3 16:12:26 2017 +0530

    Merge branch 'mysql-5.6-cluster-7.3' into mysql-5.6-cluster-7.4
    
    (WL#8500 Adapt MySQL Cluster to 8.0
    
     - Fix windows build
     - Replace popen and pclose with _popen and _pclose respectively
       on windows platforms)

commit df71dc289e68f2834e05b9cbf05ca3c0214ac158
Merge: ad47d4a 3f496ab
Author: Arnab Ray <arnab.r.ray@oracle.com>
Date:   Wed May 3 16:09:36 2017 +0530

    Merge branch 'mysql-5.5-cluster-7.2' into mysql-5.6-cluster-7.3
    
    (WL#8500 Adapt MySQL Cluster to 8.0
    
     - Fix windows build
     - Replace popen and pclose with _popen and _pclose respectively
       on windows platforms)

commit 3f496ab1d3f31191047f10b0d68fe3248348fa2c
Author: Arnab Ray <arnab.r.ray@oracle.com>
Date:   Wed May 3 15:57:03 2017 +0530

    WL#8500 Adapt MySQL Cluster to 8.0
    
    - Fix windows build
    - Replace popen and pclose with _popen and _pclose respectively
      on windows platforms
    
    (cherry picked from commit 4424cb5d5db6f2e9c0750c26a172717fcc9437dd)

commit c417e6a251f39fb294fa89644b6c85d5567a210f
Author: Arnab Ray <arnab.r.ray@oracle.com>
Date:   Wed May 3 12:08:28 2017 +0530

    WL#7614 ndb_import internals
    
    - Fix a couple of mismatches in format specifiers
    
    (cherry picked from commit 67a73cf5f9f9a623723301d153f03fb27b4a2e6f)

commit bb4b61aa20a1ef2470ad6c646ebe844e78c8106e
Author: Arnab Ray <arnab.r.ray@oracle.com>
Date:   Wed May 3 12:03:24 2017 +0530

    WL#8500 Adapt MySQL Cluster to 8.0
    
    - Fix warnings detected by -Werror=suggest-attribute=format
      by adding format specifier attribute
    
    (cherry picked from commit 6cbccaa8e86584da0e33f9b875582d5cd1af3f1c)

commit 84781c0b40c73e54601e607bb6e404bcbc208581
Merge: 28bc570 f08dd6c
Author: Sreedhar Sreedhargadda <sreedhar.sreedhargadda@oracle.com>
Date:   Tue May 2 16:34:02 2017 +0200

    Upmerge of the 7.2.29 build

commit f08dd6ca7597e6a53a74ef17c69e801348332e1e
Merge: dd49a3f bc1071a
Author: Sreedhar Sreedhargadda <sreedhar.sreedhargadda@oracle.com>
Date:   Tue May 2 16:32:06 2017 +0200

    Upmerge of the 7.2.29 build

commit bc1071a984113263955c02339846cc11ed802b17
Merge: 7fc3834 ad47d4a
Author: Sreedhar Sreedhargadda <sreedhar.sreedhargadda@oracle.com>
Date:   Tue May 2 16:28:57 2017 +0200

    Upmerge of the 7.2.29 build

commit ad47d4ac4d080f039e85b0f1c935b2459f70383e
Merge: 28d740f 6de09f7
Author: Sreedhar Sreedhargadda <sreedhar.sreedhargadda@oracle.com>
Date:   Tue May 2 16:26:24 2017 +0200

    Upmerge of the 7.2.29 build

commit 6de09f74c14806a2bdf98050020dab589ab21b1c
Merge: 472c8fb 8d6e3f1
Author: Sreedhar Sreedhargadda <sreedhar.sreedhargadda@oracle.com>
Date:   Tue May 2 16:07:14 2017 +0200

    Merge branch 'mysql-cluster-7.2.29-release' into mysql-5.5-cluster-7.2

commit 28bc570ea03b742e2e5dcdf0c1a9259c5651a37e
Author: Magnus Blåudd <magnus.blaudd@oracle.com>
Date:   Tue May 2 11:55:00 2017 +0200

    WL#8500 Adapt MySQL Cluster to 8.0
    
     - remove unused UINT32_HALF

commit d8eea251eef32d81a93437b30abe502b70249e2c
Merge: 13f78a8 dd49a3f
Author: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
Date:   Tue May 2 15:32:30 2017 +0530

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit dd49a3f70875e3103a6fc800364000a11abd0572
Author: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
Date:   Tue May 2 15:30:45 2017 +0530

    Updated spec file for cluster minimal rpm builds

commit 13f78a8b17963e1da7abfc787dc11310103bcd1d
Author: Arnab Ray <arnab.r.ray@oracle.com>
Date:   Fri Apr 28 17:31:21 2017 +0530

    WL#8500 Adapt MySQL Cluster to 8.0
    
    - Fix warnings detected by -Werror=suggest-attribute=format
      by adding format specifier attribute

commit fc7d8cb354198a4cb5d61981fc5f8bd9e53d5fd3
Author: Sanjana DS <sanjana.ds@oracle.com>
Date:   Tue May 2 12:09:05 2017 +0530

    Bug #24748843 : SYNC PRINTS TO STDOUT CAUSING MAIN THREAD TO SLEEP DURING HIGH IO WAIT
    
    Post-push fix.
    Fix compiler warning due to zero length format string in LogBuffer.cpp.

commit 67300ad1eee08891a8333f96d9f35fcdff97f092
Merge: 34ef040 9966f26
Author: Martin Sköld <Martin.Skold@oracle.com>
Date:   Fri Apr 28 14:55:42 2017 +0200

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit 9966f26cd1d46605a541c99d4f545681a9af9631
Author: Martin Sköld <Martin.Skold@oracle.com>
Date:   Fri Apr 28 14:53:32 2017 +0200

    Bug #21074209 SLAVE STOPS, ERROR_CODE: 1296; HANDLER ERROR HA_ERR_ROWS_EVENT_APPLY
    
    Reversed order of checks since multiple-channels seem to have un-initialized
    configuration settings.

commit 34ef0402d1a699fbb696c6fa89bf28c5b8c5541f
Merge: b88f155 b7f90ea
Author: Maitrayi Sabaratnam <maitrayi.sabaratnam@oracle.com>
Date:   Fri Apr 28 13:41:56 2017 +0200

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6
    
    Conflicts:
    	storage/ndb/test/ndbapi/testRedo.cpp

commit b7f90ea54bac14b34d1338910fa6e28acd9a80f6
Merge: 0c66236 7fc3834
Author: Maitrayi Sabaratnam <maitrayi.sabaratnam@oracle.com>
Date:   Fri Apr 28 13:07:34 2017 +0200

    Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5
    
    Conflicts:
    	storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
    	storage/ndb/test/run-test/daily-devel--07-tests.txt

commit 7fc38346cd6d7659e6531c169323d047c513300d
Author: Maitrayi Sabaratnam <maitrayi.sabaratnam@oracle.com>
Date:   Fri Apr 28 12:39:42 2017 +0200

    Bug#25806659 - NDBREQUIRE(LOGFILEPTR.P->FILEREF != RNIL) FAILS, FOR NEXT REDO LOG FILE NOT OPEN
    
    At the last write on a redo log file n, a command to open file n+2 is
    issued. At this time, it is expected that file n+1 is already opened
    for next writes. However, this may not be the case for a tardy disk,
    causing node crash.
    
    This fix will add handling an unopened file gracefully by introducing
    waits.

commit b88f15581f62d224bac17000a437a33e99370446
Merge: e72ca94 0c66236
Author: Martin Sköld <Martin.Skold@oracle.com>
Date:   Fri Apr 28 10:53:43 2017 +0200

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit 0c6623623cb84180b2410caad9789b78c109090c
Merge: c484046 0f6801b
Author: Martin Sköld <Martin.Skold@oracle.com>
Date:   Fri Apr 28 10:53:13 2017 +0200

    Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5

commit 0f6801b67782b920c0af56e528c1d63e77770a42
Merge: 02a30e9 28d740f
Author: Martin Sköld <Martin.Skold@oracle.com>
Date:   Fri Apr 28 10:51:04 2017 +0200

    Merge branch 'mysql-5.6-cluster-7.3' into mysql-5.6-cluster-7.4

commit 28d740febc315571eded968a5b389bd4173b0745
Author: Martin Sköld <Martin.Skold@oracle.com>
Date:   Fri Apr 28 10:49:51 2017 +0200

    Bug #21074209 SLAVE STOPS, ERROR_CODE: 1296; HANDLER ERROR HA_ERR_ROWS_EVENT_APPLY
    
    Removed function definition if no binlog.

commit e72ca949de0d924f4ea9c5fc9b4287d43d64d268
Merge: b29073f c484046
Author: Martin Sköld <Martin.Skold@oracle.com>
Date:   Fri Apr 28 10:07:09 2017 +0200

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit c484046aefd240ecf3c4ba52722ba31ef02c20c0
Merge: a418ab3 02a30e9
Author: Martin Sköld <Martin.Skold@oracle.com>
Date:   Fri Apr 28 10:05:20 2017 +0200

    Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5

commit 02a30e9a5f5ca3f186a4a059b35636aff2de99ba
Merge: 6630ac1 ccdb0aa
Author: Martin Sköld <Martin.Skold@oracle.com>
Date:   Fri Apr 28 10:04:51 2017 +0200

    Merge branch 'mysql-5.6-cluster-7.3' into mysql-5.6-cluster-7.4

commit ccdb0aac1ad4597a63c2b1b416c58b1f19cc0a4d
Author: Martin Sköld <Martin.Skold@oracle.com>
Date:   Fri Apr 28 10:03:12 2017 +0200

    Bug #21074209 SLAVE STOPS, ERROR_CODE: 1296; HANDLER ERROR HA_ERR_ROWS_EVENT_APPLY
    
    Removed direct dependency of config option.

commit b29073f43b5b12b3de4580d9df01f4f724d40885
Merge: 6f8e398 a418ab3
Author: Martin Sköld <Martin.Skold@oracle.com>
Date:   Fri Apr 28 09:27:48 2017 +0200

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit a418ab373ce9709aace5c5b1c4962193099d190c
Merge: d031d08 6630ac1
Author: Martin Sköld <Martin.Skold@oracle.com>
Date:   Fri Apr 28 09:26:51 2017 +0200

    Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5

commit 6630ac12a51c8a5131a63154b3946537893a494c
Merge: b0a9d73 f70822c
Author: Martin Sköld <Martin.Skold@oracle.com>
Date:   Fri Apr 28 09:07:36 2017 +0200

    Merge branch 'mysql-5.6-cluster-7.3' into mysql-5.6-cluster-7.4

commit f70822c78b198a70fd4a83530c66fc0b54bd304e
Author: Martin Sköld <Martin.Skold@oracle.com>
Date:   Fri Apr 28 09:05:00 2017 +0200

    Bug #21074209 SLAVE STOPS, ERROR_CODE: 1296; HANDLER ERROR HA_ERR_ROWS_EVENT_APPLY
    
    Added #ifdef HAVE_NDB_BINLOG ... #endif

commit 6f8e39848889dc4859d25b2607d41820d7624af7
Merge: bab81cf d031d08
Author: Martin Sköld <Martin.Skold@oracle.com>
Date:   Thu Apr 27 20:57:09 2017 +0200

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit d031d08adcd53d93219a16d166b9668eb21701af
Merge: bb660ce b0a9d73
Author: Martin Sköld <Martin.Skold@oracle.com>
Date:   Thu Apr 27 20:54:32 2017 +0200

    Bug #21074209 SLAVE STOPS, ERROR_CODE: 1296; HANDLER ERROR HA_ERR_ROWS_EVENT_APPLY
    
    Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5
    Adding check to stop Ndb slave if multi-threaded slave configuration or if multi-master setup is detected.
    Added new test case for checking unsupported slave configurations.
    Added new test case for checking if multi-master replication is setup.
    Created generic 3 cluster config to be used by ndb_rpl_slave_multi_source_config.test and ndb_rpl_break_3_chain.test

commit b0a9d73f7ee8205ce16b47c4fa854d6e6f2ac14c
Merge: 8bfcdb1 0ff63fa
Author: Martin Sköld <Martin.Skold@oracle.com>
Date:   Thu Apr 27 17:30:42 2017 +0200

    Merge branch 'mysql-5.6-cluster-7.3' into mysql-5.6-cluster-7.4

commit 0ff63fa165fd6255a391f7cf89329f68131e688e
Author: Martin Sköld <Martin.Skold@oracle.com>
Date:   Thu Apr 27 16:56:10 2017 +0200

    Bug #21074209 SLAVE STOPS, ERROR_CODE: 1296; HANDLER ERROR HA_ERR_ROWS_EVENT_APPLY
    
    Adding check to stop Ndb slave if multi-threaded slave configuration.
    Added new test case for checking unsupported slave configurations.

commit bab81cf62cf32d14463b9ff40f817e1b0f797deb
Merge: 63c2fe0 bb660ce
Author: Magnus Blåudd <magnus.blaudd@oracle.com>
Date:   Thu Apr 27 12:14:57 2017 +0200

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit bb660ce8cf800b94df63d645f246eec0f1e5775b
Author: Frazer Clement <frazer.clement@oracle.com>
Date:   Fri Sep 23 11:31:43 2016 +0100

    Bug#24444878 MYSQLD CRASH DURING UNIQUE KEY CREATION
    
    - Regression introduced by fix for Bug#23089566
      HA_NDBCLUSTER::OPEN_INDEXES MEMORY LEAK. The mysqld crash in a
      debug compile assert.
    
    - Testcase created to show the problem, the debug time assert in
      release_indexes() removed to avoid since m_table poiunter is not
      really used by the function. It was just a way to detect if table
      is open or not.

commit 63c2fe066ae6e473247c853347b05d10b8fb6bf4
Merge: 390c17d e5d7c5e
Author: Lakshmi Narayanan Sreethar <lakshmi.narayanan.sreethar@oracle.com>
Date:   Thu Apr 27 15:39:43 2017 +0530

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit e5d7c5e1a3dc070d50de322cda060aba947399ef
Merge: b4d5be6 8bfcdb1
Author: Lakshmi Narayanan Sreethar <lakshmi.narayanan.sreethar@oracle.com>
Date:   Thu Apr 27 15:39:09 2017 +0530

    Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5

commit 8bfcdb10754276e5b9ad247812e0d766d06a0219
Author: Lakshmi Narayanan Sreethar <lakshmi.narayanan.sreethar@oracle.com>
Date:   Thu Apr 27 15:36:27 2017 +0530

    Bug#25882950 : CACHED INDEX IN NDBAPI'S DICT CACHE NOT CLEARED AFTER `CREATE TABLE` FAILURE
    
    When a table with foreign keys are created, first the index is created
    and then during foreign key creation, those indexes are loaded into the
    ndbapi's dict cache. But when the `create table` ultimately fails due
    to some FK issue, those indexes in the cache are not invalidated. Due
    to this, any upcoming `create table` with some similarly named indexes
    as the previous failed DDL gets all mixed up and gives out inconsistent
    results. This patch invalidates the indexes in cache on failure.

commit 3f1128eb4151b4c6a5b2a5f81fd54646cbeb2266
Author: Lakshmi Narayanan Sreethar <lakshmi.narayanan.sreethar@oracle.com>
Date:   Thu Apr 27 15:35:36 2017 +0530

    Bug#25859977 : WRONG ERROR MESSAGE SHOWN AFTER ALTER ADD FK FAILURE
    
    When a new FK constraint, being added to a table, has the same name as
    of another already existing constraint, the DDL fails. During this
    failure the cluster handler returns the error code incorrectly. This
    patch fixes that.

commit 390c17d8e031ee166def676237e73091114b43b6
Merge: 7cb5d16 b4d5be6
Author: Lars Tangvald <lars.tangvald@oracle.com>
Date:   Thu Apr 27 10:47:44 2017 +0200

    Upmerge of the 7.2.29 build

commit b4d5be677d4bc60f10ef3c421ceeb468031baf73
Merge: df88bf2 56e3bef
Author: Lars Tangvald <lars.tangvald@oracle.com>
Date:   Thu Apr 27 10:47:26 2017 +0200

    Upmerge of the 7.2.29 build

commit 56e3bef06f3144b6fb07f70b00819d01b4deec6d
Merge: 6cc3a5c 47042a3
Author: Lars Tangvald <lars.tangvald@oracle.com>
Date:   Thu Apr 27 10:44:36 2017 +0200

    Upmerge of the 7.2.29 build

commit 47042a3a8e9695eb36db7496eb48c00e1641b89c
Merge: 36ebda3 472c8fb
Author: Lars Tangvald <lars.tangvald@oracle.com>
Date:   Thu Apr 27 10:43:37 2017 +0200

    Null merge of the 7.2.29 build

commit 8d6e3f1ee656cd52d2cd9b0a92d97d480f97b723
Author: Harin Vadodaria <harin.vadodaria@oracle.com>
Date:   Thu Apr 27 07:41:27 2017 +0200

    Bug#25942414: SSL VARIABLES USAGE WHEN LIBMYSQL IS COMPILED WITH WITH_SSL=NO
    
    Description: If libmysql is compiled with WITH_SSL=NO,
                 --ssl-* are not useful.
    
    Solution: 1. Restricted WITH_SSL to values : bundled | yes | system
              2. Made "bundled" as default value for WITH_SSL. Also,
                 not specifying WITH_SSL or even specifying WITH_SSL=no
                 will be treated as/converted to WITH_SSL=bundled.
    
    Reviewed-By: Tor Didriksen <tor.didriksen@oracle.com>
    Reviewed-By: Georgi Kodinov <georgi.kodinov@oracle.com>
    (cherry picked from commit 3eb2058be34d1a21771fe89ff1a0c08f156899bc)

commit 472c8fb3a6c8d98cc6ef5fb2d30ece120d813299
Author: Lars Tangvald <lars.tangvald@oracle.com>
Date:   Thu Apr 27 10:36:13 2017 +0200

    Raise version number after cloning 7.2.29

commit d2e4fbc9f4d56a45152da150a5886330a9b078bd
Author: Harin Vadodaria <harin.vadodaria@oracle.com>
Date:   Thu Apr 27 07:41:27 2017 +0200

    Bug#25942414: SSL VARIABLES USAGE WHEN LIBMYSQL IS COMPILED WITH WITH_SSL=NO
    
    Description: If libmysql is compiled with WITH_SSL=NO,
                 --ssl-* are not useful.
    
    Solution: 1. Restricted WITH_SSL to values : bundled | yes | system
              2. Made "bundled" as default value for WITH_SSL. Also,
                 not specifying WITH_SSL or even specifying WITH_SSL=no
                 will be treated as/converted to WITH_SSL=bundled.
    
    Reviewed-By: Tor Didriksen <tor.didriksen@oracle.com>
    Reviewed-By: Georgi Kodinov <georgi.kodinov@oracle.com>
    (cherry picked from commit 3eb2058be34d1a21771fe89ff1a0c08f156899bc)

commit 3c83d86511baa580b4b73fb2d75f9886e8854123
Author: Lars Tangvald <lars.tangvald@oracle.com>
Date:   Fri Mar 3 13:06:29 2017 +0100

    Raise version number after cloning 7.2.28
    
    (cherry picked from commit 8881754b6b6a804eefc130ddccfc0ff444bb292e)

commit 7cb5d16827dcb769e2050b8875ef90a244fb8f3d
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Wed Apr 26 21:30:47 2017 +0300

    wl#7614 disconnect1.diff
    
    disconnect from NDB on error also

commit d310df8497a2dc4cbb155adb633977578d09018a
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Wed Apr 26 21:29:22 2017 +0300

    wl#7614 keep-state.diff
    
    option --keep-state

commit bb0748390fa03e5ba174c3d79890df0e55c8261d
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Wed Apr 26 21:22:14 2017 +0300

    wl#7614 imp-misc1.diff
    
    clarify ndb_import.pl options

commit 8c8064503664eebe05e33aaa3b7cef406e83f9b3
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Wed Apr 26 21:20:36 2017 +0300

    wl#7614 un-inited2.diff
    
    un-inited members

commit 0838fcef8d64a13a82b21ebd78fde27b123c5840
Merge: 321721c df88bf2
Author: Priyanka Sangam <priyanka.sangam@oracle.com>
Date:   Wed Apr 26 17:45:14 2017 +0530

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit df88bf2b1aeee0e832f2a59e89808023fe9b97f0
Merge: 2d1051d 6cc3a5c
Author: Priyanka Sangam <priyanka.sangam@oracle.com>
Date:   Wed Apr 26 17:44:53 2017 +0530

    Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5

commit 6cc3a5c797c6da2c2709b77d71f024d67956614c
Author: Priyanka Sangam <priyanka.sangam@oracle.com>
Date:   Wed Apr 26 17:43:15 2017 +0530

    Bug #25333414 CLUSTER FAILS TO RESTART AFTER ERROR 4239 'TRIGGER WITH GIVEN NAME ALREADY EXIST
    
    Fix ndbd startup failure.

commit 321721c48cc8d1e8883bdf4c437480f78e51789a
Merge: ed9ab66 2d1051d
Author: Priyanka Sangam <priyanka.sangam@oracle.com>
Date:   Tue Apr 25 15:53:30 2017 +0530

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit 2d1051d5a65a164108ea9bbdd4f7c7bd3eeec202
Merge: 4f743da dbca0ba
Author: Priyanka Sangam <priyanka.sangam@oracle.com>
Date:   Tue Apr 25 15:52:21 2017 +0530

    Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5

commit dbca0ba154611d86ef3571c7b8deaf40d2bd3fdb
Author: Priyanka Sangam <priyanka.sangam@oracle.com>
Date:   Tue Apr 25 15:51:17 2017 +0530

    Bug #25333414 CLUSTER FAILS TO RESTART AFTER ERROR 4239 'TRIGGER WITH GIVEN NAME ALREADY EXIST
    
    The data node fails to restart because the NoOfFragmentLogParts
    config parameter is set to 16 even though only one LDM is running.
    All 16 log parts are assigned to the same LDM for redo log replay.
    This results in page exhaustion during redo log replay and causes
    a crash.
    
    Added a fix to to detect a config with more than 4 redo log parts
    per LDM, and reject it as an invalid config.

commit ed9ab6608f34862d385879b1bb35768a7723f288
Author: Ole John Aske <ole.john.aske@oracle.com>
Date:   Sun Apr 23 14:51:11 2017 +0200

    Bug#25703113 A TOO HIGH 'BATCHBYTESIZE' ARGUMENT SENT IN THE SCANREQ
    
    The max 'BatchByteSize' sent in SCANREQ signals were not always
    set correctly to reflect a limited 'byte' size available in the
    client side result buffers.
    
    This patch refactor parts of the result buffer size calculation,
    such that also the 'BatchByteSize' is modified to correctly
    reflect the max batch 'byte' size the data nodes may return

commit 76e921d16fc677d70bc87343caea2f90f4c10e2e
Merge: 64fa3b8 4f743da
Author: Dinesh Surya Prakash <dinesh.prakash@oracle.com>
Date:   Fri Apr 21 10:26:00 2017 +0530

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit 4f743dad2e13647aabcd542a869fbcc47fd2265c
Merge: 2c7b148 c254bff
Author: Dinesh Surya Prakash <dinesh.prakash@oracle.com>
Date:   Fri Apr 21 10:22:58 2017 +0530

    Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5

commit c254bff3c1e2e6add092513b4439c2823e1d5b5c
Author: Dinesh Surya Prakash <dinesh.prakash@oracle.com>
Date:   Thu Apr 20 14:03:08 2017 +0530

    Bug #25844166 NDB_CONFIG TO PRINT CONFIG DIFFERENT FROM DEFAULT
    
    post push fix
    
    Have used my_safe_itoa() in old push. But this function is dangerous to
    use in our code. Hence have replaced it with snprintf().

commit 64fa3b87b2c0df6077027c6603373ca317012213
Merge: b3cb4ea 2c7b148
Author: Dinesh Surya Prakash <dinesh.prakash@oracle.com>
Date:   Thu Apr 20 16:57:42 2017 +0530

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit 2c7b148c1d70641f5f1dfe9ff09ac5f720f448c8
Merge: 4dbf61a 5f90c53
Author: Dinesh Surya Prakash <dinesh.prakash@oracle.com>
Date:   Thu Apr 20 16:56:30 2017 +0530

    Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5

commit 5f90c5313a98a5490b13b2d2da6670c0022e94de
Author: Dinesh Surya Prakash <dinesh.prakash@oracle.com>
Date:   Thu Apr 20 14:03:08 2017 +0530

    Bug #25844166 NDB_CONFIG TO PRINT CONFIG DIFFERENT FROM DEFAULT
    
    There are more than 256 configurations in cluster. So, when we like to find
    the configuration that are changed during run time it is difficult to find
    them, hence have added an option(--diff_default) to ndb_config to print
    only the configurations that are different from the default configuration
    of the node.

commit b3cb4ea79732a1caab14d046d7642463da068a1d
Merge: 53726f1 4dbf61a
Author: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
Date:   Wed Apr 19 11:15:12 2017 +0530

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit 4dbf61a540105c1dbeb8e995aa403d06579143e3
Merge: c4a2ca5 b8f1a1c
Author: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
Date:   Wed Apr 19 11:14:15 2017 +0530

    Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5

commit b8f1a1cb497c481b2c7c9db7773bfc755a3a384c
Merge: fa5142f 36ebda3
Author: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
Date:   Wed Apr 19 11:04:41 2017 +0530

    Merge branch 'mysql-5.6-cluster-7.3' into mysql-5.6-cluster-7.4

commit 36ebda379bcffc03c9d6c19403eeec3a37bb297e
Merge: 148aaa3 3e02a52
Author: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
Date:   Wed Apr 19 11:01:15 2017 +0530

    Merge branch 'mysql-5.5-cluster-7.2' into mysql-5.6-cluster-7.3

commit 3e02a529abdc4f43040b8e83fa075d8bb2280385
Author: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
Date:   Wed Apr 19 10:45:59 2017 +0530

    Rename ndbd_redo_log_reader man page to ndb_redo_log_reader

commit 53726f1f8d34889b43f65d25fd346f8f3adeff94
Author: Mikael Ronström <mikael.ronstrom@oracle.com>
Date:   Tue Apr 18 11:19:35 2017 +0200

    BUG#25508233: Fix error in calculation that gets out of hand with file sizes above 4GByte

commit ecae44ecc35ee746b856ef124be39c8afd22bb7d
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Mon Apr 17 21:37:49 2017 +0300

    wl#7614 sparc-bit.diff
    
    bit(x) fix for sparc

commit 4ffa72047fcd2663a25b22d28cc66999dc7fec85
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Sat Apr 15 13:37:19 2017 +0300

    wl#7614 auto-incr1.diff
    
    handle autoincrement temporary errors

commit 534f90b6a3165ded478f9d4a9514ce6d5f964c96
Merge: 1097d97 c4a2ca5
Author: Lakshmi Narayanan Sreethar <lakshmi.narayanan.sreethar@oracle.com>
Date:   Fri Apr 14 19:40:36 2017 +0530

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit c4a2ca5ab5a01c51209061ff349199ece9aa4c60
Merge: 97542af fa5142f
Author: Lakshmi Narayanan Sreethar <lakshmi.narayanan.sreethar@oracle.com>
Date:   Fri Apr 14 19:39:54 2017 +0530

    Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5

commit fa5142f3378919cb07567f95336112355ffe6f39
Merge: 83e2830 148aaa3
Author: Lakshmi Narayanan Sreethar <lakshmi.narayanan.sreethar@oracle.com>
Date:   Fri Apr 14 19:39:15 2017 +0530

    Merge branch 'mysql-5.6-cluster-7.3' into mysql-5.6-cluster-7.4

commit 148aaa32c086a0f886801088b4e4796b6adafed3
Author: Lakshmi Narayanan Sreethar <lakshmi.narayanan.sreethar@oracle.com>
Date:   Fri Apr 14 19:35:49 2017 +0530

    Bug #23141739 : ERROR 240 IS NOT DEFINED
    
    The error 240 is thrown when there is a mismatch between the fk
    trigger columns and the values supplied to them during the trigger
    execution. This mismatch is actually a side effect of the Bug#23068914
    due to which the distributed TC and LDM threads end up with different
    trigger ids for the same FK trigger after a restart. This base bug has
    already been fixed.
    
    This patch adds an error description for the error 240 and extends the
    MTR testcase of Bug#23068914 to cover this issue.

commit 1097d9753e6b7967097dc7ff39517bf646a46f34
Merge: de71dbc 97542af
Author: Sanjana DS <sanjana.ds@oracle.com>
Date:   Fri Apr 14 13:57:51 2017 +0530

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6
    
    Conflicts:
    	storage/ndb/src/kernel/blocks/ERROR_codes.txt

commit 97542af3862dfbd83c495d1c4bed1249ffeefe2f
Merge: 9242b2b 83e2830
Author: Sanjana DS <sanjana.ds@oracle.com>
Date:   Fri Apr 14 13:55:19 2017 +0530

    Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5

commit 83e2830fd28e3bf12d8aea0b807b947ed78734aa
Author: Sanjana DS <sanjana.ds@oracle.com>
Date:   Wed Apr 5 12:18:07 2017 +0530

    Bug #21576576: IMPROVE HEARTBEAT FAILURE REPORTING FOR SYSTEM RESTART
    
    Problem
    =======
    
    If one of the nodes fail due to missing sending heartbeats during
    system restart, all other nodes report that another node failed
    without any additional info.
    
    First, node 2 crashes because it thinks node 4 is dead due to missing
    heartbeats though it's not really dead.
    Then, after some time node 4 shuts itself down because of node 2 crash.
    
    Fix
    ===
    
    Added additional info to the failure.
    Now, the node that failed to send heartbeat along with heartbeat
    error is reported in the error log and data node log.
    
    Steps to test the fix:
    
    1) Start a 2 node cluster, where the data nodes have id 2 and 4.
    2) ndb_mgm -e "all restart -n"
    3) ndb_mgm -e "4 error 946"
    4) ndb_mgm -e "all start"
    Wait for a few minutes.
    
    The error log of node 2 will have the fixed error message.

commit de71dbcb7d289a3cd0e405d0c79a3771bdb7ff28
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Thu Apr 13 15:57:25 2017 +0300

    wl#7614 worker-state1.diff
    
    fix require() in worker stop

commit 554bb4157cb4340017044c9866a35c2676cce8c3
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Wed Apr 12 12:08:33 2017 +0300

    wl#7614 alignment1.diff
    
    avoid alignment crash on sparc

commit a35e1bf4f0e7d3da751c3a46368dcb62ef2abb9f
Merge: 2040098 9242b2b
Author: Priyanka Sangam <priyanka.sangam@oracle.com>
Date:   Wed Apr 12 11:22:54 2017 +0530

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit 9242b2b7716769df4c3cc665bc51ff23b366e302
Merge: 0d1900c 3601e3f
Author: Priyanka Sangam <priyanka.sangam@oracle.com>
Date:   Wed Apr 12 11:22:14 2017 +0530

    Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5

commit 3601e3f92de763a23ee976f8852d2270b66545f4
Author: Priyanka Sangam <priyanka.sangam@oracle.com>
Date:   Wed Apr 12 11:19:24 2017 +0530

    Bug #24438868 MINIMAL BINLOG FORMAT FOR UPDATE_ROW TO REDUCE UPDATE BINLOG SPACE USAGE
    
    An UPDATE_ROW binlog event contains 2 versions of the updated
    row: a Before Image which has the row before the update,
    and an After Image of the row after the update. The Before
    and After Image do not always include all the columns in the
    row. The binlog format decides which columns will be included.
    
    There is a requirement in ndbcluster to reduce the size of the
    binlog event while retaining the UPDATE_ROW format of
    BeforeImage/AfterImage. This can be done by writing only
    primary key columns from the Before Image and only modified
    columns from the After Image. However, the existing binlog
    formats do not support different sets of columns in the Before
    and After Images.
    
    The --binlog-format=MINIMAL option is not usable for ndbcluster
    because enabling the binlog format code breaks the
    --ndb-log-updated-only option in ndb replication.
    
    This patch implements 2 new ndb binlog formats for UPDATE_ROW
    where the Before Image and After Image are minimised to remove
    duplicate information.
    
    UPDATED_ONLY_USE_UPDATE_MINIMAL: log update as UPDATE_ROW, log
    only primary key columns in Before Image and only updated columns
    in After Image
    
    FULL_USE_UPDATE_MINIMAL: log update as UPDATE_ROW, log only
    primary key columns in Before Image and all non primary key
    columns in After Image
    
    This means that each column is contained only once in each event,
    bringing efficiency close to that achieved by the variants logging
    with WRITE_ROW events.
    
    The UPDATED_ONLY_USE_UPDATE_MINIMAL and FULL_USE_UPDATE_MINIMAL
    formats can be used with the conflict resolution algorithms
    NDB$EPOCH(), NDB$EPOCH2() and NDB$EPOCH_TRANS(), because these
    do not require the 'Before' values of non-primary-key-columns.
    Conflict resolution algorithms like NDB$MAX() and NDB$OLD()
    require the old values of non-PK columns, and will not work
    correctly with these new variants.

commit 20400983275d988918a8e089bb58ee4c62067dfb
Merge: cec3287 0d1900c
Author: Frazer Clement <frazer.clement@oracle.com>
Date:   Tue Apr 11 15:45:13 2017 +0100

    Merge ../mysql-5.7-cluster-7.5 into mysql-5.7-cluster-7.6

commit 0d1900ce2ee7a9839b21a0b8ef327b8c329db646
Merge: e88073f 234737f
Author: Frazer Clement <frazer.clement@oracle.com>
Date:   Tue Apr 11 15:44:35 2017 +0100

    Merge ../mysql-5.6-cluster-7.4 into mysql-5.7-cluster-7.5

commit 234737f99ddfe1b6e97ba9cb6073102a20f13d20
Author: Frazer Clement <frazer.clement@oracle.com>
Date:   Tue Apr 11 15:44:11 2017 +0100

    Testcase robustness fix
    
    ndb_stop_on_error
    
    Wait for MySQLD to reconnect properly after restart before proceeding.

commit cec32871ab7158046670ef676413ef42c41f4595
Author: Mauritz Sundell <mauritz.sundell@oracle.com>
Date:   Sat Apr 8 00:49:07 2017 +0200

    Bug#25851801 7.6.2(DMR2):: COMPLETE CLUSTER CRASHED DURING UNIQUE KEY CREATION ...
    
    DynArr256::truncate() now succeeds if there are no pages allocated in array.
    
    The test case with the above fix now brought up another bug there two calls to
    Dbacc::releasePage() is missing when pages was not possible to add to fragments
    page directory due to out of memory when allocating directory page.
    
    This made some checks failed and the dbacc page was leaked.
    
    The missing calls to releasePage() were added.

commit dbb1dce7488353e2a8c9aaef915eb4da416994a3
Author: Mauritz Sundell <mauritz.sundell@oracle.com>
Date:   Sat Apr 8 00:48:02 2017 +0200

    Bug#25851801 7.6.2(DMR2):: COMPLETE CLUSTER CRASHED DURING UNIQUE KEY CREATION ...
    
    Demonstration of bug.
    
    Use error injection to simulate failure of DynArr256Pool::seize() that in
    turn make Dbacc::setPagePtr fail.
    
    The later function registers the page number to an fragment.
    
    Later when fragment pages are to be released DynArr256::truncate() are
    called which assumes at least one directory page have been seized if
    set() been called.
    
    This is not the case.

commit 902e415433250aa2dd58d3f30b01988b519a69e7
Author: Magnus Blåudd <magnus.blaudd@oracle.com>
Date:   Tue Apr 11 12:03:55 2017 +0200

    WL#8500 Adapt MySQL Cluster to 8.0
    
     - add test case for checking order of "group by", proving that
       it's stable in 5.7 based cluster versions

commit 91af06f0715e3e37f99f30f5091f94c26542c291
Merge: a6439db e88073f
Author: Lakshmi Narayanan Sreethar <lakshmi.narayanan.sreethar@oracle.com>
Date:   Tue Apr 11 15:26:59 2017 +0530

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit e88073fded752bbbfd6ab07b4a9c41009ebb88fe
Author: Lakshmi Narayanan Sreethar <lakshmi.narayanan.sreethar@oracle.com>
Date:   Tue Apr 11 15:26:34 2017 +0530

    Bug #21960004 (7.5+)
    
    SETTING MAX_ROWS=0 IS NOT THE SAME AS NEVER SETTING MAX_ROWS
    
    An inplace ALTER TABLE .. MAX_ROWS query intentionally updates only the
    mysqld metadata and not the NDB dictionary. And the REORGANIZE
    PARTITION query first checks the NDB dictionaries max_rows value to
    decide whether to reorganize or not. Due to this outdated value in the
    NDB dictionary, REORGANIZE is denied even if the max_rows is set back
    to 0.
    
    Also, if the table doesn't have any user defined partition balance, the
    default one is used. And when such a table's max_row is changed through
    a copy ALTER, its partition balance changes to SPECIFIC. When the
    MAX_ROWS is changed back to 0 using a inplace ALTER, in addition to the
    MAX_ROWS not being reset in NDB dictionary, the Partition Balance is
    not reset to default. Any subsequent ALTER TABLE .. REORGANIZE query
    fails as the Partition Balance of the table is still SPECIFIC. But if
    the MAX_ROWS is set to 0 using a copy ALTER, the Partition Balance is
    reset back to the default and any subsequent online REORGANIZE runs
    without any issues.
    
    This patch fixes the above issues by adding checks to deny any attempt
    to reset MAX_ROWS to 0 online. Resetting MAX_ROWS to 0 can only be done
    through a copy ALTER now. Also, the max_row values provided by MySQL is
    now used instead of the NDB dictionary value to make any decisions.

commit a6439db2742cced2f1f156b3d6227fecba4290bd
Merge: 0c8b22a 260b802e
Author: Lakshmi Narayanan Sreethar <lakshmi.narayanan.sreethar@oracle.com>
Date:   Tue Apr 11 15:25:42 2017 +0530

    Null merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit 260b802e7531128ed0689db6dd76846d2e4ae0b4
Merge: 4e32c7c 092639f
Author: Lakshmi Narayanan Sreethar <lakshmi.narayanan.sreethar@oracle.com>
Date:   Tue Apr 11 15:25:02 2017 +0530

    Null merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5

commit 092639f99146e33a02cb1834c85103cbfec1a3f8
Merge: ae42e0f 91d4fbd
Author: Lakshmi Narayanan Sreethar <lakshmi.narayanan.sreethar@oracle.com>
Date:   Tue Apr 11 15:23:55 2017 +0530

    Merge branch 'mysql-5.6-cluster-7.3' into mysql-5.6-cluster-7.4

commit 91d4fbd4781f503926ef6af446e0d2d65e108afd
Author: Lakshmi Narayanan Sreethar <lakshmi.narayanan.sreethar@oracle.com>
Date:   Tue Apr 11 15:23:37 2017 +0530

    Bug #21960004
    
    SETTING MAX_ROWS=0 IS NOT THE SAME AS NEVER SETTING MAX_ROWS
    
    An inplace ALTER TABLE .. MAX_ROWS query intentionally updates only the
    mysqld metadata and not the NDB dictionary. And the REORGANIZE
    PARTITION query first checks the NDB dictionaries max_rows value to
    decide whether to reorganize or not. Due to this outdated value in the
    NDB dictionary, REORGANIZE is denied even if the max_rows is set back
    to 0.
    
    This patch fixes this issue by using the max_row value provided by MySQL
    instead of the NDB dictionary value to make any decisions.
    
    Note : This fix is only for versions 7.3 and 7.4.
           Versions 7.5 and above have a slightly different patch.

commit 0c8b22a919e7ce7d9817cf5af4cab2b197922eee
Merge: 1798b5f 4e32c7c
Author: Lakshmi Narayanan Sreethar <lakshmi.narayanan.sreethar@oracle.com>
Date:   Tue Apr 11 15:22:28 2017 +0530

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit 4e32c7c9d735bdcea844be282178b48518b11bdc
Merge: bee8af0 ae42e0f
Author: Lakshmi Narayanan Sreethar <lakshmi.narayanan.sreethar@oracle.com>
Date:   Tue Apr 11 15:20:47 2017 +0530

    Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5

commit ae42e0f84ed20d2cf571745cecca1d0d80495f26
Merge: f619bbc a1e12de
Author: Lakshmi Narayanan Sreethar <lakshmi.narayanan.sreethar@oracle.com>
Date:   Tue Apr 11 15:19:02 2017 +0530

    Merge branch 'mysql-5.6-cluster-7.3' into mysql-5.6-cluster-7.4

commit a1e12de7f9e1c690b8ec0f9de62f91a1aa984c30
Author: Lakshmi Narayanan Sreethar <lakshmi.narayanan.sreethar@oracle.com>
Date:   Tue Apr 11 15:15:36 2017 +0530

    Bug#21960004
    
    Fixes the prepare_inplace_alter_table error handling.
    
    prepare_inplace_alter_table() doesn't handle the error return of
    prepareHashMap properly. And also the prepareHashMap function doesn't
    return the expected value when it fails at few places. This patch
    fixes them both.

commit 1798b5fa99c293e4344adee2abeb480adbbb7997
Merge: 6d24bf2 bee8af0
Author: Lars Tangvald <lars.tangvald@oracle.com>
Date:   Tue Apr 11 08:53:32 2017 +0200

    Upmerge (null) of the 7.5.6 build

commit bee8af06f015ea2321c560e681475504a0feb695
Merge: 7bdfa9b 4f6287b
Author: Lars Tangvald <lars.tangvald@oracle.com>
Date:   Tue Apr 11 08:52:08 2017 +0200

    Merge from mysql-cluster-7.5.6-release

commit 6d24bf2b25c448c8d2c2217b9e4d69698a89a3e5
Merge: d0a045d 4dc12d0
Author: Lars Tangvald <lars.tangvald@oracle.com>
Date:   Tue Apr 11 08:45:18 2017 +0200

    Upmerge of the 7.5.6 build

commit d0a045def441cf481a7fcea95ddceebd5e78b55a
Merge: 8606b5e 7bdfa9b
Author: Arnab Ray <arnab.r.ray@oracle.com>
Date:   Tue Apr 11 11:36:53 2017 +0530

    Upmerge of the 7.2.28 build

commit 7bdfa9bdd0ed38fb2300f4c07645df675aa239bf
Merge: 8d5f19d f619bbc
Author: Arnab Ray <arnab.r.ray@oracle.com>
Date:   Tue Apr 11 11:35:23 2017 +0530

    Upmerge of the 7.2.28 build

commit f619bbcc183a8cb0d331f13a171bc2a279755875
Merge: bb64665 7b62f59
Author: Arnab Ray <arnab.r.ray@oracle.com>
Date:   Tue Apr 11 11:34:01 2017 +0530

    Upmerge of the 7.2.28 build

commit 7b62f5911155bcabd833b101f8cfc4656c059a12
Merge: 79556c3 6739a76
Author: Arnab Ray <arnab.r.ray@oracle.com>
Date:   Tue Apr 11 11:28:18 2017 +0530

    Upmerge of the 7.2.28 build

commit 6739a7645fd458beb8dacff4150e05ee274bece0
Merge: 8881754 91dfe8b
Author: Arnab Ray <arnab.r.ray@oracle.com>
Date:   Tue Apr 11 11:23:54 2017 +0530

    Merge from mysql-cluster-7.2.28-release

commit 4dc12d012d54ca24400a7f3a918edf32853918f7
Merge: 8d5f19d 4f6287b
Author: Lars Tangvald <lars.tangvald@oracle.com>
Date:   Tue Apr 11 06:40:06 2017 +0200

    Merge from mysql-cluster-7.5.6-release

commit 8606b5e40dac92fc7da43d7f04e3e49b48000861
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Mon Apr 10 16:50:51 2017 +0300

    wl#7614 un-inited1.diff
    
    un-initialized member + misc

commit 5c1050211f2d9fb2b6ebdd870304c46512d9e147
Merge: 44c6f4c 8d5f19d
Author: Nawaz Nazeer Ahamed <nawaz.nazeer.ahamed@oracle.com>
Date:   Mon Apr 10 16:18:52 2017 +0530

    Upmerge of the 7.3.17 build

commit 8d5f19df1cd1a6391b75ff4effe265e71a2b6098
Merge: 4ef3f37 bb64665
Author: Nawaz Nazeer Ahamed <nawaz.nazeer.ahamed@oracle.com>
Date:   Mon Apr 10 16:17:09 2017 +0530

    Upmerge of the 7.3.17 build

commit bb6466555f47268be5c2935ebaaa68d2d1eb2b17
Merge: 38d16c4 79556c3
Author: Nawaz Nazeer Ahamed <nawaz.nazeer.ahamed@oracle.com>
Date:   Mon Apr 10 16:15:02 2017 +0530

    Upmerge of the 7.3.17 build

commit 44c6f4c5bb6a0b9d02ce61bcd5dc71bed6df9f80
Merge: ac4b9b7 4ef3f37
Author: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
Date:   Mon Apr 10 16:01:19 2017 +0530

    Upmerge of the 7.4.15 build

commit 4ef3f37390cd0d0489a06bd3e7a5d8c405b7b263
Merge: fab62c1 38d16c4
Author: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
Date:   Mon Apr 10 16:00:40 2017 +0530

    Upmerge of the 7.4.15 build

commit 38d16c488a602922ec6cc7ecad3463b78cc6a432
Merge: f6f359f e2fefae
Author: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
Date:   Mon Apr 10 15:58:18 2017 +0530

    Merge from mysql-cluster-7.4.15-release

commit 79556c3e54b538d82abc17a4faa7cec28e397618
Merge: 4d97baf 23ac7b2
Author: Nawaz Nazeer Ahamed <nawaz.nazeer.ahamed@oracle.com>
Date:   Mon Apr 10 14:32:54 2017 +0530

    Merge from mysql-cluster-7.3.17-release

commit ac4b9b7341c7eef1cae2b7781f2e02f1210664bf
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Sat Apr 8 22:52:06 2017 +0300

    wl#7614 csv-delim1.diff
    
    usage error for unknown CSV escape

commit a2350e14f9e61431bdac0eef62d73ffc47da1fdd
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Sat Apr 8 22:50:24 2017 +0300

    wl#7614 opts-check1.diff
    
    check --input-type and --output-type

commit cbbeb630475297c75df32ba194ccdccebbfb2994
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Sat Apr 8 22:45:31 2017 +0300

    wl#7614 char-subscript1.diff
    
    macos(clang): char as array subscript

commit fd72b8880b6eda36efd27b1638de5b327429b97e
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Sat Apr 8 22:43:29 2017 +0300

    wl#7614 struct-fwd1.diff
    
    macos(clang): mult fwd struct decl

commit 611c56f7f99fd980a59ebe78a2172f5db6733690
Author: Ole John Aske <ole.john.aske@oracle.com>
Date:   Fri Apr 7 12:41:54 2017 +0200

    Bug#25750355 SEND SPJ RESULTS AS 'PACKED' TRANSID_AI WHERE APPLICABLE
    
    Follow up patch fixing an assert being hit

commit 8d014ab180cb19158c43cd0ec760ab90d48e84c2
Author: Magnus Blåudd <magnus.blaudd@oracle.com>
Date:   Fri Apr 7 11:13:37 2017 +0200

    WL#8500 Adapt MySQL Cluster to 8.0
    
     - add testcase to --suite=ndbcluster for testing tablespace
       functionality regarding tablespaces names and datafiles
       with NDB

commit 33ac4007aa4adec49dbcc854ad3055873f360746
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Thu Apr 6 23:08:12 2017 +0300

    wl#7614 mgm-conn1.diff
    
    missing use of opt_ndb_connectstring

commit 34ad6a456dade4ecf04a70829cc16b9bddd5e3be
Merge: 7a15578 fab62c1
Author: John David Duncan <john.duncan@oracle.com>
Date:   Thu Apr 6 11:14:10 2017 -0700

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit fab62c1e52469953fd5823d7a634a9b693000c66
Author: John David Duncan <john.duncan@oracle.com>
Date:   Thu Apr 6 11:13:37 2017 -0700

    Add missing GPL to three files under jones-ndb

commit 7a15578dcb8e160279057f2504b7ab3776fd92c8
Merge: cf787fc c1db224
Author: Frazer Clement <frazer.clement@oracle.com>
Date:   Thu Apr 6 17:20:50 2017 +0100

    Merge ../mysql-5.7-cluster-7.5 into mysql-5.7-cluster-7.6

commit c1db2246e64cbfc10ba509bc94d60acfa1326ef3
Merge: b4afa60 f6f359f
Author: Frazer Clement <frazer.clement@oracle.com>
Date:   Thu Apr 6 17:15:38 2017 +0100

    Merge ../mysql-5.6-cluster-7.4 into mysql-5.7-cluster-7.5

commit cf787fc01e4d484367cb61c67636e17fcb2c9ec1
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Thu Apr 6 19:11:02 2017 +0300

    wl#7614 static-const1.diff
    
    conditional expression created lvalue
    https://gcc.gnu.org/wiki/VerboseDiagnostics#missing_static_const_definition

commit f6f359f053afd0d6cd75ca29fe470f80a42aa51e
Author: Frazer Clement <frazer.clement@oracle.com>
Date:   Thu Apr 6 17:06:39 2017 +0100

    Bug #25799506   NDB : LOCKING TO A CPUSET USES A LOT OF CPU
    
    SparseBitMask has a default max size of 2^32-2.
    The code in my_the_config.cpp loops over this full range probing
    for set bits.
    
    That wastes a lot of cpu.
    
    This patch modifies it to only look at the bits which are set
    in the SparseBitmask.

commit 4afc0bac196556e1f9eb94d1ba6260cd97129533
Merge: 62a03bf b4afa60
Author: Frazer Clement <frazer.clement@oracle.com>
Date:   Thu Apr 6 16:46:40 2017 +0100

    Merge ../mysql-5.7-cluster-7.5 into mysql-5.7-cluster-7.6

commit b4afa60c17d72195286e63cb05ea1bb1612ca90e
Merge: 9b4555d b5f5d12
Author: Frazer Clement <frazer.clement@oracle.com>
Date:   Thu Apr 6 16:46:06 2017 +0100

    Merge ../mysql-5.6-cluster-7.4 into mysql-5.7-cluster-7.5
    
    Null merge, except (c)

commit b5f5d1273cd457e498a25e4acc25ecd036b6fa5a
Author: Frazer Clement <frazer.clement@oracle.com>
Date:   Thu Apr 6 16:43:22 2017 +0100

    Bug #25830247   NDB : CPUSET LOCKING DOES NOT REUSE CPUSET STRUCTURES
    
    There is code spread across NdbLockCpuUtil.c and NdbThread.c for managing a set of cpuset arrays.  The idea is that a minimal set of unique cpusets will be maintained.  Cpusets can be reused by different threads, with reference counting used to avoid leaks.
    
    However :
     - The code to reuse a cpuset does not work as the cpuset content is not updated when a cpuset is created, so the search cannot work
     - The code to release a cpuset does not work as the cpuset id of a thread is not read before it is nulled, leaking the cpuset.
    
    Probably these bugs are not too problematic for static cpuset assignments, but they cause problems when the number of unique cpusets is high, or if cpuset locking is changed at runtime.

commit 62a03bf8cb0c1d48257fe2ccf4403ea91a67df24
Author: Pekka Nousiainen <pekka.nousiainen@oracle.com>
Date:   Thu Apr 6 16:56:25 2017 +0300

    wl#7614 packaging1.diff
    
    add ndb_import to deb and rpm
    
    NOTE: previously pushed to mysql-cluster-7.6.2-dmr-release
    as a separate commit.

commit 320a8dbfc5bc221eb0597e727e6f6d8468a070f8
Merge: d8543f7 9b4555d
Author: Frazer Clement <frazer.clement@oracle.com>
Date:   Thu Apr 6 12:39:04 2017 +0100

    Merge ../mysql-5.7-cluster-7.5 into mysql-5.7-cluster-7.6

commit 9b4555ddeccaceb0ee0b10f95f77c19df6335aaa
Author: Frazer Clement <frazer.clement@oracle.com>
Date:   Thu Apr 6 12:38:14 2017 +0100

    Testcase robustness fix
    
    ndb_stop_on_error
    
    Wait for MySQLD to reconnect properly after restart before proceeding.

commit d8543f77dc038db68e007ef2a8fc8500195e546e
Author: Magnus Blåudd <magnus.blaudd@oracle.com>
Date:   Thu Apr 6 11:24:14 2017 +0200

    Bug#25841424 REMOVE NDB_EXTRA REMNANTS
    
     - There are a few tests in the ndb test suite which are intended to run by
       passing the --ndb-extra-test paramater to mtr.pl. This means that tests are
       never run and have become outdated, binaries they reference, mysqltest
       commands used does no longer exist. Actually there are no --ndb-extra-test
       argument for mtr.pl anymore
     - Remove NDB_EXTRA_TEST, mysql-test/include/have_ndb_extra.inc and the tests
    referencing that include file.

commit 36767033c7418dc2bf1c64b2e847e10b1f41afdf
Author: Ole John Aske <ole.john.aske@oracle.com>
Date:   Thu Apr 6 09:37:13 2017 +0200

    Bug#25750355 SEND SPJ RESULTS AS 'PACKED' TRANSID_AI WHERE APPLICABLE
    
    Follow up patch fixing build break when not 'Debug' built.

commit b1bfb16d7ad2c8b8bc57f9e4930c3ee38607033c
Merge: 4694f3d 18c9867
Author: Ole John Aske <ole.john.aske@oracle.com>
Date:   Thu Apr 6 09:06:59 2017 +0200

    Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

commit 18c98671f44c050e262ebb4bdacbe3327c49f8a9
Merge: 860aafc 21e1b0d
Author: Ole John Aske <ole.john.aske@oracle.com>
Date:   Thu Apr 6 09:05:03 2017 +0200

    Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5

commit 21e1b0d0a997f02cf9b5e834a76bb2afb624b3f2
Author: Ole John Aske <ole.john.aske@oracle.com>
Date:   Wed Mar 29 17:42:58 2017 +0200

    Bug#25800933 BROKEN CONCURRENCY CONTROL WHEN UPDATING 'M_NODE_TOTAL_SEND_BUFFER_SIZE'
    
    The node internal scheduler (mt.cpp) collect statistics about its own
    progress and its outstanding work. One such statistics being collected is
    the amount of outstanding 'send-bytes' which is being collected in
    send_buffer::m_node_total_send_buffer_size. This may later be
    used by the send thread scheduler, which use amount of outstanding sends
    as a metric to self tune its send performance vs latency.
    
    In order to reduce lock contention on the internal send buffers, they
    have been split in two thr_send_buffer parts: the 'm_buffer' and
    'm_sending' buffers - each of them are protected by their own mutex.
    'm_node_total_send_buffer_size' was maintained to reflect the total size
    in these two send buffers.
    
    It turns out that we were not consistent regarding which mutex we
    used in updating 'm_node_total_send_buffer_size':
    
     - In link_thread_send_buffers() we locked send_buffer::m_buffer_lock
     - In bytes_sent() we locked send_buffer::m_send_lock
     - In reset_send_buffer() we locked both.
    
    Thus there is effectively no concurrency protection of
    'm_node_total_send_buffer_size'.
    
    This patch replace m_node_total_send_buffer_size with the two
    seperate 'm_buffered_size' and 'm_sending_size' which keeps
    track of respective size of the two buffers. These new counters
    are updated under protection of the two different mutexes
    protecting each of the send buffers.
    
    mt_get_send_buffer_bytes() will add these together to get the
    total size. This method is already documented as doing an
    unprotected 'get' of the buffer seize, which should be OK as
    we can do with a buffer size being slightly off. As the
    concurrency controll is now fixed , the updates will be
    correct, and the value will not 'drift' over time.

commit 4694f3dd2d4eb9bf33a35fe6f8c40d4d1c73cab2
Author: Ole John Aske <ole.john.aske@oracle.com>
Date:   Thu Apr 6 08:54:06 2017 +0200

    Bug#25750355 SEND SPJ RESULTS AS 'PACKED' TRANSID_AI WHERE APPLICABLE
    
    Patch enable the usage of 'short' or 'packed short' TRANSID_AI
    signals for sending SPJ results back to the client-API.
    This is a more efficient way to send short TRANSID_AI signals.
    
    It refactors out code for sending TRANSID_AI to the API from
    Dbtup::sendReadAttrinfo() into the new method Dbtup::sendAPI_TRANSID_AI().
    This method is then called from Dbtup::flush_read_buffer() which is where
    the SPJ results are delivered to the client_API.
    
    Also introduce some cleanup of usage of the magic litterals
    '3' and '22' where 'AttrInfo::HeaderLength' and 'TransIdAI::DataLength'
    should be used instead.
    
    Refactor how the buffering work is divided between
    Dbtup::bufferTRANSID_AI() and the new Dbtup::sendAPI_TRANSID_AI().
    (Related to how the sending of full packed-buffers are handled).

commit f6bd828c2dbe43e72c667daf4779818cfbe08967
Author: Sanjana DS <sanjana.ds@oracle.com>
Date:   Mon Apr 3 11:29:40 2017 +0530

    Bug #24748843 : SYNC PRINTS TO STDOUT CAUSING MAIN THREAD TO SLEEP DURING HIGH IO WAIT
    
    Re-enable asynchronous logging.
    Flush user-space buffered data using fflush() after every write in the async log thread.

commit fb9ffccd2723279f70a56120f55090e4223946f8
Author: Lars Tangvald <lars.tangvald@oracle.com>
Date:   Wed Apr 5 14:38:26 2017 +0200

    Fixed the last copyright year, I hope...

commit 7cce464823af92c5bd82f2ba50eebb030af1ade4
Author: Lars Tangvald <lars.tangvald@oracle.com>
Date:   Wed Apr 5 14:28:35 2017 +0200

    Updated copyright years

commit 5a2a9f169fd67371a84c9299c7e7b9637be8c094
Author: Lars Tangvald <lars.tangvald@oracle.com>
Date:   Wed Apr 5 14:19:25 2017 +0200

    Raise version number after cloning 7.6.2

commit e2fefae05446471a71b7d8ee5c7e34371cd8d87d
Author: Bjorn Munch <bjorn.munch@oracle.com>
Date:   Tue Mar 28 14:13:30 2017 +0200

    Add man page for ndb_print_frag_file for rpm
    
    (cherry picked from commit c3d917f47f8b265b5a639245a498aa650187dac7)

commit 91dfe8b806b9d7558d8cfa8000ded41982d070d5
Author: Bharathy Satish <bharathy.x.satish@oracle.com>
Date:   Fri Mar 17 08:41:31 2017 +0100

    Bug #25717383: MYSQLDUMP MAY EXECUTE ANY ARBITRARY QUERY
    
    While writing comments if database object names has a new
    line character, then next line is considered a command, rather
    than a comment.
    This patch fixes the way comments are constructed in mysqldump.
    
    (cherry picked from commit 1099f9d17b1c697c2760f86556f5bae7d202b444)

commit 835bfd824dde6174b8006a654193ce601584f136
Author: Ramil Kalimullin <ramil.kalimullin@oracle.com>
Date:   Mon Mar 13 17:01:59 2017 +0400

    Backport of "SETTING --SSL-MODE=REQUIRED SENDS CREDENTIALS BEFORE VERIFYING SSL" second part

commit 932315fd72e93026ffb35b196d8d93acdd7b9f07
Author: Daniel Horecki <daniel.horecki@oracle.com>
Date:   Tue Mar 28 10:16:59 2017 +0200

    Backport of "SETTING --SSL-MODE=REQUIRED SENDS CREDENTIALS BEFORE VERIFYING SSL"

commit 29784ed8785d12531c5e05adaa2508dccf74e9d5
Author: Lakshmi Narayanan Sreethar <lakshmi.narayanan.sreethar@oracle.com>
Date:   Wed Mar 8 14:38:15 2017 +0530

    Bug#22195588 - Post push fix
    
    This patch makes changes to the ndb_info.inc include file in the MTR
    test case to make it windows compatible.
    
    (cherry picked from commit bf311918b844afb2ca2b579d36891b990152bc6f)

commit 3f34b4ca77bf1f0b0d0d028942569ac247f41b9a
Author: Bharathy Satish <bharathy.x.satish@oracle.com>
Date:   Fri Mar 17 13:17:44 2017 +0100

    Bug #25717383: MYSQLDUMP MAY EXECUTE ANY ARBITARY QUERY.
    
    Post push fix.
    
    (cherry picked from commit de4b2f7f7c541b9e97df9a4c7b261065f1de7f6d)

commit 3c53542b7c75e47109d6d496e2c2542840a5f426
Author: Bharathy Satish <bharathy.x.satish@oracle.com>
Date:   Fri Mar 17 08:44:04 2017 +0100

    Merge branch 'mysql-5.5' into mysql-5.6
    
    (cherry picked from commit 7396facd28cc8fb6de7817c4e5978993b7267b6b)

commit 942cbe0497c6ebc849a72bb2e10247caec458c47
Author: Harin Vadodaria <harin.vadodaria@oracle.com>
Date:   Wed Mar 15 13:28:57 2017 +0100

    Bug#25714674: MYSQL SERVER REMOTE PREAUTH PROBLEM THROUGH INTEGER OVERFLOW
    
    Description: A missing length check for length-encoded string causes
                 problem in preauthorization stage.
    
    (cherry picked from commit bb1af908fce21b0d8708cdccde628e3d5b1d86ec)

commit 55388bd71831561668279bdae85ce3bd4b0cccec
Author: Piotr Obrzut <piotr.obrzut@oracle.com>
Date:   Mon Mar 13 18:09:51 2017 +0100

    Revert for the fix for the 'Bug#23593091: MYSQL SERVER MSI - REGISTRY ITEMS LEFT BEHIND WHEN > 1 SERVER VERSION INSTALLED'
    The Server Installer needs some changes to accomodate for this fix so it got postponed for the next release.
    
    (cherry picked from commit 17811bc0759ef241d46b2ef1e6f51bc1c4f5695d)

commit 61f091bacf87708f57d0821f2836d59f7fed619f
Author: Sreedhar Sreedhargadda <sreedhar.sreedhargadda@oracle.com>
Date:   Tue Mar 28 07:33:07 2017 +0200

    Applying patch supplied by Ramil for Bug#25575605 SETTING --SSL-MODE=REQUIRED SENDS CREDENTIALS BEFORE VERIFYING SSL

commit 4f6287bd11da6bcc787d56a323bac97ba85cbbde
Author: Ole John Aske <ole.john.aske@oracle.com>
Date:   Wed Mar 22 09:19:31 2017 +0100

    Bug#25654833 MYSQL CLUSTER 7.5.5 REPLICATION SLAVE SQL THREAD HANGS WITH CREATE TABLE
    
    This is 'best effort' patch for the above problem, which seems to be a regression introduced in 7.5.5. Based on bug description, we *assume* this to be caused bu the 'part 3 of 4' push of patch for Bug#25042101 'SPLIT BINLOG INJECTOR_MUTEX IN TWO, DO REQUIRED CLEANUP':
    
    .........
      Remove thread_yield() in binlog injector code previously put there
      as a temp stopgap in the commit below. This used to be required
      as the injector thread held the injector_mutex > 99% of the time when
      waiting for pollEvents(). That blocked client threads either wanting to
      access the data shared from the injector thread, or needing the injector_mutex
      while waiting for injector_cond to be signaled
    
      This should not be required anymore, as:
    
      1) injector_mutex has been splitt in two separate mutexes.
      2) We changed init of the injector_event_mutex from a 'FAST' to a 'SLOW'
         mutex which has better 'farness' properties in the scheduler
    .........
    
    The theory is that using the more 'fair' SLOW-mutex variant is not as 'fair' as assumed to be on all OS/VM variants. Thus the 'yields' may be unsafe to remove.
    
    Bug has been hard to reproduce:
    
     - It has been 'randomly' reproduced using Oracle Linux 7 on top
       of 'Virtualbox'
     - It has than gone away for a couple of days.
     - It has *not* been reporoduced with this patch.
    
    So it should be reasonable to expect that reintroducing the 'thread_yields' should solve the problem.
    
    We cant say for sure though....
    
    (cherry picked from commit f0e06cc2bc975ca5be084be9c307803e1da53cd4)

commit ad9822288a279f0da23306a80e5854f9631e0bb6
Author: Lars Tangvald <lars.tangvald@oracle.com>
Date:   Tue Feb 28 13:38:24 2017 +0100

    Bug#25643023	SERVER ABORTING WHILE INITIALIZING DATABASE WITH INIT SCRIPTS
    
    If the datadir is deleted and the service restarted, the service
    script will reinitialize the database, then try to set auth_socket
    plugin for the now passwordless root account. The latter should not
    happen, because a) It's a major change in an old GA, and b) The sql
    simply fails, since it's run in bootstrap mode.
    
    (cherry picked from commit c93e3dfcca4a59c4228c5bce1eaac7b83f2c31db)

commit be79dbc17e0409cdc3010911a27ef3f91a1cbb61
Author: Lars Tangvald <lars.tangvald@oracle.com>
Date:   Wed Mar 1 13:30:58 2017 +0100

    Bug#25648545	PACKAGING CONFLICTS WITH MARIADB PACKAGES ON DEBIAN/UBUNTU
    
    Added conflicts:
    * mysql-packagesource-client conflicts with mariadb client
    * mysql-packagesource-server conflicts with mariadb server
    * mysql-packagesource-test conflicts with mariadb test package
    
    (cherry picked from commit 7b50590b2512eb063f2d6c012aca7e4b52d17558)

commit 23ac7b2a385ffbebefc21c1964fd60c69e9781dc
Author: Bharathy Satish <bharathy.x.satish@oracle.com>
Date:   Fri Mar 17 13:17:44 2017 +0100

    Bug #25717383: MYSQLDUMP MAY EXECUTE ANY ARBITARY QUERY.
    
    Post push fix.

commit 4588df5249c7e67aa41a33506e8a1112eae232a3
Author: Bharathy Satish <bharathy.x.satish@oracle.com>
Date:   Fri Mar 17 08:44:04 2017 +0100

    Merge branch 'mysql-5.5' into mysql-5.6
    
    (cherry picked from commit 7396facd28cc8fb6de7817c4e5978993b7267b6b)

commit 2567f9692e7daf1e57f427447d6ded61b71631f5
Author: Harin Vadodaria <harin.vadodaria@oracle.com>
Date:   Wed Mar 15 13:28:57 2017 +0100

    Bug#25714674: MYSQL SERVER REMOTE PREAUTH PROBLEM THROUGH INTEGER OVERFLOW
    
    Description: A missing length check for length-encoded string causes
                 problem in preauthorization stage.

commit f4fbee03f477cc37633cde6a7c21232820675fd2
Author: Piotr Obrzut <piotr.obrzut@oracle.com>
Date:   Mon Mar 13 18:09:51 2017 +0100

    Revert for the fix for the 'Bug#23593091: MYSQL SERVER MSI - REGISTRY ITEMS LEFT BEHIND WHEN > 1 SERVER VERSION INSTALLED'
    The Server Installer needs some changes to accomodate for this fix so it got postponed for the next release.

commit d1d0811f74732f9e7d1d5cb6e51875d22238f967
Author: Ramil Kalimullin <ramil.kalimullin@oracle.com>
Date:   Fri Mar 10 02:05:24 2017 +0400

    BUG#25575605: SETTING --SSL-MODE=REQUIRED SENDS CREDENTIALS BEFORE VERIFYING SSL CONNECTION
    
    MYSQL_OPT_SSL_MODE option introduced.
    It is set in case of --ssl-mode=REQUIRED and permits only SSL connection.

commit 06963bfe695e0d0c3bf88260b847b5a39222b884
Author: Lars Tangvald <lars.tangvald@oracle.com>
Date:   Tue Feb 28 13:38:24 2017 +0100

    Bug#25643023	SERVER ABORTING WHILE INITIALIZING DATABASE WITH INIT SCRIPTS
    
    If the datadir is deleted and the service restarted, the service
    script will reinitialize the database, then try to set auth_socket
    plugin for the now passwordless root account. The latter should not
    happen, because a) It's a major change in an old GA, and b) The sql
    simply fails, since it's run in bootstrap mode.

commit 5ee80004d28313422fac8d6512d204004c53cc2a
Author: Lars Tangvald <lars.tangvald@oracle.com>
Date:   Wed Mar 1 13:30:58 2017 +0100

    Bug#25648545	PACKAGING CONFLICTS WITH MARIADB PACKAGES ON DEBIAN/UBUNTU
    
    Added conflicts:
    * mysql-packagesource-client conflicts with mariadb client
    * mysql-packagesource-server conflicts with mariadb server
    * mysql-packagesource-test conflicts with mariadb test package

commit 2b16dc8b5fd9e90362815ca9df7fa105889a69d0
Author: Bharathy Satish <bharathy.x.satish@oracle.com>
Date:   Fri Mar 17 08:59:02 2017 +0100

    Merge branch 'mysql-5.6' into mysql-5.7
    
    (cherry picked from commit f1e6ace429bb95b417e46fa7e5104790dbca5412)

commit e8da6816611dbedb7fac73e90768fff6b79bc17a
Author: Harin Vadodaria <harin.vadodaria@oracle.com>
Date:   Wed Mar 15 13:30:24 2017 +0100

    Merge branch 'mysql-5.6' into mysql-5.7
    
    (cherry picked from commit dbe8c69488c1d7d156d27d02935c1d6e4a2adc18)

commit a0e9ede56fa4970813f61eca6ead81cc187b8c66
Author: Harin Vadodaria <harin.vadodaria@oracle.com>
Date:   Wed Mar 15 13:32:22 2017 +0100

    Bug#25714674: MYSQL SERVER REMOTE PREAUTH PROBLEM THROUGH INTEGER OVERFLOW
    
    Description: A missing length check for length-encoded string causes
                 problem in preauthorization stage.
    
    (cherry picked from commit 579637daba48c372fe6210f33e410fcb4293acfe)

commit 63b83d5970bfb11137c2813cb8be0fc8edbbbd05
Author: Lars Tangvald <lars.tangvald@oracle.com>
Date:   Mon Mar 20 08:58:24 2017 +0100

    Packaging: Added new manpage
    
    A new manpage was added for ndb_print_frag_file. Added to deb and rpm packaging
    
    (cherry picked from commit d353d67970280ad8fd44f41aa5412014267c0d39)

commit e7538fef128608af3f50b4153f4b6d947d3b93a3
Author: Piotr Obrzut <piotr.obrzut@oracle.com>
Date:   Mon Mar 13 18:16:48 2017 +0100

    Merge branch 'mysql-5.6' into mysql-5.7
    
    (cherry picked from commit 09b50ab8c41db000561d92809e48755b907c149b)

commit b223ee0c84faaa8cf71954964edf130d36c96d3c
Author: Lars Tangvald <lars.tangvald@oracle.com>
Date:   Fri Mar 3 11:12:26 2017 +0100

    Merge branch 'mysql-5.6' into mysql-5.7
    
    (cherry picked from commit 0f94c14be2276f93b6a98b397111cb475076e0a6)

commit 5c727ebf55f31f3bbe4f9e5ccaa3e8851841eec9
Author: Lars Tangvald <lars.tangvald@oracle.com>
Date:   Tue Feb 28 12:40:34 2017 +0100

    Bug#25641417	PACKAGE UPGRADE FROM 5.6 TO 5.7 FAILING ON DEBIAN/UBUNTU PLATFORMS
    
    The mysql_plugin file is in the client package in 5.6, and server in 5.7,
    causing file conflicts on upgrade.
    
    (cherry picked from commit 9fa34bcd92e949d96b2d6a21104d3c1fc7c85d18)

commit c1234acec062ade7e0f16e060f9fafd9d56b8467
Author: Lars Tangvald <lars.tangvald@oracle.com>
Date:   Wed Mar 1 13:04:07 2017 +0100

    Bug#25650096	PACKAGE UPGRADE FROM 5.5 NATIVE TO 5.7 THROWS ERRORS ON DEBIAN
    
    When upgrading from native 5.5 packages in Debian we need to reset ownership
    on /var/run/mysqld (owned by root), or the systemd service will throw an error
    because it can't assign it to the mysql user.
    
    (cherry picked from commit 88c2441d41933307208227629481adfe28ac764f)

commit 1f550402ae36771f89b3cf0296534f1eac1d06d3
Author: Oystein Grovlen <oystein.grovlen@oracle.com>
Date:   Wed Mar 1 14:29:48 2017 +0100

    Bug#25650399: DOWNGRADE FROM MYSQL 8.0 TO 5.7 WILL CRASH SERVER
    
    MySQL 8.0 adds a generated column to the two tables mysql.server_cost
    and mysql.engine_cost.  MySQL 5.7 fails if system tables contain
    generated columns.  Hence, downgrade to 5.7 will not work when cost
    tables contain generated columns from 8.0.
    
    This patch is for 5.7 and backports fix to read_cost_constants() from
    8.0.  mysql_system_tables_fix.sql is changed to remove columns
    should they exist.  This will make mysql_upgrade, if run during
    downgrade, restore these tables to its original form.
    
    sql/opt_costconstantcache.cc
       In order for resolving of generated column to work correctly when
       opening cost tables, lex_start() must be called.
    
    scripts/mysql_system_tables_fix.sql
       Add SQL code to remove the columns from 8.0 should they exist.
    
    scripts/mysql_system_tables.sql
       Specify only non-default values in insert statements for cost tables.
       This way mysql_upgrade does not give errors if extra columns exist.
    
    mysql-test/t/opt_costmodel_downgrade.test
    mysql-test/r/opt_costmodel_downgrade.result
       Test to verfiy that 5.7 does not crash should generated columns exist in
       cost tables.  Also verifies that running mysql_upgrade will remove
       the columns.
    
    (cherry picked from commit 6f909b48b8f324079dd9f2a2813312194d17cff1)

commit d2a8f95fbc6e6d623adb689a6899fa1aa842ba67
Author: Lakshmi Narayanan Sreethar <lakshmi.narayanan.sreethar@oracle.com>
Date:   Wed Mar 8 14:38:15 2017 +0530

    Bug#22195588 - Post push fix
    
    This patch makes changes to the ndb_info.inc include file in the MTR
    test case to make it windows compatible.
    
    (cherry picked from commit bf311918b844afb2ca2b579d36891b990152bc6f)

commit 12ff08a8d960caf3d803013b400573f1300b9ff4
Author: Mauritz Sundell <mauritz.sundell@oracle.com>
Date:   Thu Mar 16 15:00:09 2017 +0100

    Bug #25738510: CLUSTERJ FAILS AFTER SWITCH TO ORACLE DEVELOPER STUDIO
    ON SOLARIS PLATFORMS
    
    Explicitly link libndbclient.so with C++ libraries on Solaris.
    
    CMAKE_CXX_LINK_FLAGS will contain '-lstdc++ -lgcc_s -lCrunG3 -lc'
    if needed.
    
    (cherry picked from commit 4cacfb778f67bbe6b69c4d08c940e52ffd0470cb)

commit 796cb2ab7e834be931646309b8f14a05011a8a89
Author: Mauritz Sundell <mauritz.sundell@oracle.com>
Date:   Wed Mar 15 23:36:07 2017 +0100

    Bug #25730703: SWITCH TO ORACLE DEVELOPER STUDIO ON SOLARIS CAUSED
    MEMCACHED BUILD PROBLEMS
    
    Make RPATH and RUNPATH remain when installing ndb_engine.so
    
    Unused path to libraries pointing into source directories made CMake add
    RPATH and RUNPATH during build and triggered RPATH_REMOVE on install.
    
    (cherry picked from commit 1432af93388b5c8aea0c85fb148b8d16a1d6a5d9)

commit 7659be74357291f9d4279681c89afb1f2aad23e6
Author: Arnab Ray <arnab.r.ray@oracle.com>
Date:   Thu Mar 9 15:21:19 2017 +0530

    Bug #25730703: SWITCH TO ORACLE DEVELOPER STUDIO ON SOLARIS CAUSED
    MEMCACHED BUILD PROBLEMS
    
    Replace the -lCrun flag in the linking command for ndb_engine.so.
    No explicit reference to libCrun is required
    
    (cherry picked from commit a9edb5227c816bc80de64259d847556fa630db07)

commit f9ef1f9f324434c5212e34df471d9c892dd5d474
Author: Mauritz Sundell <mauritz.sundell@oracle.com>
Date:   Thu Mar 9 23:50:16 2017 +0100

    Bug#25695818 DATA NODE BUS ERROR IF BUILT WITH ORACLE DEVELOPER STUDIO 12.5 ON SOLARIS SPARC
    
    Make m_versionInfo aligned to 8 byte boundary within GlobalData.
    
    By that the compiler bug is avoided, at least in code path accessing
    m_versionInfo.
    
    (cherry picked from commit 0d7c08b88341d24518d98b33fd8cf64b6a3daf45)
