diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2011-03-26 18:28:40 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2011-03-26 18:28:40 -0400 |
| commit | 7208fae18f1fdb242b4fcced77a3b836e15ac3ec (patch) | |
| tree | e857033e3c74a3f73de3e29720290ee721199df3 /src/backend/access/nbtree/nbtsearch.c | |
| parent | 0c9d9e8dd655fff7bcfc401e82838b8c20c16939 (diff) | |
| download | postgresql-7208fae18f1fdb242b4fcced77a3b836e15ac3ec.tar.gz | |
Clean up cruft around collation initialization for tupdescs and scankeys.
I found actual bugs in GiST and plpgsql; the rest of this is cosmetic
but meant to decrease the odds of future bugs of omission.
Diffstat (limited to 'src/backend/access/nbtree/nbtsearch.c')
| -rw-r--r-- | src/backend/access/nbtree/nbtsearch.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c index be8d958352..cb78a1bae1 100644 --- a/src/backend/access/nbtree/nbtsearch.c +++ b/src/backend/access/nbtree/nbtsearch.c @@ -721,10 +721,9 @@ _bt_first(IndexScanDesc scan, ScanDirection dir) cur->sk_attno, InvalidStrategy, cur->sk_subtype, + cur->sk_func.fn_collation, procinfo, cur->sk_argument); - ScanKeyEntryInitializeCollation(scankeys + i, - cur->sk_func.fn_collation); } else { @@ -743,10 +742,9 @@ _bt_first(IndexScanDesc scan, ScanDirection dir) cur->sk_attno, InvalidStrategy, cur->sk_subtype, + cur->sk_func.fn_collation, cmp_proc, cur->sk_argument); - ScanKeyEntryInitializeCollation(scankeys + i, - cur->sk_func.fn_collation); } } } |