Merge branch 'jsonb_and_hstore' of github.com:feodor/postgres into jsonb

diff --cc src/backend/utils/adt/jsonb.c
index f4cf1145d08157b1bf3296dc16cea81a52ba3729,d6827ce5506384665de29d0725bda77335ccb8b1..dc84a68eab1fd7cc92bf0177ed6207facf6cdbe0
--- 1/src/backend/utils/adt/jsonb.c
--- 2/src/backend/utils/adt/jsonb.c
+++ b/src/backend/utils/adt/jsonb.c
@@@ -304,10 -301,8 +303,9 @@@ jsonb_in_scalar(void *state, char *toke
        case JSON_TOKEN_NUMBER:
            /*
             * No need to check size of numeric values, because maximum numeric
-            * size is well in excess of the restriction we separately impose
-            * of the size of JsonbValues
+            * size is well below the JsonbValue restriction
             */
 +          Assert (token != NULL);
            v.type = jbvNumeric;
            v.numeric = DatumGetNumeric(DirectFunctionCall3(numeric_in, CStringGetDatum(token), 0, -1));
            v.estSize += VARSIZE_ANY(v.numeric) + sizeof(JEntry) /* alignment */ ;