Merge tag 'REL_15_12' into yb-pg15

In this merge,

- upstream refers to REL_15_12
- YB refers to yb-pg15 branch

Conflicts resolved:

- doc/src/sgml/config.sgml:
  - restrict_nonsystem_relation_kind:
    - YB 1594a0e cherry-picks a commit
      that is superseded by upstream
      886549f.  Take upstream.
- src/backend/tcop/postgres.c:
  - check_restrict_nonsystem_relation_kind:
    - YB 1594a0e cherry-picks a commit
      that is superseded by upstream
      4398507.  Take upstream.
- src/backend/utils/misc/guc.c:
  - restrict_nonsystem_relation_kind:
    - YB 1594a0e cherry-picks a commit
      that is superseded by upstream
      886549f.  Take upstream.
- src/bin/pg_dump/pg_dump.c:
  - getPartitioningInfo:
    - YB 0873a75 cherry-picks a master
      commit that changes uses of dopt->schemaOnly to dopt->dumpData.
      Upstream 2b216da introduces a
      usage of dopt->schemaOnly.  Change it to dopt->dumpData.
  - dumpCollation:
    - YB 4c1654b cherry-picks a commit
      that is superseded by upstream
      3a78844.  Take upstream.
- src/common/jsonapi.c:
  - json_lex_string:
    - declarations: YB d939f91 adds a
      variable declaration; upstream
      8c3f30e adds the same declaration
      in a different location.  Take upstream.
    - else if (*s == '\\'): YB 98849c2
      and d3117fc cherry-pick master
      commits that remove the "else if ((unsigned char) *s < 32)" case;
      upstream 11b5e3e changes code in
      the area to use FAIL_AT_CHAR_START.  Take both.
- src/interfaces/libpq/fe-exec.c:
  - PQescapeInternal:
    - YB 8e4de41 cherry-picks a commit
      that is superseded by upstream
      22ffbbf.  Take upstream.  (There
      are two conflicts resolved for this same reason.)
- src/test/modules/test_escape/test_escape.c:
  - includes:
    - YB 4c15b4f cherry-picks a commit
      that is superseded by upstream
      22ffbbf.  Take upstream.
  - elsewhere:
    - (Same reason x15.)
- src/test/regress/expected/arrays.out:
  - test subscript overflow detection:
    - YB dfe4844 cherry-picks a commit
      that is superseded by upstream
      547dd2c.  Take upstream.
- src/test/regress/parallel_schedule:
  - geometry depends on point, lseg, line, box, path, polygon, circle:
    - YB f885e22 add stats_import test;
      upstream 3c6becd adds database
      test.  Take both in the same order as in master.
- src/test/regress/sql/arrays.sql:
  - test subscript overflow detection:
    - (Same resolution as arrays.out.)
- src/common/wchar.c:
  - In today's multibyte encodings other than UTF8:
    - Merge auto-resolved this area incorrectly to take both YB
      48438ea and upstream
      703b3fd.  Take only one copy.

Tested with

    ./configure --without-icu --enable-debug
    make check
    ( cd doc; make )
    ( cd src/test/isolation; make check )
    ( cd src/test/modules; make check )
    ( cd contrib; make check )

Author: jaki

.cirrus.star

@@ -0,0 +1,63 @@
+"""Additional CI configuration, using the starlark language. See
+https://cirrus-ci.org/guide/programming-tasks/#introduction-into-starlark
+
+See also the starlark specification at
+https://github.com/bazelbuild/starlark/blob/master/spec.md
+
+See also .cirrus.yml and src/tools/ci/README
+"""
+
+load("cirrus", "env", "fs")
+
+
+def main():
+    """The main function is executed by cirrus-ci after loading .cirrus.yml and can
+    extend the CI definition further.
+
+    As documented in .cirrus.yml, the final CI configuration is composed of
+
+    1) the contents of .cirrus.yml
+
+    2) if defined, the contents of the file referenced by the, repository
+       level, REPO_CI_CONFIG_GIT_URL variable (see
+       https://cirrus-ci.org/guide/programming-tasks/#fs for the accepted
+       format)
+
+    3) .cirrus.tasks.yml
+    """
+
+    output = ""
+
+    # 1) is evaluated implicitly
+
+    # Add 2)
+    repo_config_url = env.get("REPO_CI_CONFIG_GIT_URL")
+    if repo_config_url != None:
+        print("loading additional configuration from \"{}\"".format(repo_config_url))
+        output += config_from(repo_config_url)
+    else:
+        output += "\n# REPO_CI_CONFIG_URL was not set\n"
+
+    # Add 3)
+    output += config_from(".cirrus.tasks.yml")
+
+    return output
+
+
+def config_from(config_src):
+    """return contents of config file `config_src`, surrounded by markers
+    indicating start / end of the the included file
+    """
+
+    config_contents = fs.read(config_src)
+    config_fmt = """
+
+###
+# contents of config file `{0}` start here
+###
+{1}
+###
+# contents of config file `{0}` end here
+###
+"""
+    return config_fmt.format(config_src, config_contents)