Created by Alexey Kopytov and last modified
Get this branch:
bzr branch lp:~akopytov/percona-xtrabackup/bug950334-2.1
Only Alexey Kopytov can upload to this branch. If you are Alexey Kopytov please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Recent revisions

492. By Alexey Kopytov

Manual merge from 2.0.

491. By Alexey Kopytov

Empty merge from 2.0.

490. By Alexey Kopytov

Merge trunk.

489. By Alexey Kopytov

Manual merge from 2.0

488. By Laurynas Biveinis

Merge C++ build support from 2.0

For 2.1, InnoDB-facing parts are defined as xtrabackup.cc,
innodb_int.cc, compact.cc, fil_cur.cc, write_filt.cc, renamed from
.c. The rest is built with a C compiler.

Since innodb_int.h becomes a C++-only header, do not include it in
common.h, where it's not really required. Replace ulints (an InnoDB
type) with ulongs (a MySQL type) there.

In preparation for MySQL 5.6 with C++ InnoDB headers, move all the
InnoDB header includes to innodb_int.h, so that InnoDB being C or C++
has to be handled in one location only.

Move mysql_tmpdir_list declaration and definition from innodb_int.h/.cc
to ds_tmpfile.h/.c because it's of a C type, declared in MySQL plugin
interface, instead of a potentially C++ InnoDB type.

Likewise move xb_stream_fmt_t definition from xtrabackup.h to

Fix TABLE definition and move it from innodb_int.cc to innodb_int.h.

486. By <email address hidden>

Merge lp:~akopytov/percona-xtrabackup/compact-backups

485. By <email address hidden>

Empty merge from Percona XtraBackup 2.0

484. By <email address hidden>

Merge lp:~hrvojem/percona-xtrabackup/bug1100008-2.1

483. By Stewart Smith

merge 1.6.6 release 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.