Created by Kristian Nielsen and last modified
Get this branch:
bzr branch lp:~maria-captains/maria/10.0-custombuild
Members of Maria-captains can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information


Recent revisions

4346. By Sergei Golubchik

after-merge fixes for 10.0-connect

4345. By Sergei Golubchik

10.0-connect merge

4344. By Sergei Golubchik

buildbot found failures

4343. By Sergei Golubchik


4342. By Nirbhay Choubey <email address hidden>

MDEV-6490: Post-fix for the failing test.

4341. By Nirbhay Choubey <email address hidden>

MDEV-6490: mysqldump unknown option --galera-sst-mode

A new command line option "galera-sst-mode" was introduced
in mysqldump as part of fix for MDEV-6316. But, since the
fix was pushed to maria-10.0-galera branch, the mysqldump
tool supplied with mariadb client deb/rpm packages, does not
have this new opion.
This fix contains the same patch along with a test case.

4340. By Nirbhay Choubey <email address hidden>

MDEV-6118: Unable to install "MariaDB-connect-engine" when
using "MariaDB-Galera-server"

rpm: Updated components' requires-list to include "MariaDB"
     instead of "MariaDB-server".

deb: Added (ORed) 'mariadb-galera-server-10.0' to the 'Depends'
     list of connect and oqgraph engine packages.

4339. By Sergei Golubchik

fix the error message when getaddrinfo() fails. on windows "*" doesn't mean "any address"

4338. By Sergei Golubchik

MDEV-6543 Crash if enable 'federatedx' when 'federated' plugin already enabled, and vice-versa

INSTALL SONAME ignores attempts to load the same plugin twice, it's not an error
(because one can load one plugin by name and then install soname for the rest).
But Federated and FederatedX are different plugins, despite having the same name.

Now plugin_add() only considers two plugins identical if their names are the same
string (compared as pointers). Otherwise it reports an error.,

4337. By Sergei Golubchik

cleanup: remove have_mysql_upgrade.inc

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.