Comment 1 for bug 1391676

Patch attached. Here are the steps to deploy this patch:

1. apt-get source mariadb-server - on Trusty will download and unpack mariadb-5.5_5.5.39-0ubuntu0.14.04.1.debian.tar.gz

2. Download mariadb-5.5.40.tar.gz from https://downloads.mariadb.org/mariadb/5.5.40/#os_group=source and rename it to mariadb-5.5_5.5.40.orig.tar.gz

3. Check that sha256sum matches:
cbde17f4a31483143490def6fcce33310ebae49eafe92dc4ada0e7227202415a mariadb-5.5_5.5.40.orig.tar.gz

4. Unpack mariadb-5.5.40.orig.tar.gz, mariadb-5.5.40/ is created

5. Replace upstream mariadb-5.5.40/debian/* with mariadb-5.5-5.5.39/debian/* from Trusty

6. Apply the attached patch mariadb-5.5_5.5.39-0ubuntu0.14.04.1__5.5.40-0ubuntu0.14.04.1.diff on mariadb-5.5.40/debian/

7. Build and ship

I've created test packages that build and pass the test suite. Build logs and installable binaries available at https://launchpad.net/~mysql-ubuntu/+archive/ubuntu/mariadb