Merge pull request #3142 from 4144/updatepackets

Update packets to 2022-05-18
HerculesWS · Jun 2, 2022 · 1f5e795 · 1f5e795
2 parents 7749740 + 012d719
commit 1f5e795
Show file tree

Hide file tree

Showing 91 changed files with 9,500 additions and 9,520 deletions.
diff --git a/.github/workflows/clang13_test.yml → .github/workflows/clang15_test.yml b/.github/workflows/clang13_test.yml → .github/workflows/clang15_test.yml
@@ -1,4 +1,4 @@
-name: clang13_test
+name: clang15_test
 
 on: [workflow_call, pull_request]
 
@@ -14,12 +14,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        # clang-8, clang-9 removed for reduce number of jobs
-        CC: [clang-13]
+        CC: [clang-15]
         RENEWAL: ["", "--disable-renewal"]
         CLIENT_TYPE: ["", "--enable-packetver-re", "--enable-packetver-zero"]
         SANITIZER: ["--disable-manager", "--disable-manager --enable-sanitize=full"]
-        PACKET_VERSION: ["--enable-packetver=20211118", "--enable-packetver=20130724"]
+        PACKET_VERSION: ["--enable-packetver=20220518", "--enable-packetver=20130724"]
         exclude:
           - PACKET_VERSION: "--enable-packetver=20130724"
             CLIENT_TYPE: "--enable-packetver-zero"

diff --git a/.github/workflows/controller.yml b/.github/workflows/controller.yml
@@ -20,10 +20,10 @@ jobs:
     needs: tools
     if: ${{ !failure() && !cancelled() }}
     uses: ./.github/workflows/build.yml
-  clang13_test:
+  clang15_test:
     needs: build
     if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/clang13_test.yml
+    uses: ./.github/workflows/clang15_test.yml
   gcc_test:
     needs: build
     if: ${{ !failure() && !cancelled() }}

diff --git a/.github/workflows/gcc_test.yml b/.github/workflows/gcc_test.yml
@@ -18,7 +18,7 @@ jobs:
         RENEWAL: ["", "--disable-renewal"]
         CLIENT_TYPE: ["", "--enable-packetver-re", "--enable-packetver-zero"]
         SANITIZER: ["--disable-manager", "--disable-manager --enable-sanitize=full"]
-        PACKET_VERSION: ["--enable-packetver=20211118", "--enable-packetver=20130724"]
+        PACKET_VERSION: ["--enable-packetver=20220518", "--enable-packetver=20130724"]
         exclude:
           - PACKET_VERSION: "--enable-packetver=20130724"
             CLIENT_TYPE: "--enable-packetver-zero"

diff --git a/.github/workflows/gccsnapshot_test.yml b/.github/workflows/gccsnapshot_test.yml
@@ -18,7 +18,7 @@ jobs:
         RENEWAL: ["", "--disable-renewal"]
         CLIENT_TYPE: ["", "--enable-packetver-re", "--enable-packetver-zero"]
         SANITIZER: ["--disable-manager", "--disable-manager --enable-sanitize=full"]
-        PACKET_VERSION: ["--enable-packetver=20211118", "--enable-packetver=20130724"]
+        PACKET_VERSION: ["--enable-packetver=20220518", "--enable-packetver=20130724"]
         exclude:
           - PACKET_VERSION: "--enable-packetver=20130724"
             CLIENT_TYPE: "--enable-packetver-zero"

diff --git a/.github/workflows/mariadb.yml b/.github/workflows/mariadb.yml
@@ -18,7 +18,7 @@ jobs:
         RENEWAL: [""]
         CLIENT_TYPE: [""]
         SANITIZER: ["--disable-manager", "--enable-sanitize=full"]
-        PACKET_VERSION: ["--enable-packetver=20211118"]
+        PACKET_VERSION: ["--enable-packetver=20220518"]
         MYSQL: ["10.2", "latest"]
     container:
       image: debian:unstable

diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml
@@ -18,7 +18,7 @@ jobs:
         RENEWAL: [""]
         CLIENT_TYPE: [""]
         SANITIZER: ["--disable-manager", "--enable-sanitize=full"]
-        PACKET_VERSION: ["--enable-packetver=20211118"]
+        PACKET_VERSION: ["--enable-packetver=20220518"]
         MYSQL: ["5.6", "5.7", "latest"]
     container:
       image: debian:unstable

diff --git a/3rdparty/libbacktrace/Makefile.in b/3rdparty/libbacktrace/Makefile.in
@@ -72,4 +72,4 @@ Makefile: Makefile.in
 
 %.o: %.c $(LIBBACKTRACE_H) Makefile
 	@echo "	CC	$<"
