The Ultimate Guide to High Availability with MariaDB

Merging TokuDB and jemalloc

You are viewing an old version of this article. View the current version here.

We merge TokuDB and jemalloc from Tokutek git repositories on GutHub (https://github.com/Tokutek/) using the modified bzr-git plugin.

First, you need to install our modified bzr-git plugin. Grab it here: lp:maria-captains/bzr-git/serg

Then, branch all necessary trees from

  • git://github.com/Tokutek/jemalloc
  • git://github.com/Tokutek/ft-engine.git
  • git://github.com/Tokutek/ft-index.git

Select what revision you want to merge up to. Apparently, git history doesn't map to bzr history 1:1 (or bzr-git plugin cannot reconstruct it properly), so using -r tag:tokudb-7.0.4 (for example), does not always work. In this case, look for the comment of the revision with this tag, and search for it in your branched bzr tree.

Merge from all three trees into the MariaDB tree normally, use -r revno if necessary.

Resolve the conflicts, verify that no files outside of (respectively)

  • extra/jemalloc
  • storage/tokudb/
  • storage/tokudb/ft-index

are added, removed, or modified. Compile, run tokudb tests:

./mtr --suite rpl-tokudb,tokudb,tokudb_add_index,tokudb_alter_table,tokudb_bugs,tokudb_mariadb

Commit and push.

Comments

Comments loading...
Content reproduced on this site is the property of its respective owners, and this content is not reviewed in advance by MariaDB. The views, information and opinions expressed by this content do not necessarily represent those of MariaDB or any other party.