${INSTALL_PLUGIN_DIR} --> ${INSTALL_PLUGINDIR}
  modified:   storage/connect/CMakeLists.txt

- Try several paths when looking for JVM lib
  modified:   storage/connect/jdbconn.cpp

- Make Jdbc tests running on Windows and Linux
  modified:   storage/connect/mysql-test/connect/r/jdbc.result
  modified:   storage/connect/mysql-test/connect/r/jdbc_new.result
  modified:   storage/connect/mysql-test/connect/t/jdbc.test
  modified:   storage/connect/mysql-test/connect/t/jdbc_new.test

- Fix compiler's warnings
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/jdbconn.cpp
  modified:   storage/connect/jsonudf.cpp

  MySQL and MariaDB drivers use catalog for schema
  modified:   storage/connect/JdbcInterface.java

- Jdbc temporal fields now return time in seconds
  modified:   storage/connect/JdbcInterface.java
  modified:   storage/connect/jdbconn.cpp
  modified:   storage/connect/jdbconn.h

- Recognize JDBC temporal types
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/jdbconn.cpp

- Test validity of URL
  modified:   storage/connect/ApacheInterface.java
  modified:   storage/connect/JdbcInterface.java
  modified:   storage/connect/MariadbInterface.java
  modified:   storage/connect/MysqlInterface.java
  modified:   storage/connect/OracleInterface.java
  modified:   storage/connect/PostgresqlInterface.java

- Java class files are no more distributed
  A JdbcInterface.jar file is now compiled
  modified:   storage/connect/CMakeLists.txt
  deleted:    storage/connect/wrappers/ApacheInterface.class
  deleted:    storage/connect/wrappers/Client.class
  deleted:    storage/connect/wrappers/JdbcInterface.class
  deleted:    storage/connect/wrappers/MariadbInterface.class
  deleted:    storage/connect/wrappers/MysqlInterface.class
  deleted:    storage/connect/wrappers/OracleInterface.class
  deleted:    storage/connect/wrappers/PostgresqlInterface.class

- Try to find the JVM path using JAVA_HOME or registers (Windows)
  modified:   storage/connect/jdbconn.cpp

- Add Monty's patches
  modified:   storage/connect/connect.h
  modified:   storage/connect/csort.cpp
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/jsonudf.cpp

-Change connect_java_wrapper variable from GLOBAL to SESSION
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/jdbconn.cpp

- Modify the tests to be able to run at least jdbc and jdbc_new
  modified:   storage/connect/mysql-test/connect/disabled.def
  modified:   storage/connect/mysql-test/connect/r/jdbc.result
  modified:   storage/connect/mysql-test/connect/r/jdbc_new.result
  modified:   storage/connect/mysql-test/connect/t/jdbc.test
  modified:   storage/connect/mysql-test/connect/t/jdbc_new.test
  modified:   storage/connect/mysql-test/connect/t/jdbconn.inc
  modified:   storage/connect/mysql-test/connect/t/jdbconn_cleanup.inc
  added:      storage/connect/mysql-test/connect/std_data/JdbcMariaDB.jar

  modified:   storage/connect/CMakeLists.txt

  deleted:    storage/connect/JdbcApacheInterface.class
  deleted:    storage/connect/JdbcApacheInterface.java
  deleted:    storage/connect/JdbcDSInterface.class
  deleted:    storage/connect/JdbcDSInterface.java
  modified:   storage/connect/JdbcInterface.java
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/jdbconn.cpp
  modified:   storage/connect/jdbconn.h
  modified:   storage/connect/tabjdbc.cpp
  modified:   storage/connect/tabjdbc.h
  added:      storage/connect/ApacheInterface.java
  added:      storage/connect/Client.java
  added:      storage/connect/JdbcInterface.jar
  added:      storage/connect/MariadbInterface.java
  added:      storage/connect/MysqlInterface.java
  added:      storage/connect/OracleInterface.java
  added:      storage/connect/PostgresqlInterface.java
  added:      storage/connect/wrappers/ApacheInterface.class
  added:      storage/connect/wrappers/Client.class
  added:      storage/connect/wrappers/JdbcInterface.class
  added:      storage/connect/wrappers/MariadbInterface.class
  added:      storage/connect/wrappers/MysqlInterface.class
  added:      storage/connect/wrappers/OracleInterface.class
  added:      storage/connect/wrappers/PostgresqlInterface.class

  modified:   storage/connect/odbconn.h

- Remove java compiling of JdbcInterface that caused failed compile
  on BuildBot Labrador site
  modified:   storage/connect/CMakeLists.txt

- Remove unused define of MAX_CONNECT_LEN
  modified:   storage/connect/jdbconn.h

  modified:   storage/connect/jdbconn.cpp

- Add java compiling of JdbcInterface
  modified:   storage/connect/CMakeLists.txt

  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/jdbconn.cpp
  modified:   storage/connect/jdbconn.h
  modified:   storage/connect/odbccat.h
  modified:   storage/connect/odbconn.cpp
  modified:   storage/connect/tabjdbc.cpp
  modified:   storage/connect/tabjdbc.h
  modified:   storage/connect/tabodbc.cpp
  modified:   storage/connect/tabodbc.h

- Avoid longjump in AllocCatInfo functions
  modified:   storage/connect/jdbconn.cpp
  modified:   storage/connect/jdbconn.h
  modified:   storage/connect/odbconn.cpp

- Change GetColumns error return value from 0 to -1
  modified:   storage/connect/JdbcInterface.class
  modified:   storage/connect/JdbcInterface.java

