summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bind.c2
-rw-r--r--bind.h2
-rw-r--r--convert.c7
-rw-r--r--execute.c2
-rw-r--r--statement.c4
5 files changed, 8 insertions, 9 deletions
diff --git a/bind.c b/bind.c
index cb53087..e644df0 100644
--- a/bind.c
+++ b/bind.c
@@ -362,7 +362,7 @@ inolog("howTo=%d\n", SC_get_prepare_method(stmt));
case NAMED_PARSE_REQUEST:
case PARSE_TO_EXEC_ONCE:
case PARSE_REQ_FOR_INFO:
- if (ret = prepareParameters(stmt, TRUE), SQL_ERROR == ret)
+ if (ret = prepareParameters(stmt), SQL_ERROR == ret)
goto cleanup;
}
}
diff --git a/bind.h b/bind.h
index 4ae575e..ea447d0 100644
--- a/bind.h
+++ b/bind.h
@@ -111,7 +111,7 @@ void reset_a_putdata_info(PutDataInfo *pdata, int ipar);
void PDATA_free_params(PutDataInfo *pdata, char option);
void SC_param_next(const StatementClass*, int *param_number, ParameterInfoClass **, ParameterImplClass **);
-RETCODE prepareParameters(StatementClass *stmt, BOOL sync);
+RETCODE prepareParameters(StatementClass *stmt);
int decideHowToPrepare(StatementClass *stmt, BOOL force);
#endif
diff --git a/convert.c b/convert.c
index 6bc833c..24789c6 100644
--- a/convert.c
+++ b/convert.c
@@ -2600,7 +2600,6 @@ Prepare_and_convert(StatementClass *stmt, QueryParse *qp, QueryBuild *qb)
ConnectionClass *conn = SC_get_conn(stmt);
ConnInfo *ci = &(conn->connInfo);
BOOL discardOutput, outpara;
- BOOL sync = FALSE;
if (PROTOCOL_74(ci))
{
@@ -2616,7 +2615,7 @@ Prepare_and_convert(StatementClass *stmt, QueryParse *qp, QueryBuild *qb)
if (QB_initialize(qb, qp->stmt_len, stmt, NULL) < 0)
return SQL_ERROR;
if (PROTOCOL_74(ci))
- return prep_params(stmt, qp, qb, sync);
+ return prep_params(stmt, qp, qb, FALSE);
discardOutput = (0 != (qb->flags & FLGB_DISCARD_OUTPUT));
if (NOT_YET_PREPARED == stmt->prepared) /* not yet prepared */
{
@@ -2849,7 +2848,7 @@ cleanup:
return retval;
}
-RETCODE prepareParameters(StatementClass *stmt, BOOL sync)
+RETCODE prepareParameters(StatementClass *stmt)
{
switch (stmt->prepared)
{
@@ -2864,7 +2863,7 @@ inolog("prepareParameters\n");
qb = &query_crt;
if (QB_initialize(qb, qp->stmt_len, stmt, NULL) < 0)
return SQL_ERROR;
- return prep_params(stmt, qp, qb, sync);
+ return prep_params(stmt, qp, qb, TRUE);
}
return SQL_SUCCESS;
}
diff --git a/execute.c b/execute.c
index 5909f2f..fc05317 100644
--- a/execute.c
+++ b/execute.c
@@ -1046,7 +1046,7 @@ PGAPI_Execute(HSTMT hstmt, UWORD flag)
switch (nCallParse = HowToPrepareBeforeExec(stmt, TRUE))
{
case shouldParse:
- if (retval = prepareParameters(stmt, TRUE), SQL_ERROR == retval)
+ if (retval = prepareParameters(stmt), SQL_ERROR == retval)
goto cleanup;
break;
}
diff --git a/statement.c b/statement.c
index 53f700b..7af103f 100644
--- a/statement.c
+++ b/statement.c
@@ -1116,11 +1116,11 @@ SC_pre_execute(StatementClass *self)
{
case NAMED_PARSE_REQUEST:
case PARSE_TO_EXEC_ONCE:
- if (SQL_SUCCESS != prepareParameters(self, TRUE))
+ if (SQL_SUCCESS != prepareParameters(self))
return num_fields;
break;
case PARSE_REQ_FOR_INFO:
- if (SQL_SUCCESS != prepareParameters(self, TRUE))
+ if (SQL_SUCCESS != prepareParameters(self))
return num_fields;
self->status = STMT_PREMATURE;
self->inaccurate_result = TRUE;