mirror of
https://github.com/MariaDB/server.git
synced 2025-09-03 20:43:11 +03:00
Conflicts: - mysql-test/r/partition.result - mysql-test/r/variables_debug.result - mysql-test/t/partition.test - mysql-test/t/variables_debug.test