Merge branch '11.4' into 11.5

Author: sanja-byelkin

CMakeLists.txt

@@ -194,11 +194,7 @@ ELSE()
 ENDIF()
 
 
-IF("${MYSQL_NO_DASH_VERSION}" VERSION_LESS 11.2)
-  SET(MEMPROTECT_DEFAULT ON)
-ELSE()
-  SET(MEMPROTECT_DEFAULT OFF)
-ENDIF()
+SET(MEMPROTECT_DEFAULT ON)
 
 OPTION(WITH_PROTECT_STATEMENT_MEMROOT "Enable protection of statement's memory root after first SP/PS execution. Turned into account only for debug build"
 ${MEMPROTECT_DEFAULT})

CREDITS

@@ -1,20 +1,48 @@
 MariaDB is brought to you by the MariaDB Foundation, a non profit
 organization registered in the USA.
 
-The current main sponsors of the MariaDB Foundation are:
-
-Alibaba Cloud                   https://www.alibabacloud.com/ (2017)
-Intel				https://www.intel.com (2022)
-MariaDB Corporation		https://www.mariadb.com  (2013)
-Microsoft			https://microsoft.com/ (2017)
-ServiceNow			https://servicenow.com (2019)
-SIT				https://sit.org (2022)
-Tencent Cloud			https://cloud.tencent.com (2017)
-Development Bank of Singapore   https://dbs.com (2016)
-IBM				https://www.ibm.com (2017)
-Automattic			https://automattic.com (2019)
-Galera Cluster			https://galeracluster.com (2020)
-Percona				https://www.percona.com (2018)
+As of August 2024, the main sponsors of the MariaDB Foundation are:
+
+Amazon				https://amazon.com
+Acronis				https://www.acronis.com
+Alibaba Cloud			https://www.alibabacloud.com
+C>onstructor			https://constructor.org
+Development Bank of Singapore	https://www.dbs.com
+Intel				https://www.intel.com
+MariaDB plc			https://www.mariadb.com
+ServiceNow			https://servicenow.com
+WebPros				https://webpros.com
+IBM				https://www.ibm.com
+IONOS				https://www.ionos.com
+Automattic			https://automattic.com
+SkySQL				https://skysql.com
+team.blue			https://team.blue
+Tencent Cloud			https://cloud.tencent.com
+Wikimedia Foundation		https://www.wikimediafoundation.org
+Cyber Leo			https://cyberleo.com
+Hetzner				https://www.hetzner.com
+Rumahweb			https://www.rumahweb.com
+Tasjeel.ae			https://www.tasjeel.ae
+Galera Cluster			https://galeracluster.com
+Percona				https://www.percona.com
+Vettabase			https://vettabase.com
+
+Previous sponsors include:
+
+Booking.com
+Jelastic.com
+Microsoft
+Nexedi
+Open Query
+Planeetta Web Hosting
+SpringbokSQL
+Tencent Games
+Tencent Game DBA
+Tencent TDSQL
+Verkkokauppa
+Virtuozzo
+Visma
+Webyog
 
 For a full list of sponsors, see
 https://mariadb.org/about/#sponsors
@@ -27,7 +55,7 @@ For all corporate sponsorships please contact the
 MariaDB Foundation Board via foundation@mariadb.org.
 
 The MariaDB Foundation is responsible for the MariaDB source
-repository, the official MariaDB binaries and http://mariadb.org.
+repository, the official MariaDB binaries and https://mariadb.org.
 
 The MariaDB Foundation also provides, among other things, the
 following services to the MariaDB community:
@@ -37,8 +65,8 @@ following services to the MariaDB community:
 - Merging MySQL patches into MariaDB
 - Bug fixing in MariaDB (for bugs that affects a large part of the community)
 - Building the official MariaDB binaries
-- Maintaining http://mariadb.org
-- Documenting MariaDB in the MariaDB Knowledge Base http://mariadb.com/kb
+- Maintaining https://mariadb.org
+- Documenting MariaDB in the MariaDB Knowledge Base https://mariadb.com/kb
 
 To be able to do the above we need help from corporations and individuals!
 
@@ -49,8 +77,5 @@ go to https://mariadb.org/donate/
 You can get a list of all the main authors of MariaDB / MySQL by running 
 SHOW AUTHORS;
 
-You can get a list sponsors and contributors by running 
-SHOW CONTRIBUTORS;
-
 You can read more about the MariaDB Foundation at:
 https://mariadb.org/about/

