diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2018-03-11 23:46:33 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2018-03-11 23:46:33 +0100 |
| commit | f9cf2df077f0f680f807c00b142971601ca4bb6f (patch) | |
| tree | 0417b760e4d1ed120f21d0ed809cc35b9c649981 /storage/connect/global.h | |
| parent | 175ce0e7f58794b5dfc4e64557072c75bffe58a4 (diff) | |
| download | mariadb-git-f9cf2df077f0f680f807c00b142971601ca4bb6f.tar.gz | |
- Fix MDEV-15429 CONNECT engine JDBC handling Postgresql UUID type
Also handle Postgresql sending type VARCHAR for TEXT column and
setting length to b x7FFFFFF when the length is unknown.
modified: storage/connect/Client.java
modified: storage/connect/JavaWrappers.jar
modified: storage/connect/JdbcInterface.java
modified: storage/connect/PostgresqlInterface.java
modified: storage/connect/global.h
modified: storage/connect/ha_connect.cc
modified: storage/connect/jdbconn.cpp
modified: storage/connect/jdbconn.h
modified: storage/connect/mysql-test/connect/r/jdbc_postgresql.result
modified: storage/connect/mysql-test/connect/t/jdbc_postgresql.test
modified: storage/connect/mysql-test/connect/t/jdbconn.inc
modified: storage/connect/plgdbsem.h
modified: storage/connect/tabjdbc.cpp
modified: storage/connect/tabjdbc.h
Diffstat (limited to 'storage/connect/global.h')
| -rw-r--r-- | storage/connect/global.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/storage/connect/global.h b/storage/connect/global.h index d8d03f606ba..472d09408c3 100644 --- a/storage/connect/global.h +++ b/storage/connect/global.h @@ -220,7 +220,6 @@ DllExport BOOL PlugIsAbsolutePath(LPCSTR path); DllExport bool AllocSarea(PGLOBAL, uint); DllExport void FreeSarea(PGLOBAL); DllExport BOOL PlugSubSet(PGLOBAL, void *, uint); - void *PlugSubAlloc(PGLOBAL, void *, size_t); // Does throw DllExport char *PlugDup(PGLOBAL g, const char *str); DllExport void *MakePtr(void *, OFFSET); DllExport void htrc(char const *fmt, ...); @@ -231,4 +230,9 @@ DllExport uint GetTraceValue(void); } // extern "C" #endif +/***********************************************************************/ +/* Non exported routine declarations. */ +/***********************************************************************/ +void *PlugSubAlloc(PGLOBAL, void *, size_t); // Does throw + /*-------------------------- End of Global.H --------------------------*/ |