Implementation of mdev-5871#2

pastcompute wants to merge 7 commits into

MariaDB:10.1MariaDB/server:10.1from

pastcompute:oqgraph_mdev_5871pastcompute/server:oqgraph_mdev_5871Copy head branch name to clipboard