Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit f89f408

Browse files
dutowdutow
authored
Merge pull request percona#580 from percona/release-17.6.1
Merge back release 17.6.1
2 parents 983dbe7 + 39601ca commit f89f408

File tree

244 files changed

+13143
-6929
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

244 files changed

+13143
-6929
lines changed

‎.cirrus.tasks.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -777,14 +777,11 @@ task:
777777
# - Don't use ccache, the files are uncacheable, polluting ccache's
778778
# cache
779779
# - Use -fmax-errors, as particularly cpluspluscheck can be very verbose
780-
# - XXX have to disable ICU to avoid errors:
781-
# https://postgr.es/m/20220323002024.f2g6tivduzrktgfa%40alap3.anarazel.de
782780
###
783781
always:
784782
headers_headerscheck_script: |
785783
time ./configure \
786784
${LINUX_CONFIGURE_FEATURES} \
787-
--without-icu \
788785
--quiet \
789786
CC="gcc" CXX"=g++" CLANG="clang"
790787
make -s -j${BUILD_JOBS} clean

‎COPYRIGHT‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Percona Server for PostgreSQL - License
2-
(formerly known as Postgres, then as Postgres95)
2+
(also known as Postgres, formerly known as Postgres95)
33

44
This software includes portions copyrighted or made available by:
55
• Percona, LLC and/or its affiliates (collectively, "Percona")

‎ci_scripts/env.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash
22

3-
export PERCONA_SERVER_VERSION=17.5.3
3+
export PERCONA_SERVER_VERSION=17.6.1

‎config/llvm.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# -----------------
55
#
66
# Look for the LLVM installation, check that it's new enough, set the
7-
# corresponding LLVM_{CFLAGS,CXXFLAGS,BINPATH} and LDFLAGS
7+
# corresponding LLVM_{CFLAGS,CXXFLAGS,BINPATH,LIBS}
88
# variables. Also verify that CLANG is available, to transform C
99
# into bitcode.
1010
#
@@ -55,7 +55,7 @@ AC_DEFUN([PGAC_LLVM_SUPPORT],
5555
5656
for pgac_option in `$LLVM_CONFIG --link-static --ldflags`; do
5757
case $pgac_option in
58-
-L*) LDFLAGS="$LDFLAGS $pgac_option";;
58+
-L*) LLVM_LIBS="$LLVM_LIBS $pgac_option";;
5959
esac
6060
done
6161

‎configure‎

Lines changed: 67 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.69 for PostgreSQL 17.5.
3+
# Generated by GNU Autoconf 2.69 for PostgreSQL 17.6.
44
#
55
# Report bugs to <[email protected]>.
66
#
@@ -582,8 +582,8 @@ MAKEFLAGS=
582582
# Identity of this package.
583583
PACKAGE_NAME='PostgreSQL'
584584
PACKAGE_TARNAME='postgresql'
585-
PACKAGE_VERSION='17.5'
586-
PACKAGE_STRING='PostgreSQL 17.5'
585+
PACKAGE_VERSION='17.6'
586+
PACKAGE_STRING='PostgreSQL 17.6'
587587
PACKAGE_BUGREPORT='[email protected]'
588588
PACKAGE_URL='https://www.postgresql.org/'
589589

