summaryrefslogtreecommitdiff
path: root/mysql-test/README
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-05-09 13:24:52 +0200
committerSergei Golubchik <serg@mariadb.org>2017-05-09 13:24:52 +0200
commitc91ecf9e9bebf3cf2dafbd3193de4df94be09870 (patch)
treea9ab429c8e8a6a50c38557cbdd38d9612480f49c /mysql-test/README
parent2645bda5f20ab10bc26dc1cb69f91b5505c1faae (diff)
parentc92168fcd26aad35bd4cb5d65175e3545133f201 (diff)
downloadmariadb-git-c91ecf9e9bebf3cf2dafbd3193de4df94be09870.tar.gz
Merge branch '10.1' into 10.2
Revert commit db0917f68f, because the fix for MDEV-12696 is coming from 5.5 and 10.1 in this merge.
Diffstat (limited to 'mysql-test/README')
0 files changed, 0 insertions, 0 deletions