diff options
author | Olivier Bertrand <bertrandop@gmail.com> | 2016-11-06 14:57:27 +0100 |
---|---|---|
committer | Olivier Bertrand <bertrandop@gmail.com> | 2016-11-06 14:57:27 +0100 |
commit | 5884aa15d40b4dcc6de5cbcf276200c5fcbac938 (patch) | |
tree | b3d35755ee6f0acf2cab877130df1a39daff0b3c /storage/connect/ApacheInterface.java | |
parent | b7aee7dbe71cf77199e28e905469f0d9fb6d4a80 (diff) | |
download | mariadb-git-5884aa15d40b4dcc6de5cbcf276200c5fcbac938.tar.gz |
- Fix MDEV-11234. Escape quoting character. Should be doubled.
Now it is also possible to escape it by a backslash.
modified: storage/connect/tabfmt.cpp
- Prepare making VEC table type support conditional.
VEC tables might be unsupported in future versions
modified: storage/connect/CMakeLists.txt
modified: storage/connect/mycat.cc
modified: storage/connect/reldef.cpp
modified: storage/connect/xindex.cpp
- MDEV-11067 suggested to add configuration support to the Apache wrapper.
Was added but commented out until prooved it is really useful.
modified: storage/connect/ApacheInterface.java
modified: storage/connect/ha_connect.cc
modified: storage/connect/jdbccat.h
modified: storage/connect/jdbconn.cpp
modified: storage/connect/jdbconn.h
modified: storage/connect/tabjdbc.cpp
modified: storage/connect/tabjdbc.h
- Remove useless members.
modified: storage/connect/jdbconn.cpp
modified: storage/connect/jdbconn.h
- New UDF countin.
modified: storage/connect/jsonudf.cpp
modified: storage/connect/jsonudf.h
Diffstat (limited to 'storage/connect/ApacheInterface.java')
-rw-r--r-- | storage/connect/ApacheInterface.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/storage/connect/ApacheInterface.java b/storage/connect/ApacheInterface.java index b4c8a4e9885..47b46dc0506 100644 --- a/storage/connect/ApacheInterface.java +++ b/storage/connect/ApacheInterface.java @@ -35,7 +35,10 @@ public class ApacheInterface extends JdbcInterface { ds.setPassword(parms[3]); pool.put(url, ds); } // endif ds - + + // if (parms.length > 4 && parms[4] != null) + // ds.setConnectionProperties(parms[4]); + // Get a connection from the data source conn = ds.getConnection(); |