mirror of
https://github.com/postgres/postgres.git
synced 2025-07-14 08:21:07 +03:00
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...
This commit is contained in:
@ -1206,7 +1206,7 @@ index_reloptions(RegProcedure amoptions, Datum reloptions, bool validate)
|
||||
/* Can't use OidFunctionCallN because we might get a NULL result */
|
||||
fmgr_info(amoptions, &flinfo);
|
||||
|
||||
InitFunctionCallInfoData(fcinfo, &flinfo, 2, NULL, NULL);
|
||||
InitFunctionCallInfoData(fcinfo, &flinfo, 2, InvalidOid, NULL, NULL);
|
||||
|
||||
fcinfo.arg[0] = reloptions;
|
||||
fcinfo.arg[1] = BoolGetDatum(validate);
|
||||
|
Reference in New Issue
Block a user