MDEV-13860 CONNECT engine does not build with JDBC without ODBC
MDEV-13860 CONNECT engine does not build with JDBC without ODBC

Re-apply the patch cb1b466c0c3fa72a058fe6462261f70b11d45c53,
the change disappeared after the merge

natsys/mariadb_10.2,natsys/mariadb_10.2,natsys/mariadb_10.2,natsys/mariadb_10.2,natsys/mariadb_10.2,natsys/mariadb_10.2,natsys/mariadb_10.2,natsys/mariadb_10.2,natsys/mariadb_10.2,natsys/mariadb_10.2,natsys/mariadb_10.2