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

Fix ndb_lock mtr failure

Bug#22972595 - FAILING ASSERTION: NODE_START != (OS_OFFSET_T) -1 WITH…

… DDL+DML USING XCONNECTION

Description: Mysqlx was closing same file desriptor two times. First from
xpl::Client::~Clinet -> Connection_vio::close, second from first from
xpl::Client::~Clinet -> Connection_vio::close. After first call the same descriptor id
could be allocated at another open, socket call (from antoher thread). Second call to close was
invalidating the just allocated socket.

Reviewed-by: Jakub Nowakowski <[email protected]>
Reviewed-by: Andrzej Religa <[email protected]>
RB: 12247
(cherry picked from commit 3100556f08d85d7bbd18cfef2840760e84549483)

Bug#22901309 - DISABLE 'EVENT BUFFER STATUS REPORTING' FOR THE SLIP-T…

…HRESH CASE,TO REDUCE NOICE

(cherry picked from commit 17820897322ce7c2fc390a0bffbd4fe0d28fc289)

Bug# 22865112 LACK OF HTONLL CHECK CAUSE MYSQ5.6.30/5.7.12 BUILD FAIL…

…URE ON OS X

PROBLEM
-------

Build failure in some mac machines due to redefinition of htonll function.

FIX
---
Introduced a check to not redefine htonll if OS provides htonll function.

(cherry picked from commit 4b47067d6e74a5493d0604afed3d852d03092771)