diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2016-05-12 23:08:22 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2016-05-12 23:08:22 +0200 |
| commit | 5af076e564602559158db38a69a9cb4a09537986 (patch) | |
| tree | 4acb32d38b0bcc1c73556e4078d3f45b46a7532d /storage/connect/reldef.cpp | |
| parent | 26adbb2dd50db0d62e6f7f5d12bdab0cd3a0bf31 (diff) | |
| download | mariadb-git-5af076e564602559158db38a69a9cb4a09537986.tar.gz | |
Add all changes made on 10.1
Diffstat (limited to 'storage/connect/reldef.cpp')
| -rw-r--r-- | storage/connect/reldef.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/storage/connect/reldef.cpp b/storage/connect/reldef.cpp index e455bc8f1a5..2c8ada52e6f 100644 --- a/storage/connect/reldef.cpp +++ b/storage/connect/reldef.cpp @@ -305,7 +305,7 @@ int TABDEF::GetColCatInfo(PGLOBAL g) case TAB_OEM: poff = 0; // Offset represents an independant flag break; - default: // VCT PLG ODBC MYSQL WMI... + default: // VCT PLG ODBC JDBC MYSQL WMI... poff = 0; // NA break; } // endswitch tc @@ -514,10 +514,11 @@ PTABDEF OEMDEF::GetXdef(PGLOBAL g) } // endif getdef #else // !__WIN__ const char *error = NULL; - Dl_info dl_info; #if 0 // Don't know what all this stuff does - // The OEM lib must retrieve exported CONNECT variables + Dl_info dl_info; + + // The OEM lib must retrieve exported CONNECT variables if (dladdr(&connect_hton, &dl_info)) { if (dlopen(dl_info.dli_fname, RTLD_NOLOAD | RTLD_NOW | RTLD_GLOBAL) == 0) { error = dlerror(); |