Repository: incubator-trafodion Updated Branches: refs/heads/master 151212323 -> e115a3320
[TRAFODION-2094] Truncate option slow in ODB Misplaced paranthesis caused ODB to not recognize Trafodion database. We were going through the generic codepath. Also made some changes to remove/suppress compiler warnings. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/7166c64d Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/7166c64d Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/7166c64d Branch: refs/heads/master Commit: 7166c64db17e3b5f457b55dc1c491a01b070dcbc Parents: 5e8c5f2 Author: Suresh Subbiah <[email protected]> Authored: Tue Jul 5 21:42:26 2016 +0000 Committer: Suresh Subbiah <[email protected]> Committed: Tue Jul 5 21:42:26 2016 +0000 ---------------------------------------------------------------------- core/conn/odb/Makefile | 2 +- core/conn/odb/src/odb.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7166c64d/core/conn/odb/Makefile ---------------------------------------------------------------------- diff --git a/core/conn/odb/Makefile b/core/conn/odb/Makefile index 974e92e..62016e1 100644 --- a/core/conn/odb/Makefile +++ b/core/conn/odb/Makefile @@ -29,7 +29,7 @@ include $(MY_SQROOT)/macros.gmk #top level # Standard Linux flags #-------------------------------------------------------------------------- CFLAGS_LNX = -rdynamic -pipe -pthread \ - -fomit-frame-pointer -pedantic -Wall -Wextra -Wshadow \ + -fomit-frame-pointer -pedantic -Wall -Wextra \ -Wno-missing-field-initializers -Wformat=2 \ -Wunused -Wpragmas -Wstack-protector -Wcast-qual \ -Wl,-allow-shlib-undefined \ http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7166c64d/core/conn/odb/src/odb.c ---------------------------------------------------------------------- diff --git a/core/conn/odb/src/odb.c b/core/conn/odb/src/odb.c index c37196b..f3d0aed 100644 --- a/core/conn/odb/src/odb.c +++ b/core/conn/odb/src/odb.c @@ -139,6 +139,7 @@ char *odbauth = "Trafodion Dev <[email protected]>"; #include <unistd.h> #define SIZET_SPEC "%zu" #include <pthread.h> + #include <strings.h> #ifdef __hpux #define Sleep(x) \ if ( x > 1000 ) { \ @@ -12394,6 +12395,7 @@ static unsigned int checkdb(int eid, SQLHDBC *Ocn, char *c, char *s) Oerr(eid, tid, __LINE__, Ostmt, SQL_HANDLE_STMT); if (!SQL_SUCCEEDED(Oret=SQLFetch(Ostmt))) Oerr(eid, tid, __LINE__, Ostmt, SQL_HANDLE_STMT); + } } else if ( !strcmp((char *)Obuff, dbscmds[8].dbname) ) { /* Trafodion */ dbt = 8; @@ -12413,7 +12415,6 @@ static unsigned int checkdb(int eid, SQLHDBC *Ocn, char *c, char *s) } } } - } /* If this is the Interpreter get the object types list */ if ( eid >= 0 && etab[eid].type == 'I' ) {
