Created by Laurynas Biveinis and last modified
Get this branch:
bzr branch lp:~laurynas-biveinis/percona-server/merge-5.6.11
Only Laurynas Biveinis can upload to this branch. If you are Laurynas Biveinis please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Recent revisions

343. By Laurynas Biveinis

Merge MySQL 5.6.11. Non-automerge bits:

- Removing our log_slow_admin_statements and log_slow_sp_statements
  variables due to upstream implementation.

- Trivial XtraDB adjustments around fake changes code.

- Removing our RETURN_IF_INNODB_NOT_STARTED calls now that upstream
  added them.

- Merge our threadpool implementation, featuring vio->shutdown
  function pointer with the upstream changes that introduce
  vio->vioshutdown function pointer. Both implementations are very
  similar, except that the upstream passes SHUT_RDWR unconditionally
  and the threadpool passes SHUT_RD for handling KILLs. Resolve by
  adding "how" arg to vio->vioshutdown and moving the relevant bits
  from vio_socket_shutdown() to vio_shutdown(). Then threadpool's
  vio->shutdown pointer and all supporting code is removed. At the
  same time fix bug 1177780 (Unused declarations
  vio_shutdown_shared_memory(Vio*, int) and vio_shutdown_pipe(Vio*,

- Revert our fix for bug 1042946 due to the upstream fix.

342. By Laurynas Biveinis

Automerge prerequisite branch

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.