diff options
| author | Tomas Vondra | 2016-03-01 02:36:41 +0000 |
|---|---|---|
| committer | Pavan Deolasee | 2016-10-18 10:00:50 +0000 |
| commit | 0986536e7e497291a932d4d23c15f900adab1142 (patch) | |
| tree | 1c4ff14c9b5e8469114531d6c8d1c06547ff156c | |
| parent | 5c64d19235b700e02f9e114022f62c2373446705 (diff) | |
fix a few violations of ISO C90 (mixed code/declarations)
Interestingly ';;' confuses the compiler enough to emit this warning.
| -rw-r--r-- | src/backend/optimizer/plan/createplan.c | 5 | ||||
| -rw-r--r-- | src/gtm/main/gtm_txn.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c index df11465ed3..f8f952fb54 100644 --- a/src/backend/optimizer/plan/createplan.c +++ b/src/backend/optimizer/plan/createplan.c @@ -1307,8 +1307,11 @@ find_push_down_plan_int(PlannerInfo *root, Plan *plan, bool force, bool delete, */ if ((((Plan *)remote_plan) == subplan) && parent) { + RelOptInfo *rel = NULL; + Assert(root); - RelOptInfo *rel = find_base_rel(root, ((SubqueryScan *)plan)->scan.scanrelid); + + rel = find_base_rel(root, ((SubqueryScan *)plan)->scan.scanrelid); rel->subplan = ((SubqueryScan *)plan)->subplan; } return remote_plan; diff --git a/src/gtm/main/gtm_txn.c b/src/gtm/main/gtm_txn.c index 21d73b8576..ed971351ef 100644 --- a/src/gtm/main/gtm_txn.c +++ b/src/gtm/main/gtm_txn.c @@ -887,7 +887,7 @@ GTM_BkupBeginTransactionMulti(GTM_IsolationLevel *isolevel, GTMProxy_ConnID *connid, int txn_count) { - GTM_TransactionHandle txn[GTM_MAX_GLOBAL_TRANSACTIONS];; + GTM_TransactionHandle txn[GTM_MAX_GLOBAL_TRANSACTIONS]; MemoryContext oldContext; int count; @@ -1393,7 +1393,7 @@ GTM_BkupBeginTransactionGetGXIDMulti(GlobalTransactionId *gxid, GTMProxy_ConnID *connid, int txn_count) { - GTM_TransactionHandle txn[GTM_MAX_GLOBAL_TRANSACTIONS];; + GTM_TransactionHandle txn[GTM_MAX_GLOBAL_TRANSACTIONS]; GTM_TransactionInfo *gtm_txninfo; int ii; int count; |