merge 5.5 → 10.0-base 10.0-base → 10.0
MDEV-3814 Implement DELETE with result set (mwl #205)
MDEV-5006 TokuDB in 10.0
MDEV-5013 sql/sql_plugin.cc:update_func_str() for PLUGIN_VAR_MEMALLOC may cause double free