You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2018/08/02 17:32:00 UTC
[1/2] trafodion git commit: TRAFODION-3710
Repository: trafodion
Updated Branches:
refs/heads/master 91dc3804f -> d0431cbad
TRAFODION-3710
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/ad4d844b
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/ad4d844b
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/ad4d844b
Branch: refs/heads/master
Commit: ad4d844be6bf85ad264beb8b1f9070df1cfde102
Parents: a52f462
Author: SuJinpei <87...@qq.com>
Authored: Tue Jul 31 16:00:34 2018 +0800
Committer: SuJinpei <87...@qq.com>
Committed: Tue Jul 31 16:00:34 2018 +0800
----------------------------------------------------------------------
core/conn/odb/src/odb.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/ad4d844b/core/conn/odb/src/odb.c
----------------------------------------------------------------------
diff --git a/core/conn/odb/src/odb.c b/core/conn/odb/src/odb.c
index ade3b21..1b04a90 100755
--- a/core/conn/odb/src/odb.c
+++ b/core/conn/odb/src/odb.c
@@ -40,6 +40,7 @@ char *odbauth = "Trafodion Dev <tr...@lists.launchpad.net>";
#define MAX_ARGS 11 /* Max arguments for interactive mode */
#define ARG_LENGTH 128 /* Max argument length in interactive mode */
#define LINE_CHUNK 51200 /* size of memory chunks allocated to store lines */
+#define ERR_MSG_LEN 512 /* size of error message buffer */
#define MAX_VNLEN 32 /* Max variable name length */
#define MAX_PK_COLS 16 /* Max number of PK elements */
#define MAXCOL_LEN 128 /* Max table column name length */
@@ -2864,7 +2865,7 @@ static void setan ( int eid, int tid, int nrag, char *rag[], char *ql )
*/
static void Oerr(int eid, int tid, unsigned int line, SQLHANDLE Ohandle, SQLSMALLINT Otype)
{
- size_t bs=LINE_CHUNK; /* Memory needed for the error message */
+ size_t bs=ERR_MSG_LEN; /* Memory needed for the error message */
SQLSMALLINT Oi=1,
Oln=0;
SQLINTEGER Onat=0;
@@ -9961,7 +9962,7 @@ oloadJson_exit:
*/
static int Oloadbuff(int eid)
{
- size_t embs=LINE_CHUNK; /* Error message buffer size */
+ size_t embs=ERR_MSG_LEN; /* Error message buffer size */
SQLRETURN Or=0; /* ODBC return value */
SQLCHAR Ostate[6]; /* ODBC state */
SQLSMALLINT Oi=1; /* ODBC error index */
[2/2] trafodion git commit: Merge [TRAFODION-3710] PR 1671 Fix odb
bug with error reporting
Posted by db...@apache.org.
Merge [TRAFODION-3710] PR 1671 Fix odb bug with error reporting
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/d0431cba
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/d0431cba
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/d0431cba
Branch: refs/heads/master
Commit: d0431cbaddd0cdb6a61a072d59c4c69a8a929e76
Parents: 91dc380 ad4d844
Author: Dave Birdsall <db...@apache.org>
Authored: Thu Aug 2 17:31:15 2018 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Thu Aug 2 17:31:15 2018 +0000
----------------------------------------------------------------------
core/conn/odb/src/odb.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------