client/mysqlimport.c

@@ -244,7 +244,6 @@ get_one_option(const struct my_option *opt, const char *argument,
 #ifdef _WIN32
   case 'W':
     opt_protocol = MYSQL_PROTOCOL_PIPE;
-    opt_local_file=1;
     break;
 #endif
   case OPT_MYSQL_PROTOCOL:

cmake/cpack_rpm.cmake

@@ -247,9 +247,9 @@ SETA(CPACK_RPM_server_PACKAGE_REQUIRES
 
 IF(WITH_WSREP)
   SETA(CPACK_RPM_server_PACKAGE_REQUIRES
-    "galera-4" "rsync" "lsof" "grep" "gawk" "iproute"
+    "galera-4" "rsync" "grep" "gawk" "iproute"
     "coreutils" "findutils" "tar")
-  SETA(CPACK_RPM_server_PACKAGE_RECOMMENDS "pv")
+  SETA(CPACK_RPM_server_PACKAGE_RECOMMENDS "lsof" "pv")
 ENDIF()
 
 SET(CPACK_RPM_server_PRE_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-prein.sh)

cmake/mariadb_connector_c.cmake

@@ -8,15 +8,17 @@ SET(CONC_WITH_SIGNCODE ${SIGNCODE})
 SET(SIGN_OPTIONS ${SIGNTOOL_PARAMETERS})
 SET(CONC_WITH_EXTERNAL_ZLIB ON)
 
-IF(SSL_DEFINES MATCHES "WOLFSSL")
-  IF(WIN32)
-    SET(CONC_WITH_SSL "SCHANNEL")
+IF(NOT CONC_WITH_SSL)
+  IF(SSL_DEFINES MATCHES "WOLFSSL")
+    IF(WIN32)
+      SET(CONC_WITH_SSL "SCHANNEL")
+    ELSE()
+      SET(CONC_WITH_SSL "GNUTLS") # that's what debian wants, right?
+    ENDIF()
   ELSE()
-    SET(CONC_WITH_SSL "GNUTLS") # that's what debian wants, right?
+    SET(CONC_WITH_SSL "OPENSSL")
+    SET(OPENSSL_FOUND TRUE)
   ENDIF()
-ELSE()
-  SET(CONC_WITH_SSL "OPENSSL")
-  SET(OPENSSL_FOUND TRUE)
 ENDIF()
 
 SET(CONC_WITH_CURL OFF)

extra/mariabackup/xtrabackup.cc

@@ -2013,7 +2013,7 @@ struct my_option xb_server_options[] =
    0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0 },
 
   {"check-privileges", OPT_XTRA_CHECK_PRIVILEGES, "Check database user "
-   "privileges fro the backup user",
+   "privileges for the backup user",
    &opt_check_privileges, &opt_check_privileges,
    0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0 },
 

extra/perror.c

@@ -199,7 +199,8 @@ static my_bool print_win_error_msg(DWORD error, my_bool verbose)
   char *s;
   if (FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER |
                     FORMAT_MESSAGE_FROM_SYSTEM,
-                    NULL, error, 0, (char *)&s, 0,
+                    NULL, error, MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
+                    (char *) &s, 0,
                     NULL))
   {
     char* end = s + strlen(s) - 1;

include/m_string.h

@@ -265,9 +265,20 @@ static inline void safe_strcpy(char *dst, size_t dst_size, const char *src)
    *
    * 2) IF there is no 0 byte in the first dst_size bytes of src, strncpy will
    *    copy dst_size bytes, and the final byte won't be 0.
+   *
+   * In GCC 8+, the `-Wstringop-truncation` warning may object to strncpy()
+   * being used in this way, so we need to disable this warning for this
+   * single statement.
    */
 
+#if defined __GNUC__ && __GNUC__ >= 8
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstringop-truncation"
+#endif
   strncpy(dst, src, dst_size);
+#if defined __GNUC__ && __GNUC__ >= 8
+#pragma GCC diagnostic pop
+#endif
   dst[dst_size - 1]= 0;
 }
 

mysql-test/include/not_valgrind_build.inc

@@ -0,0 +1,4 @@
+if (`select version() like '%valgrind%' || version() like '%asan%'`)
+{
+  skip Does not run with binaries built with valgrind or asan;
+}

mysql-test/main/contributors.result

@@ -1,18 +1,42 @@
 SHOW CONTRIBUTORS;
 Name	Location	Comment
