Merge branch 'mysql-8.0' into mysql-trunk

Change-Id: I5f98c6a95b3f40d7a1e6b22d43ea7ee038194d67

Author: marcalff

sql/debug_lock_order.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2014, 2021, Oracle and/or its affiliates.
+/* Copyright (c) 2014, 2022, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -1695,7 +1695,7 @@ stack when the second lock was acquired:
   }
 
 #define LO_MAX_THREAD_CLASS 100
-#define LO_MAX_MUTEX_CLASS 300
+#define LO_MAX_MUTEX_CLASS 350
 #define LO_MAX_RWLOCK_CLASS 100
 #define LO_MAX_COND_CLASS 150
 #define LO_MAX_FILE_CLASS 100

storage/perfschema/pfs_name.h

@@ -28,6 +28,8 @@
   Object names (declarations).
 */
 
+#include <string.h>
+
 #include "m_ctype.h"
 #include "my_hostname.h"  // HOSTNAME_LENGTH
 #include "mysql_com.h"    // NAME_LEN