-	@$(CC) @CFLAGS@ @DEFS@ @CPPFLAGS@ -Wno-pointer-arith -Wno-switch-enum -c $(OUTPUT_OPTION) $<
+	@$(CC) @CFLAGS@ @DEFS@ @CPPFLAGS@ -Wno-pointer-arith -Wno-switch-enum -Wno-shadow -c $(OUTPUT_OPTION) $<
diff --git a/3rdparty/libbacktrace/alloc.c b/3rdparty/libbacktrace/alloc.c
@@ -1,5 +1,5 @@
 /* alloc.c -- Memory allocation without mmap.
-   Copyright (C) 2012-2018 Free Software Foundation, Inc.
+   Copyright (C) 2012-2020 Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Google.
 
 Redistribution and use in source and binary forms, with or without
@@ -145,12 +145,23 @@ backtrace_vector_release (struct backtrace_state *state ATTRIBUTE_UNUSED,
 			  backtrace_error_callback error_callback,
 			  void *data)
 {
+  vec->alc = 0;
+
+  if (vec->size == 0)
+    {
+      /* As of C17, realloc with size 0 is marked as an obsolescent feature, use
+	 free instead.  */
+      free (vec->base);
+      vec->base = NULL;
+      return 1;
+    }
+
   vec->base = realloc (vec->base, vec->size);
   if (vec->base == NULL)
     {
       error_callback (data, "realloc", errno);
       return 0;
     }
-  vec->alc = 0;
+
   return 1;
 }
diff --git a/3rdparty/libbacktrace/atomic.c b/3rdparty/libbacktrace/atomic.c
@@ -1,5 +1,5 @@
 /* atomic.c -- Support for atomic functions if not present.
-   Copyright (C) 2013-2018 Free Software Foundation, Inc.
+   Copyright (C) 2013-2020 Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Google.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/3rdparty/libbacktrace/backtrace.c b/3rdparty/libbacktrace/backtrace.c
@@ -1,5 +1,5 @@
 /* backtrace.c -- Entry point for stack backtrace library.
-   Copyright (C) 2012-2018 Free Software Foundation, Inc.
+   Copyright (C) 2012-2020 Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Google.
 
 Redistribution and use in source and binary forms, with or without
@@ -98,7 +98,7 @@ unwind (struct _Unwind_Context *context, void *vdata)
 
 /* Get a stack backtrace.  */
 
-int
+int __attribute__((noinline))
 backtrace_full (struct backtrace_state *state, int skip,
 		backtrace_full_callback callback,
 		backtrace_error_callback error_callback, void *data)

diff --git a/3rdparty/libbacktrace/backtrace.h b/3rdparty/libbacktrace/backtrace.h
@@ -1,5 +1,5 @@
 /* backtrace.h -- Public header file for stack backtrace library.
-   Copyright (C) 2012-2018 Free Software Foundation, Inc.
+   Copyright (C) 2012-2020 Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Google.
 
 Redistribution and use in source and binary forms, with or without
@@ -75,7 +75,13 @@ typedef void (*backtrace_error_callback) (void *data, const char *msg,
    use appropriate atomic operations.  If THREADED is zero the state
    may only be accessed by one thread at a time.  This returns a state
    pointer on success, NULL on error.  If an error occurs, this will
-   call the ERROR_CALLBACK routine.  */
+   call the ERROR_CALLBACK routine.
+
+   Calling this function allocates resources that cannot be freed.
+   There is no backtrace_free_state function.  The state is used to
+   cache information that is expensive to recompute.  Programs are
+   expected to call this function at most once and to save the return
+   value for all later calls to backtrace functions.  */
 
 extern struct backtrace_state *backtrace_create_state (
     const char *filename, int threaded,

diff --git a/3rdparty/libbacktrace/btest.c b/3rdparty/libbacktrace/btest.c
@@ -1,5 +1,5 @@
 /* btest.c -- Test for libbacktrace library
-   Copyright (C) 2012-2018 Free Software Foundation, Inc.
+   Copyright (C) 2012-2020 Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Google.
 
 Redistribution and use in source and binary forms, with or without
@@ -48,9 +48,9 @@ POSSIBILITY OF SUCH DAMAGE.  */
 
 /* Test the backtrace function with non-inlined functions.  */
 
-static int test1 (void) __attribute__ ((noinline, unused));
-static int f2 (int) __attribute__ ((noinline));
-static int f3 (int, int) __attribute__ ((noinline));
+static int test1 (void) __attribute__ ((noinline, noclone, unused));
+static int f2 (int) __attribute__ ((noinline, noclone));
+static int f3 (int, int) __attribute__ ((noinline, noclone));
 
 static int
 test1 (void)
@@ -162,9 +162,9 @@ f13 (int f1line, int f2line)
 
 /* Test the backtrace_simple function with non-inlined functions.  */
 
-static int test3 (void) __attribute__ ((noinline, unused));
-static int f22 (int) __attribute__ ((noinline));
-static int f23 (int, int) __attribute__ ((noinline));
+static int test3 (void) __attribute__ ((noinline, noclone, unused));
+static int f22 (int) __attribute__ ((noinline, noclone));
+static int f23 (int, int) __attribute__ ((noinline, noclone));
 
 static int
 test3 (void)
@@ -423,7 +423,8 @@ test5 (void)
 	  fprintf (stderr, "test5: NULL syminfo name\n");
 	  symdata.failed = 1;
 	}
-      else if (strcmp (symdata.name, "global") != 0)
+      else if (!(strncmp (symdata.name, "global", 6) == 0
+		 && (symdata.name[6] == '\0'|| symdata.name[6] == '.')))
 	{
 	  fprintf (stderr,
 		   "test5: unexpected syminfo name got %s expected %s\n",