summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorOtto Kekäläinen <otto@kekalainen.net>2020-05-16 11:48:26 +0300
committerOtto Kekäläinen <otto@kekalainen.net>2020-05-16 11:48:26 +0300
commit5d85bc08c6412d067a69d2c1354a10f9a803b332 (patch)
tree154dbd9499810257ce0855306263223f545fa46b /README.md
parent91446c822f4e1e93bb44b4ae389b8950a5745de4 (diff)
downloadmariadb-git-5d85bc08c6412d067a69d2c1354a10f9a803b332.tar.gz
MDEV-21976: Re-disable main.udf, reverts mistake in merge b30a01314217
This test was disabled in a135f0ab88d63b9a8976d6b3010f27766c38873d, but accidentally reverted during the merge in https://github.com/MariaDB/server/compare/0186b0a07760...b30a01314217 Because it was a 3-way merge, the removal is not directly visible. It can be verified manually though: Line not changed: git diff a135f0ab88d6..0186b0a07760 mysql-test/unstable-tests Line removed: git diff a135f0ab88d6..b30a01314217 mysql-test/unstable-tests This commit fixes the Travis-CI build and makes the main 10.5 git branch green again on Travis-CI (and whatever else build environment that also is failing due to this test). Related: MDEV-22592
Diffstat (limited to 'README.md')
0 files changed, 0 insertions, 0 deletions