← Back to team overview

maria-developers team mailing list archive

Merging MySQL 5.1.39 into MariaDB

 

I have completed a merge of MySQL 5.1.39 into MariaDB.

The merge is pushed into lp:~maria-captains/maria/mariadb-5.1-knielsen for
testing.

Note that pushing the merge into main is currently blocked by a regression
introduced in MySQL 5.1.39 by the patch for Bug#45261. I mailed the MySQL
developers about this:

    http://lists.mysql.com/internals/37377

Due to this regression, the new TIME_MS column in
INFORMATION_SCHEMA.PROCESSLIST in MariaDB is broken, as seen in test failures
like main.create.

Hopefully the MySQL developers can help on how to resolve this. The issue is a
bit complex, concerning truncation issues with DECIMAL types.

 - Kristian.