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

568. By Laurynas Biveinis on 2013-06-03

Merge MySQL 5.1.69.

Non-automerge bits:

- Trivial Autoconf conflict.
- trivial conflict in scripts/fill_help_tables.sql.
- Reverted fix for bug 1064953 due to upstream fix.
- Removed the upstream fix for bug 1083377 /
  http://bugs.mysql.com/bug.php?id=67685 due to the upstream fix being
  incomplete and us carrying a fix from MariaDB.
- Initialized readbytes in my_read() to avoid a bogus GCC
  -Wmaybe-uninitialized warning for it.
- Adjusted buf_page_get_gen() for correct mutex handling at the new
  null_exit label.
- Adjusted innodb_buffer_pool_evict_update() for the buffer pool mutex
- Re-recorded percona_server_variables_debug testcase to include
- Imported man pages from mysql-5.1.69.tar.gz.

567. By Laurynas Biveinis on 2013-06-02

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.