Merged fix is revision 3853 in lp:~codership/codership-mysql/5.5-23

References: MDEV-4211 - appended format description event for TOI replication write set, FD carries binlog checksum algorithm

References: lp:1136303 - adapting wsrep status variable usage according to wsrep provider version 2.2 behavior

Removed the obsolete instructions from the MySQL 5.1 manual. Instead provide a link to https://kb.askmonty.org/en/compiling-mariadb-from-source/

  https://bugs.launchpad.net/codership-mysql/+bug/1084702
  https://bugs.launchpad.net/percona-xtradb-cluster/+bug/1019473

Merged revisions 3851-3852 from lp:~codership/codership-mysql/5.5-23

   https://mariadb.atlassian.net/browse/MDEV-4179
   https://bugs.launchpad.net/codership-mysql/+bug/1130888
   https://bugs.launchpad.net/codership-mysql/+bug/1019473
Merged revisions 3847-3850 from lp:~codership/codership-mysql/5.5-23

           variable in the result file

References https://mariadb.atlassian.net/browse/MDEV-4185 - thread terminate was blocked for non-wsrep threads

Avoiding ha_kill_query for aborts initiated by replicator

Fixes to stop wsrep replicator when thread pool scheduler is in use

Merged revision 3846 from lp:codership-mysql/5.5-23

bzr merge -r3840..3845 lp:~codership/codership-mysql/5.5-23

bzr merge -r3810..3839 lp:codership-mysql/5.5

to enable both recompiling mysqli or odbc from sources in addition to drop-in replacement functionality.

The case in question is compiling mysqli from sources, that needs client_errors via ER() macro.

Previously, we exported it as mysql_client_errors (compatibly to Fedora's style symbol renaming, see MDEV-3842).
However, if MariaDB header files are used when compiling mysqli, client_errors needs to be exported with its original name.

           be able to handle both

MDEV-11 - Modifed tests and result files to use explicit column lists
          in INSERT and SELECT statements

Assertion happens in replication thread during THD destruction, when thread calls my_sync(), which in turn calls  thd_wait_begin() callback. Connection count can be 0, because the counter was decremented before THD destructor. 
This assertion currently reproducible only in Percona server  and not in MariaDB, due to differences in replication code.

Fixed by moving  code to decrement connection counter after the THD destructor.

from MariaDB 10.0.
  
The bug in mdev-3948 was an instance of the problem fixed by Sergey's patch
in 10.0 - namely that the range optimizer could change table->[read | write]_set,
and not restore it.
  
revno: 3471
committer: Sergey Petrunya <psergey@askmonty.org>
branch nick: 10.0-serg-fix-imerge
timestamp: Sat 2012-11-03 12:24:36 +0400
message:
  # MDEV-3817: Wrong result with index_merge+index_merge_intersection, InnoDB table, join, AND and OR conditions
  Reconcile the fixes from:
  #
  # guilhem.bichot@oracle.com-20110805143029-ywrzuz15uzgontr0
  # Fix for BUG#12698916 - "JOIN QUERY GIVES WRONG RESULT AT 2ND EXEC. OR
  # AFTER FLUSH TABLES [-INT VS NULL]"
  #
  # guilhem.bichot@oracle.com-20111209150650-tzx3ldzxe1yfwji6
  # Fix for BUG#12912171 - ASSERTION FAILED: QUICK->HEAD->READ_SET == SAVE_READ_SET
  # and
  #
  and related fixes from: BUG#1006164, MDEV-376:
  
  Now, ROR-merged QUICK_RANGE_SELECT objects make no assumptions about the values
  of table->read_set and table->write_set.
  Each QUICK_ROR_SELECT has (and had before) its own column bitmap, but now, all 
  QUICK_ROR_SELECT's functions that care: reset(), init_ror_merged_scan(), and 
  get_next()  will set table->read_set when invoked and restore it back to what 
  it was before the call before they return.

  This allows to avoid the mess when somebody else modifies table->read_set for 
  some reason.

MDEV-3875 Wrong result (missing row) on a DISTINCT query with the same subquery in the SELECT list and GROUP BY

fix remove_dup_with_hash_index() and remove_dup_with_compare() to take NULLs into account