Created by Laurynas Biveinis and last modified
Get this branch:
bzr branch lp:~laurynas-biveinis/percona-server/merge-5.6.17
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

579. By Laurynas Biveinis

Restore -DWITH_SSL=system support for OpenSSL versions <= 0.9.8k.

MySQL 5.6.17 introduced support for block encryption modes and
initialization vectors for AES_ENCRYPT/AES_DECRYPT functions. This
change broke backwards compatibility for older OpenSSL system
versions, as the ECB mode cipher there disagrees with recent OpenSSL
versions whether it need initialization vectors or not. As AES
functions directly check with OpenSSL for IV requirement and provide a
corresponding function signature, these differences result in SQL

Fixed by checking, for OpenSSL, whether ECB mode is in use whenever
OpenSSL reports required IV length > 0, and assuming IV length of zero

578. By Laurynas Biveinis

Merge MySQL 5.6.17, implementing
https://blueprints.launchpad.net/percona-server/+spec/merge-5.6.17 and
taking upstream fixes for

Non-trivial merge bits:
- rewrote lock_rec_other_trx_holds_expl to use transaction
  descriptors. Updated lock_rec_has_expl and
  lock_rec_other_has_expl_req to take trx id instead of trx
  pointer. Adjusted lock_rec_queue_validate to use transaction

- Moved Percona-specific error messages to the end of errmsg-utf8.txt,
  re-recorded max_statement_time_func testcase.

At the same time fixed bug 1299688 /
http://bugs.mysql.com/bug.php?id=72163 (lp:mysql-server/5.6 rev 5774
broke rpl_plugin_load) by re-recording the testcase.

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.