diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2017-05-03 10:32:01 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2017-05-03 10:32:01 +0200 |
| commit | 1de6440a2e441e7aeffe85ee9c72e1e001fcf38d (patch) | |
| tree | 12d3bcf508b354fd5095aa9ee36e682ac827d6aa /storage/connect/plgdbutl.cpp | |
| parent | 63b7d9d1586336a61d6de7fbdcdfbc72e6117f93 (diff) | |
| download | mariadb-git-1de6440a2e441e7aeffe85ee9c72e1e001fcf38d.tar.gz | |
Fix MDEV-12587 MariaDB CONNECT DIR Type
- Subfolder Option: SELECT Query Never Ends
modified: storage/connect/tabmul.cpp
modified: storage/connect/tabmul.h
Work on MDEV-12667 Crash when using JSON tables
modified: storage/connect/connect.cc
modified: storage/connect/ha_connect.cc
modified: storage/connect/ha_connect.h
modified: storage/connect/plgdbutl.cpp
Change Base offset for DIR tables on Linux
modified: storage/connect/reldef.cpp
Diffstat (limited to 'storage/connect/plgdbutl.cpp')
| -rw-r--r-- | storage/connect/plgdbutl.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/connect/plgdbutl.cpp b/storage/connect/plgdbutl.cpp index 299332f51b4..eef9fba44f5 100644 --- a/storage/connect/plgdbutl.cpp +++ b/storage/connect/plgdbutl.cpp @@ -412,8 +412,9 @@ char *SetPath(PGLOBAL g, const char *path) if (path) { size_t len= strlen(path) + (*path != '.' ? 4 : 1); - buf= (char*)PlugSubAlloc(g, NULL, len); - + if (!(buf = (char*)PlgDBSubAlloc(g, NULL, len))) + return NULL; + if (PlugIsAbsolutePath(path)) { strcpy(buf, path); return buf; |