revision-id: 1ed1b7794fd0eba99932f43dc3f6ce1c6cdfda5d (mariadb-10.2.21-57-g1ed1b7794fd) parent(s): 564f63ccf78678dffc32841381deb19954dd36e3 a0e26599a3a772ccaa06410c722a770e300b5bb8 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2019-02-04 16:09:42 +0100 message: Merge remote-tracking branch 'connect/11.2' into 10.2 storage/connect/ha_connect.cc | 41 ++++++++++++++++---- storage/connect/jsonudf.cpp | 49 +++++++++++++++++++++++- storage/connect/jsonudf.h | 5 +++ storage/connect/tabext.cpp | 43 ++++++++++++++++++++- storage/connect/tabext.h | 5 ++- storage/connect/tabjdbc.cpp | 89 ++++++++++++++++++++++++++----------------- storage/connect/tabjson.cpp | 8 ++-- 7 files changed, 188 insertions(+), 52 deletions(-)