Fixed mysql-test-run failures for roles.acl_statistics

  modified:   storage/connect/tabtbl.cpp

- Add trace and make m_Stmt conditional
  modified:   storage/connect/myconn.cpp
  modified:   storage/connect/myconn.h

- Protect trace from null string (for Linux)
  modified:   storage/connect/tabcol.cpp

- Record error changes
  modified:   storage/connect/mysql-test/connect/r/jdbc_new.result

- Typo
  modified:   storage/connect/jdbconn.cpp
  modified:   storage/connect/jsonudf.cpp

The check inserts a DWARF directive to tell stack unwinding that the
bottom of the (co-routine) stack has been reached. Without this, stack
traces may attempt to continue past the bottom of the stack.

The GCC version check was incorrect, and failed to trigger for GCC
version 5.[0123].

On Windows with low precision  (10-16 ms) timer used for timing queries,
the statement "set @@long_query_time=0.01" can log itself a slow if it
spawn more single timer tick.

The fix is to filter this query out  from "SELECT FROM mysql.slow_log"
results

Make the range optimizer not call records_in_range() when it would
not give any benefit.

  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/myconn.cpp

- Fix MDEV-10136 crash on SELECT jsonget_string(NULL, 'a')
  modified:   storage/connect/jsonudf.cpp

- Assert longjmp initialized when suballocating
  modified:   storage/connect/plugutil.c

- Avoid crash in MakeRecord when table->vcol_set isnull (trace > 1)
  modified:   storage/connect/ha_connect.cc

Part #2: make tree_or(tree1, tree2) to reuse tree1 for the result object
for simple cases. These include key IN (c1, ... cN).

The reuse was happening in old MySQL versions, but we stopped doing it
in the "fair choice between range and index_merge" patch.

MDEV-10154 - Remove some unnecessary parentheses

Post-fix #2:
- Update test results
- Make the optimization conditional under @@optimizer_switch flag.
- The optimization is now disabled by default, so .result files
  are changed back to be what they were before the MDEV-8989 patch.

Add big_test and not_debug requirements to avoid timeouts.

Fix spelling: shhould -> should

A partial backport of 67f21fb3a077dedfd14b9ca720e926c55e682f93,
Bug#22283790: RANGE OPTIMIZER UTILIZES TOO MUCH MEMORY WITH MANY OR CONDITIONS

The backported part changes SEL_TREE::keys from being an array of
MAX_KEY elements (64*8=512 bytes) to a Mem_root_array<SEL_ARG*> (32 bytes +
alloc'ed array of as many elements as we need).

The patch doesn't fix the "not limiting memory" part, but the memory usage
is much lower with it.

utf8mb4_thai_520_w2, ucs2_thai_520_w2, utf16_thai_520_w2, utf32_thai_520_w2

  from ctype_uca.test. This is to reuse ctype_thai.inc for other Unicode
  character sets later
- Removing separate ctype_uca.result

  and including it from t/ctype_uca.test
- Deleting r/ctype_uca_th.result

They have bytes 0x25 and 0x5F. Testing that these bytes are treated as parts
of multi-byte characters rather than underscore and percent sign.

Mark gssapi plugin as stable. No open bug reports, and no further work planned, thus stable is accurate

Post-fix: add comments, remove dead-code.

- Changing strnxfrm_multiply from 8 to 4, as agreed with Pruet Boonma
- Adjusting tests

  modified:   storage/connect/jdbconn.cpp

- Add the global variable connect_java_wrapper
  This enables to use different wrappers
  modified:   storage/connect/CMakeLists.txt
  renamed:    storage/connect/java/ap/JdbcInterface.class -> storage/connect/JdbcApacheInterface.class
  renamed:    storage/connect/java/ap/JdbcInterface.java -> storage/connect/JdbcApacheInterface.java
  renamed:    storage/connect/java/ds/JdbcInterface.class -> storage/connect/JdbcDSInterface.class
  renamed:    storage/connect/java/ds/JdbcInterface.java -> storage/connect/JdbcDSInterface.java
  modified:   storage/connect/ha_connect.cc
  deleted:    storage/connect/java/std/JdbcInterface.class
  deleted:    storage/connect/java/std/JdbcInterface.java
  modified:   storage/connect/jdbconn.cpp
  modified:   storage/connect/jdbconn.h

- Add JDBC tests (disabled)
  modified:   storage/connect/mysql-test/connect/disabled.def
  new file:   storage/connect/mysql-test/connect/r/jdbc.result
  new file:   storage/connect/mysql-test/connect/r/jdbc_new.result
  new file:   storage/connect/mysql-test/connect/r/jdbc_oracle.result
  new file:   storage/connect/mysql-test/connect/r/jdbc_postgresql.result
  new file:   storage/connect/mysql-test/connect/std_data/girls.txt
  new file:   storage/connect/mysql-test/connect/t/jdbc.test
  new file:   storage/connect/mysql-test/connect/t/jdbc_new.test
  new file:   storage/connect/mysql-test/connect/t/jdbc_oracle.test
  new file:   storage/connect/mysql-test/connect/t/jdbc_postgresql.test
  new file:   storage/connect/mysql-test/connect/t/jdbconn.inc
  new file:   storage/connect/mysql-test/connect/t/jdbconn_cleanup.inc

- Typo
  modified:   storage/connect/jsonudf.cpp

  modified:   storage/connect/jsonudf.cpp
  modified:   storage/connect/mysql-test/connect/disabled.def