lp:~laurynas-biveinis/percona-server/5.6-merge-1

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

Owner:
Laurynas Biveinis
Project:
Percona Server
Status:
Merged

Recent revisions

325. By Laurynas Biveinis on 2013-05-10

Merge lp:percona-server/5.6 revision 343.

At the same time fix bug 1178606 (Log archiving messages should use
ib_logf instead of fprintf for diagnostics).

324. By Laurynas Biveinis on 2013-05-10

Null-merge lp:percona-server/5.6 revision 318.

323. By Laurynas Biveinis on 2013-05-10

Merge lp:percona-server/5.5 revision 460.

322. By Laurynas Biveinis on 2013-05-09

Null-merge lp:percona-server/5.5 revision 446.

321. By Laurynas Biveinis on 2013-05-09

Fix subunit2junitxml permissions

320. By Laurynas Biveinis on 2013-05-09

Merge lp:percona-server/5.5 revision 444.

- More porting of redo log tracking to 5.6 idioms: use LSN_MAX,
  LSN_PF, lsn_t, ib_logf.

- Fix bug 1178329 (Log tracking mutex causes crashes if
  UNIV_SYNC_DEBUG is defined) by handling SYNC_LOG_ONLINE at
  sync_thread_add_level().

319. By Laurynas Biveinis on 2013-05-09

  Post-commit fixes for the 5.5 rev 397 to 5.6 merge:

  - Add back, with correct file-ids:
    - COPYING.innodb-deadlock-count-patch;
    - COPYING.show_temp_51;
    - subunit2junitxml.

  - Add files that should have been a part of the original merge but
    were forgotten to bzr add:
    - Percona-Server/mysql-test/t/percona_query_cache_with_comments_prepared_statements-master.opt
    - Percona-Server/mysql-test/t/percona_status_wait_query_cache_mutex-master.opt

  - Fix version in the top-level Makefile.

  - Fix InnoDB release build.

  - Fix bug 1177356 (Unstable test percona_bug643149) by normalizing the
    number of spaces before any numeric values in the slow query log
    output in percona_bug643149.test.

318. By Laurynas Biveinis on 2013-05-06

Merge Percona Server 5.5 at revision 397 to Percona Server 5.6, top of
revision 317.

- Null-merge the features to be dropped and those to be re-added
  later.

- Resolve bzr file-ids (a step towards resolving bug 1099764).

- Update the code to follow 5.6 idioms.

- Modify rpl_percona_crash_resistant_rpl testcase to test MySQL 5.6
  crash-proof slave feature instead.

- Tweak group_commit_crash.test to disable a part of the tests until
  http://bugs.mysql.com/bug.php?id=68932 is fixed.

- The merge also fixes the following bugs:
  - bug 1159623 (Missing PAM plugin in 5.6 packages);
  - bug 1160895 (Redundant test percona_log_slow_global_control_default);
  - bug 1160951 (Delete Percona-Server/patch_info directory);
  - bug 1157037 (create_duplicate_weedout_tmp_table() leaves
    key_part_flag uninitialized), fix taken from
    lp:~sergei.glushchenko/percona-server/56-memory_dynamic_rows.
  - bug 1133926 (percona_bug_999147 fails on debug builds), fix taken
  - from lp:~sergei.glushchenko/percona-server/56-bug1133926.
  - bug 1176864 (dict_table_struct::is_corrupt checks missing branch
  - predictor annotations).

317. By <email address hidden> on 2013-02-26

Merge lp:~stewart/percona-server/5.6-innodb-fast-checksum

316. By <email address hidden> on 2013-02-20

Merge lp:~hrvojem/percona-server/ps-24

Branch metadata

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