On Wed, February 26, 2014 23:10, Andrew Dunstan wrote: > > new patch attached, change pushed to github. > > [jsonb-13.patch.gz] >
This does not apply, see attached: src/backend/utils/adt/jsonfuncs.c.rej Please ignore if this was not supposed to work together with the earlier nested-hstore-11.patch github branch jsonb_and_hstore built fine; I'll use that instead. ( https://github.com/feodor/postgres.git ) thanks, Erik Rijkers patch -b -l -F 25 -p 1 < /home/aardvark/download/pgpatches/0094/nested_hstore/20140225/jsonb-13.patch patching file doc/src/sgml/datatype.sgml patching file doc/src/sgml/func.sgml patching file src/backend/catalog/system_views.sql Hunk #1 succeeded at 822 (offset 3 lines). patching file src/backend/utils/adt/Makefile patching file src/backend/utils/adt/json.c patching file src/backend/utils/adt/jsonb.c patching file src/backend/utils/adt/jsonb_support.c patching file src/backend/utils/adt/jsonfuncs.c Hunk #20 succeeded at 1419 with fuzz 2 (offset 4 lines). Hunk #21 succeeded at 1691 (offset 4 lines). Hunk #22 succeeded at 1843 (offset 4 lines). Hunk #23 succeeded at 1940 (offset 4 lines). Hunk #24 succeeded at 2013 (offset 4 lines). Hunk #25 succeeded at 2035 (offset 4 lines). Hunk #26 succeeded at 2054 (offset 4 lines). Hunk #27 FAILED at 2090. Hunk #28 succeeded at 2129 (offset 10 lines). Hunk #29 succeeded at 2200 (offset 10 lines). Hunk #30 succeeded at 2211 (offset 10 lines). Hunk #31 succeeded at 2236 (offset 10 lines). Hunk #32 succeeded at 2252 (offset 10 lines). Hunk #33 succeeded at 2263 (offset 10 lines). Hunk #34 succeeded at 2461 (offset 10 lines). Hunk #35 succeeded at 2606 (offset 10 lines). Hunk #36 succeeded at 2619 (offset 10 lines). Hunk #37 FAILED at 2644. Hunk #38 succeeded at 2692 (offset 14 lines). Hunk #39 succeeded at 2702 (offset 14 lines). Hunk #40 succeeded at 2730 (offset 14 lines). 2 out of 40 hunks FAILED -- saving rejects to file src/backend/utils/adt/jsonfuncs.c.rej patching file src/include/catalog/pg_cast.h patching file src/include/catalog/pg_operator.h patching file src/include/catalog/pg_proc.h patching file src/include/catalog/pg_type.h patching file src/include/utils/json.h patching file src/include/utils/jsonapi.h patching file src/include/utils/jsonb.h patching file src/test/regress/expected/jsonb.out patching file src/test/regress/expected/jsonb_1.out patching file src/test/regress/parallel_schedule patching file src/test/regress/serial_schedule patching file src/test/regress/sql/jsonb.sql
jsonfuncs.c.rej
Description: application/reject
-- Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers
