--- sql/oracle/parser3oracle.C 2012/06/15 09:09:33 1.77 +++ sql/oracle/parser3oracle.C 2015/10/26 16:00:50 1.79 @@ -1,7 +1,7 @@ /** @file Parser Oracle driver. - Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) @@ -14,7 +14,7 @@ #include -volatile const char * IDENT_PARSER3ORACLE_C="$Id: parser3oracle.C,v 1.77 2012/06/15 09:09:33 moko Exp $" IDENT_PA_SQL_DRIVER_H; +volatile const char * IDENT_PARSER3ORACLE_C="$Id: parser3oracle.C,v 1.79 2015/10/26 16:00:50 moko Exp $" IDENT_PA_SQL_DRIVER_H; #define MAX_COLS 500 #define MAX_IN_LOBS 5 @@ -268,10 +268,10 @@ public: const char *initialize(char *dlopen_file_spec) { char *options=lsplit(dlopen_file_spec, '?'); - const char *error=dlopen_file_spec? - dlink(dlopen_file_spec):"client library column is empty"; + const char *error=options2env(options, 0); + if(!error) { - error=options2env(options, 0); + error=dlopen_file_spec ? dlink(dlopen_file_spec) : "client library column is empty"; if(!error) OCIInitialize((ub4)OCI_THREADED/*| OCI_OBJECT*/, (dvoid *)0,