Created by Sergey Petrunia and last modified
Get this branch:
bzr branch lp:~maria-captains/maria/10.1
Members of Maria-captains can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information


Recent revisions

3993. By Sergei Golubchik

merge the compilation fixes from 10.0-FusionIO

3992. By Jan Lindström

Merge 10.0 -> 10.1

3991. By Jan Lindström

Fix compiler warnings.

3990. By Jan Lindström

Fixed compiler error if LZO is not installed.

3989. By Jan Lindström

Fix compiler errors caused by merge error.

3988. By Jan Lindström

MDEV-6246: Merge 10.0.10-FusionIO to 10.1.

3987. By Jan Lindström

MDEV-6075: Allow > 16K pages on InnoDB

This patch allows up to 64K pages for tables with DYNAMIC, COMPACT
and REDUNDANT row types. Tables with COMPRESSED row type allows
still only <= 16K page size. Note that single row size must be
still <= 16K and max key length is not affected.

3986. By Sergey Petrunia

Merge 10.0 -> 10.1

3985. By Igor Babaev

Merge 10.0->10.1

3984. By Jan Lindström

Added multi-key unique test case.

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.