+Amazon	https://www.amazon.com/	Diamond Sponsor of the MariaDB Foundation
+Acronis	https://www.acronis.com/	Platinum Sponsor of the MariaDB Foundation
 Alibaba Cloud	https://www.alibabacloud.com/	Platinum Sponsor of the MariaDB Foundation
-Tencent Cloud	https://cloud.tencent.com	Platinum Sponsor of the MariaDB Foundation
-Microsoft	https://microsoft.com/	Platinum Sponsor of the MariaDB Foundation
-MariaDB Corporation	https://mariadb.com	Founding member, Platinum Sponsor of the MariaDB Foundation
-ServiceNow	https://servicenow.com	Platinum Sponsor of the MariaDB Foundation
-Intel	https://www.intel.com	Platinum Sponsor of the MariaDB Foundation
-SIT	https://sit.org	Platinum Sponsor of the MariaDB Foundation
-Visma	https://visma.com	Gold Sponsor of the MariaDB Foundation
-DBS	https://dbs.com	Gold Sponsor of the MariaDB Foundation
-IBM	https://www.ibm.com	Gold Sponsor of the MariaDB Foundation
-Automattic	https://automattic.com	Silver Sponsor of the MariaDB Foundation
+C<onstructor	https://www.constructor.org/	Platinum Sponsor of the MariaDB Foundation
+Development Bank of Singapore	https://www.dbs.com/	Platinum Sponsor of the MariaDB Foundation
+Intel	https://www.intel.com/	Platinum Sponsor of the MariaDB Foundation
+MariaDB plc	https://mariadb.com/	Founding member, Platinum Sponsor of the MariaDB Foundation
+ServiceNow	https://servicenow.com/	Platinum Sponsor of the MariaDB Foundation
+WebPros	https://webpros.com/	Platinum Sponsor of the MariaDB Foundation
+IBM	https://www.ibm.com/	Gold Sponsor of the MariaDB Foundation
+IONOS	https://www.ionos.com/	Gold Sponsor of the MariaDB Foundation
+Automattic	https://automattic.com/	Silver Sponsor of the MariaDB Foundation
+SkySQL	https://skysql.com/	Silver Sponsor of the MariaDB Foundation
+team.blue	https://team.blue/	Silver Sponsor of the MariaDB Foundation
+Tencent Cloud	https://cloud.tencent.com/	Silver Sponsor of the MariaDB Foundation
+Wikimedia Foundation	https://www.wikimediafoundation.org/	Silver Sponsor of the MariaDB Foundation
+Cyber Leo	https://cyberleo.com/	Bronze Sponsor of the MariaDB Foundation
+Hetzner	https://www.hetzner.com/	Bronze Sponsor of the MariaDB Foundation
+Rumahweb	https://rumahweb.com/	Bronze Sponsor of the MariaDB Foundation
+Tasjeel.ae	https://tasjeel.ae/	Bronze Sponsor of the MariaDB Foundation
+Galera Cluster	https://galeracluster.com/	Sponsor of the MariaDB Foundation
 Percona	https://www.percona.com/	Sponsor of the MariaDB Foundation
-Galera Cluster	https://galeracluster.com	Sponsor of the MariaDB Foundation
+Vettabase	https://vettabase.com/	Technology partner of the MariaDB Foundation
+Booking.com		Previous Sponsor of the MariaDB Foundation
+Jelastic.com		Previous Sponsor of the MariaDB Foundation
+Microsoft		Previous Sponsor of the MariaDB Foundation
+Nexedi		Previous Sponsor of the MariaDB Foundation
+Open Query		Previous Sponsor of the MariaDB Foundation
+Planeetta Web Hosting		Previous Sponsor of the MariaDB Foundation
+SpringbokSQL		Previous Sponsor of the MariaDB Foundation
+Tencent Games		Previous Sponsor of the MariaDB Foundation
+Tencent Game DBA		Previous Sponsor of the MariaDB Foundation
+Tencent TDSQL		Previous Sponsor of the MariaDB Foundation
+Verkkokauppa		Previous Sponsor of the MariaDB Foundation
+Virtuozzo		Previous Sponsor of the MariaDB Foundation
+Visma		Previous Sponsor of the MariaDB Foundation
+Webyog		Previous Sponsor of the MariaDB Foundation
 Google	USA	Sponsoring encryption, parallel replication and GTID
 Facebook	USA	Sponsoring non-blocking API, LIMIT ROWS EXAMINED etc
 Ronald Bradford	Brisbane, Australia	EFF contribution for UC2006 Auction