Upmerge of the 7.2.25 build

Bug #23129433 CLUSTER SHUTDOWN DURING UPGRADE FROM 7.3.13 --> 7.4.11

Problem exists in 7.4 DIH LCP takeover code.

This commit in 7.3 introduces a new testUpgrade testcase showing
the problem.

Fix will come on merge to 7.4

Bug #23225800: NDB_DD_DUMP TEST FAILING ON ALL PLATFORMS

(Server Bug #23259328: NDB_DD_DUMP TEST FAILING DUE TO CHANGE IN
 MYSQLDUMP)

Problem: Fix for Bug#21382184 caused a regression making ndb dump
test to fail. Reverted minor part of the code as part of the fix.

(cherry picked from commit cc696659a035448af3a8f42371fd9a5b5def83cd)

Fix spurious failures in ATR test 'testTransactions'

This test runs a mix of 2 different transaction T1/T2. For some
of the testcases, the second transaction is supposed to
be blocked by the first onw , and thus timeout with either
error 266 or 274. For other combinations, no such timeouts are
accepted.

In order to reduce the elapsed time for the test, the TC transaction
timeout was reduced to 100ms (default 3000ms). That had the
negative impact that even transaction combination not expected to
block each other, code spriously timeout.

As the setting of TC txn timeout was a 'global' setting, it
also remained set after this test had completed, and thus
could result in timeouts for later ATR test cases.

This patch:

1) Delay setting of  the 'short timeout' (100ms) to after
   The first (non-blocking( transaction is executed. Thus
   avoiding 'T1' to timeout.

2) Sets the 'short timeout' for T2 only for T1/T2 combinations
   where T2 is expected to fail with a timeout

3) Set transaction timeout back to 'default' as soon as the
   T2 has completed, this avoids that the short timeout
   affects other transactions than the one assumed to timeout.

Bug#23327563	DIST UPGRADE FAILING FROM 5.7.12(NATIVE) TO 5.7.13 PACKA…

…GES ON UBUNTU16.04

The control file doesn't correctly specify that the package conflicts with native 5.7,
causing errors because the file layout is a little different.
Added missing conflicts/replaces statements to control file.

(cherry picked from commit 7ca9852b0efcbce851598b3974f1d73be19f31bf)

WL#7162 Move ndb_binlog_index table from MyISAM to transactional storage

Removed output of binlog file path to be file system independent.

Merge branch 'mysql-5.5' into mysql-5.6

(cherry picked from commit d8de93d8853fce9246c5ada4de4b47b1f59b912e)

Bug#23251517: SEMISYNC REPLICATION HANGING

Revert following bug fix:

Bug#20685029: SLAVE IO THREAD SHOULD STOP WHEN DISK IS
FULL
Bug#21753696: MAKE SHOW SLAVE STATUS NON BLOCKING IF IO
THREAD WAITS FOR DISK SPACE

This fix results in a deadlock between slave IO thread
and SQL thread.

(cherry picked from commit e3fea6c6dbb36c6ab21c4ab777224560e9608b53)

Bug#22842538 BINLOG SCHEMA DISTRIBUTION TIMEOUT AND FAILS WHEN ANOTHE…

…R MYSQL NODE START

When another mysqld node is started, and joins (subscribe to)
the schema distribution protocol, another mysqld which is
waiting for a schema change to be distributed will timeout
during that wait. That happens as we incorrectly assumed
that the new arriving mysqld node would also 'ack' the
schema distribution. However, it arrived too late to be
a participant in it.

This patch fixes 3 issues all contributing to this failure:

a) There is a potential race between an 'inflight'
   subscribe event, and the start of a schema distribution.
   The subscribing node might or might not take part in the
   schema distribution, and its role is actually unknown at
   the point in time where the schema operation is started by
   the coordinator.
   The set of participating servers could only be determined
   when the Coordinator acks its own schema op: If the subscribe
   event arrived before it own schema up, then the subcribing
   node is a participant.
   This patch modifies the Coordinators ack to also modifying
   the acked slock_bitmap to clear the servers *not* participating.

b) check_wakeup_clients() called get_subcriber_bitmask() to get the
   current set of subscribers. However, 'self' was not included in the
   subscribers, which it always should be. Fixed this by letting
   Ndb_schema_dist_data::init() add 'own_nodeid' to subscribers.
   Furthermore, this enables us to clean up a couple of places
   where we used to add own_nodeid to the set retrieved from
   get_subscribers_bitmask().

c) handle_clear_slock() copied schema->slock into
   ndb_schema_object->slock_bitmap, thereby overwriting the intersect
   done as part of a). Changed the copy to do an intersect instead.

This patch also modifies several places where schema distribution
progress is printed:
- Always print more significant part of bitmask before the less significant.
- Adds some formating when printing the bitmasks.

Also removes a few clear of bitmasks immediately after an init,
which is redundant as ::init() also cleared it.

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