@@ -1453,7 +1453,7 @@ if test "$ac_init_help" = "long"; then
14531453
# Omit some internal or obsolete options to make the list less imposing.
14541454
# This message is too long to be a string in the A/UX 3.1 sh.
14551455
cat <<_ACEOF
1456-
\`configure' configures PostgreSQL 17.5 to adapt to many kinds of systems.
1456+
\`configure' configures PostgreSQL 17.6 to adapt to many kinds of systems.
14571457

14581458
Usage: $0 [OPTION]... [VAR=VALUE]...
14591459

@@ -1518,7 +1518,7 @@ fi
15181518

15191519
if test -n "$ac_init_help"; then
15201520
case $ac_init_help in
1521-
short | recursive ) echo "Configuration of PostgreSQL 17.5:";;
1521+
short | recursive ) echo "Configuration of PostgreSQL 17.6:";;
15221522
esac
15231523
cat <<\_ACEOF
15241524

@@ -1695,7 +1695,7 @@ fi
16951695
test -n "$ac_init_help" && exit $ac_status
16961696
if $ac_init_version; then
16971697
cat <<\_ACEOF
1698-
PostgreSQL configure 17.5
1698+
PostgreSQL configure 17.6
16991699
generated by GNU Autoconf 2.69
17001700

17011701
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2448,7 +2448,7 @@ cat >config.log <<_ACEOF
24482448
This file contains any messages produced by compilers while
24492449
running configure, to aid debugging if configure makes a mistake.
24502450

2451-
It was created by PostgreSQL $as_me 17.5, which was
2451+
It was created by PostgreSQL $as_me 17.6, which was
24522452
generated by GNU Autoconf 2.69. Invocation command line was
24532453

24542454
$ $0 $@
@@ -2856,7 +2856,7 @@ cat >>confdefs.h <<_ACEOF
28562856
_ACEOF
28572857

28582858

2859-
PG_PERCONAVERSION=3
2859+
PG_PERCONAVERSION=1
28602860

28612861
cat >>confdefs.h <<_ACEOF
28622862
#define PG_PERCONAVERSION "$PG_PERCONAVERSION"
@@ -5225,7 +5225,7 @@ fi
52255225

52265226
for pgac_option in `$LLVM_CONFIG --link-static --ldflags`; do
52275227
case $pgac_option in
5228-
-L*) LDFLAGS="$LDFLAGS $pgac_option";;
5228+
-L*) LLVM_LIBS="$LLVM_LIBS $pgac_option";;
52295229
esac
52305230
done
52315231

@@ -9067,12 +9067,12 @@ fi
90679067
# Note the user could also set XML2_CFLAGS/XML2_LIBS directly
90689068
for pgac_option in $XML2_CFLAGS; do
90699069
case $pgac_option in
9070-
-I*|-D*) CPPFLAGS="$CPPFLAGS $pgac_option";;
9070+
-I*|-D*) INCLUDES="$INCLUDES $pgac_option";;
90719071
esac
90729072
done
90739073
for pgac_option in $XML2_LIBS; do
90749074
case $pgac_option in
9075-
-L*) LDFLAGS="$LDFLAGS $pgac_option";;
9075+
-L*) LIBDIRS="$LIBDIRS $pgac_option";;
90769076
esac
90779077
done
90789078
fi
@@ -9297,12 +9297,12 @@ fi
92979297
# note that -llz4 will be added by AC_CHECK_LIB below.
92989298
for pgac_option in $LZ4_CFLAGS; do
92999299
case $pgac_option in
9300-
-I*|-D*) CPPFLAGS="$CPPFLAGS $pgac_option";;
9300+
-I*|-D*) INCLUDES="$INCLUDES $pgac_option";;
93019301
esac
93029302
done
93039303
for pgac_option in $LZ4_LIBS; do
93049304
case $pgac_option in
9305-
-L*) LDFLAGS="$LDFLAGS $pgac_option";;
9305+
-L*) LIBDIRS="$LIBDIRS $pgac_option";;
93069306
esac
93079307
done
93089308
fi
@@ -9438,12 +9438,12 @@ fi
94389438
# note that -lzstd will be added by AC_CHECK_LIB below.
94399439
for pgac_option in $ZSTD_CFLAGS; do
94409440
case $pgac_option in
9441-
-I*|-D*) CPPFLAGS="$CPPFLAGS $pgac_option";;
9441+
-I*|-D*) INCLUDES="$INCLUDES $pgac_option";;
94429442
esac
94439443
done
94449444
for pgac_option in $ZSTD_LIBS; do
94459445
case $pgac_option in
9446-
-L*) LDFLAGS="$LDFLAGS $pgac_option";;
9446+
-L*) LIBDIRS="$LIBDIRS $pgac_option";;
94479447
esac
94489448
done
94499449
fi
@@ -15419,7 +15419,7 @@ fi
1541915419
LIBS_including_readline="$LIBS"
1542015420
LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
1542115421

15422-
for ac_func in backtrace_symbols copyfile copy_file_range getifaddrs getpeerucred inet_pton kqueue mbstowcs_l memset_s posix_fallocate ppoll pthread_is_threaded_np setproctitle setproctitle_fast strsignal syncfs sync_file_range uselocale wcstombs_l
15422+
for ac_func in backtrace_symbols copyfile copy_file_range getifaddrs getpeerucred inet_pton kqueue mbstowcs_l posix_fallocate ppoll pthread_is_threaded_np setproctitle setproctitle_fast strsignal syncfs sync_file_range uselocale wcstombs_l
1542315423
do :
1542415424
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
1542515425
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -15975,6 +15975,19 @@ cat >>confdefs.h <<_ACEOF
1597515975
#define HAVE_DECL_STRCHRNUL $ac_have_decl
1597615976
_ACEOF
1597715977

15978+
ac_fn_c_check_decl "$LINENO" "memset_s" "ac_cv_have_decl_memset_s" "#define __STDC_WANT_LIB_EXT1__ 1
15979+
#include <string.h>
15980+
"
15981+
if test "x$ac_cv_have_decl_memset_s" = xyes; then :
15982+
ac_have_decl=1
15983+
else
15984+
ac_have_decl=0
15985+
fi
15986+
15987+
cat >>confdefs.h <<_ACEOF
15988+
#define HAVE_DECL_MEMSET_S $ac_have_decl
15989+
_ACEOF
15990+
1597815991

1597915992
# This is probably only present on macOS, but may as well check always
1598015993
ac_fn_c_check_decl "$LINENO" "F_FULLFSYNC" "ac_cv_have_decl_F_FULLFSYNC" "#include <fcntl.h>
@@ -16390,7 +16403,7 @@ fi
1639016403

1639116404
if test "$with_icu" = yes; then
1639216405
ac_save_CPPFLAGS=$CPPFLAGS
16393-
CPPFLAGS="$ICU_CFLAGS $CPPFLAGS"
16406+
CPPFLAGS="$CPPFLAGS $ICU_CFLAGS"
1639416407

1639516408
# Verify we have ICU's header files
1639616409
ac_fn_c_check_header_mongrel "$LINENO" "unicode/ucol.h" "ac_cv_header_unicode_ucol_h" "$ac_includes_default"
@@ -17541,7 +17554,7 @@ $as_echo "#define HAVE_GCC__ATOMIC_INT64_CAS 1" >>confdefs.h
1754117554
fi
1754217555

1754317556

17544-
# Check for x86 cpuid instruction
17557+
# Check for __get_cpuid() and __cpuid()
1754517558
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __get_cpuid" >&5
1754617559
$as_echo_n "checking for __get_cpuid... " >&6; }
1754717560
if ${pgac_cv__get_cpuid+:} false; then :
@@ -17574,77 +17587,79 @@ if test x"$pgac_cv__get_cpuid" = x"yes"; then
1757417587

1757517588
$as_echo "#define HAVE__GET_CPUID 1" >>confdefs.h
1757617589

17577-
fi
17578-
17579-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __get_cpuid_count" >&5
17580-
$as_echo_n "checking for __get_cpuid_count... " >&6; }
17581-
if ${pgac_cv__get_cpuid_count+:} false; then :
17590+
else
17591+
# __cpuid()
17592+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __cpuid" >&5
17593+
$as_echo_n "checking for __cpuid... " >&6; }
17594+
if ${pgac_cv__cpuid+:} false; then :
1758217595
$as_echo_n "(cached) " >&6
1758317596
else
1758417597
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1758517598
/* end confdefs.h. */
17586-
#include <cpuid.h>
17599+
#include <intrin.h>
1758717600
int
1758817601
main ()
1758917602
{
1759017603
unsigned int exx[4] = {0, 0, 0, 0};
17591-
__get_cpuid_count(7, 0, &exx[0], &exx[1], &exx[2], &exx[3]);
17604+
__cpuid(exx, 1);
1759217605

1759317606
;
1759417607
return 0;
1759517608
}
1759617609
_ACEOF
1759717610
if ac_fn_c_try_link "$LINENO"; then :
17598-
pgac_cv__get_cpuid_count="yes"
17611+
pgac_cv__cpuid="yes"
1759917612
else
17600-
pgac_cv__get_cpuid_count="no"
17613+
pgac_cv__cpuid="no"
1760117614
fi
1760217615
rm -f core conftest.err conftest.$ac_objext \
1760317616
conftest$ac_exeext conftest.$ac_ext
1760417617
fi
17605-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv__get_cpuid_count" >&5
17606-
$as_echo "$pgac_cv__get_cpuid_count" >&6; }
17607-
if test x"$pgac_cv__get_cpuid_count" = x"yes"; then
17618+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv__cpuid" >&5
17619+
$as_echo "$pgac_cv__cpuid" >&6; }
17620+
if test x"$pgac_cv__cpuid" = x"yes"; then
1760817621

17609-
$as_echo "#define HAVE__GET_CPUID_COUNT 1" >>confdefs.h
17622+
$as_echo "#define HAVE__CPUID 1" >>confdefs.h
1761017623

17624+
fi
1761117625
fi
1761217626

17613-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __cpuid" >&5
17614-
$as_echo_n "checking for __cpuid... " >&6; }
17615-
if ${pgac_cv__cpuid+:} false; then :
17627+
# Check for __get_cpuid_count() and __cpuidex() in a similar fashion.
17628+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __get_cpuid_count" >&5
17629+
$as_echo_n "checking for __get_cpuid_count... " >&6; }
17630+
if ${pgac_cv__get_cpuid_count+:} false; then :
1761617631
$as_echo_n "(cached) " >&6
1761717632
else
1761817633
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1761917634
/* end confdefs.h. */
17620-
#include <intrin.h>
17635+
#include <cpuid.h>
1762117636
int
1762217637
main ()
1762317638
{
1762417639
unsigned int exx[4] = {0, 0, 0, 0};
17625-
__get_cpuid(exx[0], 1);
17640+
__get_cpuid_count(7, 0, &exx[0], &exx[1], &exx[2], &exx[3]);
1762617641

1762717642
;
1762817643
return 0;
1762917644
}
1763017645
_ACEOF
1763117646
if ac_fn_c_try_link "$LINENO"; then :
17632-
pgac_cv__cpuid="yes"
17647+
pgac_cv__get_cpuid_count="yes"
1763317648
else
17634-
pgac_cv__cpuid="no"
17649+
pgac_cv__get_cpuid_count="no"
1763517650
fi
1763617651
rm -f core conftest.err conftest.$ac_objext \
1763717652
conftest$ac_exeext conftest.$ac_ext
1763817653
fi
17639-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv__cpuid" >&5
17640-
$as_echo "$pgac_cv__cpuid" >&6; }
17641-
if test x"$pgac_cv__cpuid" = x"yes"; then
17642-
17643-
$as_echo "#define HAVE__CPUID 1" >>confdefs.h
17654+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv__get_cpuid_count" >&5
17655+
$as_echo "$pgac_cv__get_cpuid_count" >&6; }
17656+
if test x"$pgac_cv__get_cpuid_count" = x"yes"; then
1764417657

17645-
fi
17658+
$as_echo "#define HAVE__GET_CPUID_COUNT 1" >>confdefs.h
1764617659

17647-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __cpuidex" >&5
17660+
else
17661+
# __cpuidex()
17662+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __cpuidex" >&5
1764817663
$as_echo_n "checking for __cpuidex... " >&6; }
1764917664
if ${pgac_cv__cpuidex+:} false; then :
1765017665
$as_echo_n "(cached) " >&6
@@ -17656,7 +17671,7 @@ int
1765617671
main ()
1765717672
{
1765817673
unsigned int exx[4] = {0, 0, 0, 0};
17659-
__get_cpuidex(exx[0], 7, 0);
17674+
__cpuidex(exx, 7, 0);
1766017675

1766117676
;
1766217677
return 0;
@@ -17672,10 +17687,11 @@ rm -f core conftest.err conftest.$ac_objext \
1767217687
fi
1767317688
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv__cpuidex" >&5
1767417689
$as_echo "$pgac_cv__cpuidex" >&6; }
17675-
if test x"$pgac_cv__cpuidex" = x"yes"; then
17690+
if test x"$pgac_cv__cpuidex" = x"yes"; then
1767617691

1767717692
$as_echo "#define HAVE__CPUIDEX 1" >>confdefs.h
1767817693

17694+
fi
1767917695
fi
1768017696

1768117697
# Check for XSAVE intrinsics
@@ -18827,7 +18843,7 @@ Use --without-tcl to disable building PL/Tcl." "$LINENO" 5
1882718843
fi
1882818844
# now that we have TCL_INCLUDE_SPEC, we can check for <tcl.h>
1882918845
ac_save_CPPFLAGS=$CPPFLAGS
18830-
CPPFLAGS="$TCL_INCLUDE_SPEC $CPPFLAGS"
18846+
CPPFLAGS="$CPPFLAGS $TCL_INCLUDE_SPEC"
1883118847
ac_fn_c_check_header_mongrel "$LINENO" "tcl.h" "ac_cv_header_tcl_h" "$ac_includes_default"
1883218848
if test "x$ac_cv_header_tcl_h" = xyes; then :
1883318849

@@ -18896,7 +18912,7 @@ fi
1889618912
# check for <Python.h>
1889718913
if test "$with_python" = yes; then
1889818914
ac_save_CPPFLAGS=$CPPFLAGS
18899-
CPPFLAGS="$python_includespec $CPPFLAGS"
18915+
CPPFLAGS="$CPPFLAGS $python_includespec"
1890018916
ac_fn_c_check_header_mongrel "$LINENO" "Python.h" "ac_cv_header_Python_h" "$ac_includes_default"
1890118917
if test "x$ac_cv_header_Python_h" = xyes; then :
1890218918

@@ -19997,7 +20013,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1999720013
# report actual input values of CONFIG_FILES etc. instead of their
1999820014
# values after options handling.
1999920015
ac_log="
20000-
This file was extended by PostgreSQL $as_me 17.5, which was
20016+
This file was extended by PostgreSQL $as_me 17.6, which was
2000120017
generated by GNU Autoconf 2.69. Invocation command line was
2000220018

2000320019
CONFIG_FILES = $CONFIG_FILES
@@ -20068,7 +20084,7 @@ _ACEOF
2006820084
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
2006920085
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
2007020086
ac_cs_version="\\
20071-
PostgreSQL config.status 17.5
20087+
PostgreSQL config.status 17.6
2007220088
configured by $0, generated by GNU Autoconf 2.69,
2007320089
with options \\"\$ac_cs_config\\"
2007420090

0 commit comments

Comments
 (0)