diff options
| author | Tom Lane | 2011-04-12 23:19:24 +0000 |
|---|---|---|
| committer | Tom Lane | 2011-04-12 23:19:24 +0000 |
| commit | d64713df7e5996ab3ab337b5e0901cf2c53773f9 (patch) | |
| tree | 7105a61bf9fef5cef674cea7f1305dfeb77aa39a /contrib/btree_gin | |
| parent | 88543ecfec9c754b5f14b898bccbc68d941748b3 (diff) | |
Pass collations to functions in FunctionCallInfoData, not FmgrInfo.
Since collation is effectively an argument, not a property of the function,
FmgrInfo is really the wrong place for it; and this becomes critical in
cases where a cached FmgrInfo is used for varying purposes that might need
different collation settings. Fix by passing it in FunctionCallInfoData
instead. In particular this allows a clean fix for bug #5970 (record_cmp
not working). This requires touching a bit more code than the original
method, but nobody ever thought that collations would not be an invasive
patch...
Diffstat (limited to 'contrib/btree_gin')
| -rw-r--r-- | contrib/btree_gin/btree_gin.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/btree_gin/btree_gin.c b/contrib/btree_gin/btree_gin.c index 144f6db1846..7ca153e0928 100644 --- a/contrib/btree_gin/btree_gin.c +++ b/contrib/btree_gin/btree_gin.c @@ -121,7 +121,7 @@ gin_compare_prefix_##type(PG_FUNCTION_ARGS) \ int32 res, \ cmp; \ \ - cmp = DatumGetInt32(DirectFunctionCall2WithCollation( \ + cmp = DatumGetInt32(DirectFunctionCall2Coll( \ TypeInfo_##type.typecmp, \ DEFAULT_COLLATION_OID, \ (data->strategy == BTLessStrategyNumber || \ |