Temporarily NULL-merge two patches for WL#5154 from mysql-trunk-merge.
WL#5154 needs to be ported to next-mr and 6.0 separately. That can not be done in scope of this merge due to numerous test failures.
This commit is contained in:
commit
fa3f3beadc