1 files changed, 121 insertions, 0 deletions
diff --git a/mysql-test/main/gis.test b/mysql-test/main/gis.test
index 48f2803b27d..3249b2579d3 100644
--- a/mysql-test/main/gis.test
+++ b/mysql-test/main/gis.test
@@ -3181,5 +3181,126 @@ SELECT CONVERT(1, MULTIPOLYGON);
 
 
 --echo #
+--echo # MDEV-17832 Protocol: extensions for Pluggable types and JSON, GEOMETRY
+--echo #
+
+SET NAMES utf8;
+CREATE TABLE t1 (
+  p    POINT,
+  ls   LINESTRING,
+  pl   POLYGON,
+  mp   MULTIPOINT,
+  mls  MULTILINESTRING,
+  mpl  MULTIPOLYGON,
+  gc   GEOMETRYCOLLECTION,
+  g    GEOMETRY
+) CHARACTER SET utf8;
+
+--enable_metadata
+SELECT * FROM t1;
+
+SELECT
+  COALESCE(p) AS p,
+  COALESCE(ls) AS ls,
+  COALESCE(pl) AS pl,
+  COALESCE(mp) AS mp,
+  COALESCE(mls) AS mls,
+  COALESCE(mpl) AS mpl,
+  COALESCE(gc) AS gc,
+  COALESCE(g) AS g
+FROM t1;
+
+SELECT
+  COALESCE(p,p),
+  COALESCE(p,ls),
+  COALESCE(p,pl),
+  COALESCE(p,mp),
+  COALESCE(p,mls),
+  COALESCE(p,mpl),
+  COALESCE(p,g),
+  COALESCE(p,gc)
+FROM t1;
+
+SELECT
+  COALESCE(ls,p),
+  COALESCE(ls,ls),
+  COALESCE(ls,pl),
+  COALESCE(ls,mp),
+  COALESCE(ls,mls),
+  COALESCE(ls,mpl),
+  COALESCE(ls,g),
+  COALESCE(ls,gc)
+FROM t1;
+
+SELECT
+  COALESCE(pl,p),
+  COALESCE(pl,ls),
+  COALESCE(pl,pl),
+  COALESCE(pl,mp),
+  COALESCE(pl,mls),
+  COALESCE(pl,mpl),
+  COALESCE(pl,g),
+  COALESCE(pl,gc)
+FROM t1;
+
+SELECT
+  COALESCE(mp,p),
+  COALESCE(mp,ls),
+  COALESCE(mp,pl),
+  COALESCE(mp,mp),
+  COALESCE(mp,mls),
+  COALESCE(mp,mpl),
+  COALESCE(mp,g),
+  COALESCE(mp,gc)
+FROM t1;
+
+SELECT
+  COALESCE(mls,p),
+  COALESCE(mls,ls),
+  COALESCE(mls,pl),
+  COALESCE(mls,mp),
+  COALESCE(mls,mls),
+  COALESCE(mls,mpl),
+  COALESCE(mls,g),
+  COALESCE(mls,gc)
+FROM t1;
+
+SELECT
+  COALESCE(mpl,p),
+  COALESCE(mpl,ls),
+  COALESCE(mpl,pl),
+  COALESCE(mpl,mp),
+  COALESCE(mpl,mls),
+  COALESCE(mpl,mpl),
+  COALESCE(mpl,g),
+  COALESCE(mpl,gc)
+FROM t1;
+
+SELECT
+  COALESCE(g,p),
+  COALESCE(g,ls),
+  COALESCE(g,pl),
+  COALESCE(g,mp),
+  COALESCE(g,mls),
+  COALESCE(g,mpl),
+  COALESCE(g,g),
+  COALESCE(g,gc)
+FROM t1;
+
+SELECT
+  COALESCE(gc,p),
+  COALESCE(gc,ls),
+  COALESCE(gc,pl),
+  COALESCE(gc,mp),
+  COALESCE(gc,mls),
+  COALESCE(gc,mpl),
+  COALESCE(gc,g),
+  COALESCE(gc,gc)
+FROM t1;
+
+--disable_metadata
+DROP TABLE t1;
+
+--echo #
 --echo # End of 10.5 tests
 --echo #