Merge branch '10.11' into 11.0

Author: vuvova

.clang-format

@@ -70,7 +70,6 @@ IndentPPDirectives: None
 IndentWidth:     2
 IndentWrappedFunctionNames: false
 KeepEmptyLinesAtTheStartOfBlocks: true
-Language: Cpp
 MacroBlockBegin: ''
 MacroBlockEnd:   ''
 MaxEmptyLinesToKeep: 1

BUILD/SETUP.sh

@@ -267,6 +267,12 @@ if test `$CC -v 2>&1 | tail -1 | sed 's/ .*$//'` = 'gcc' ; then
   fi
 fi
 
+if test `$CC -v 2>&1 | head -1 | sed 's/ .*$//'` = 'clang' ; then
+    dbug_cflags="$dbug_cflags -Wframe-larger-than=16384 -fno-inline"
+    c_warnings="$c_warnings -Wframe-larger-than=16384"
+    cxx_warnings="$cxx_warnings -Wframe-larger-than=16384"
+fi
+
 
 # If ccache (a compiler cache which reduces build time)
 # (http://samba.org/ccache) is installed, use it.

CMakeLists.txt

@@ -31,7 +31,7 @@ ENDIF()
 # in RPM's:
 
 #set(CPACK_RPM_SPEC_MORE_DEFINE "%define __spec_install_post /bin/true")
-FOREACH(p CMP0022 CMP0046 CMP0040 CMP0048 CMP0054 CMP0075 CMP0069 CMP0135)
+FOREACH(p CMP0022 CMP0046 CMP0040 CMP0048 CMP0054 CMP0074 CMP0075 CMP0069 CMP0135)
   IF(POLICY ${p})
     CMAKE_POLICY(SET ${p} NEW)
   ENDIF()
@@ -188,7 +188,7 @@ ENDIF()
 OPTION (WITH_UNIT_TESTS "Compile MySQL with unit tests" ON)
 
 IF (WITHOUT_SERVER)
-  SET (SKIP_COMPONENTS "Server|IniFiles|SuportFiles|Readme")
+  SET (SKIP_COMPONENTS "Server|IniFiles|SupportFiles|Readme")
 ELSE()
   SET (SKIP_COMPONENTS "N-O-N-E")
 ENDIF()
@@ -200,8 +200,9 @@ OPTION(NOT_FOR_DISTRIBUTION "Allow linking with GPLv2-incompatible system librar
 #  Can be switched on only for debug build.
 #
 OPTION(WITH_PROTECT_STATEMENT_MEMROOT "Enable protection of statement's memory root after first SP/PS execution. Turned into account only for debug build" OFF)
-IF (CMAKE_BUILD_TYPE MATCHES "Debug" AND WITH_PROTECT_STATEMENT_MEMROOT)
-  ADD_DEFINITIONS(-DPROTECT_STATEMENT_MEMROOT)
+IF (WITH_PROTECT_STATEMENT_MEMROOT)
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DPROTECT_STATEMENT_MEMROOT")
+  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DPROTECT_STATEMENT_MEMROOT")
 ENDIF()
 
 INCLUDE(check_compiler_flag)
@@ -265,8 +266,6 @@ IF(SECURITY_HARDENED AND NOT WITH_ASAN AND NOT WITH_UBSAN AND NOT WITH_TSAN AND
   MY_CHECK_AND_SET_COMPILER_FLAG("-D_FORTIFY_SOURCE=2" RELEASE RELWITHDEBINFO)
 ENDIF()
 
-INCLUDE(wsrep)
-
 OPTION(WITH_DBUG_TRACE "Enable DBUG_ENTER()/DBUG_RETURN()/DBUG_PRINT()" ON)
 IF(WITH_DBUG_TRACE)
   FOREACH(LANG C CXX)
@@ -277,7 +276,12 @@ ENDIF()
 # Always enable debug sync for debug builds.
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC")
- 
+
+IF(CMAKE_COMPILER_IS_GNUCC AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "10")
+  # Enable extra checks when using a recent enough version of GNU libstdc++
+  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_GLIBCXX_DEBUG -D_GLIBCXX_ASSERTIONS")
+ENDIF()
+
 OPTION(ENABLE_GCOV "Enable gcov (debug, Linux builds only)" OFF)
 IF (ENABLE_GCOV)
   MY_CHECK_AND_SET_COMPILER_FLAG("-DHAVE_gcov -fprofile-arcs -ftest-coverage -lgcov" DEBUG)
@@ -338,6 +342,8 @@ ELSEIF(TRASH_FREED_MEMORY MATCHES "AUTO" AND NOT WIN32 AND NOT WITH_VALGRIND AND
   SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DTRASH_FREED_MEMORY")
 ENDIF()
 
+INCLUDE(wsrep)
+
 # Set commonly used variables
 IF(WIN32)
   SET(DEFAULT_MYSQL_HOME "C:/Program Files/MariaDB ${MYSQL_BASE_VERSION}")

README.md

@@ -3,7 +3,7 @@ Code status:
 
 * [![Appveyor CI status](https://ci.appveyor.com/api/projects/status/4u6pexmtpuf8jq66?svg=true)](https://ci.appveyor.com/project/rasmushoj/server) ci.appveyor.com
 
-## MariaDB: The open source relational database 
+## MariaDB: The innovative open source database 
 
 MariaDB was designed as a drop-in replacement of MySQL(R) with more
 features, new storage engines, fewer bugs, and better performance.
@@ -33,28 +33,23 @@ https://mariadb.com/kb/en/mariadb-versus-mysql-compatibility/
 
 https://mariadb.com/kb/en/new-and-old-releases/
 
+Getting the code, building it and testing it
+---------------------------------------------------------------
+
+Refer to the following guide: https://mariadb.org/get-involved/getting-started-for-developers/get-code-build-test/ which outlines how to correctly build the source code and run the MariaDB testing framework.
+
 Help
 -----
 
 More help is available from the Maria Discuss mailing list
-https://launchpad.net/~maria-discuss, MariaDB's Zulip
+https://lists.mariadb.org/postorius/lists/discuss.lists.mariadb.org/ and MariaDB's Zulip
 instance, https://mariadb.zulipchat.com/ 
 
-Live QA for beginner contributors
-----
-MariaDB has a dedicated time each week when we answer new contributor questions live on Zulip.
-From 8:00 to 10:00 UTC on Mondays, and 10:00 to 12:00 UTC on Thursdays,
-anyone can ask any questions they’d like, and a live developer will be available to assist.
-
-New contributors can ask questions any time, but we will provide immediate feedback during that interval.
-
 Licensing
 ---------
 
 ***************************************************************************
 
-NOTE: 
-
 MariaDB is specifically available only under version 2 of the GNU
 General Public License (GPLv2). (I.e. Without the "any later version"
 clause.) This is inherited from MySQL. Please see the README file in

client/CMakeLists.txt

@@ -18,7 +18,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/include
   ${PCRE_INCLUDE_DIRS}
   ${CMAKE_SOURCE_DIR}/mysys_ssl
-  ${ZLIB_INCLUDE_DIR}
+  ${ZLIB_INCLUDE_DIRS}
   ${SSL_INCLUDE_DIRS}
   ${CMAKE_SOURCE_DIR}/sql
   ${CMAKE_SOURCE_DIR}/strings

client/client_priv.h

@@ -1,6 +1,6 @@
 /*
    Copyright (c) 2001, 2012, Oracle and/or its affiliates.
-   Copyright (c) 2009, 2022, MariaDB
+   Copyright (c) 2009, 2024, MariaDB
 
    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
@@ -38,75 +38,34 @@ enum options_client
 {
   OPT_CHARSETS_DIR=256, OPT_DEFAULT_CHARSET,
   OPT_PAGER, OPT_TEE,
-  OPT_LOW_PRIORITY, OPT_AUTO_REPAIR, OPT_COMPRESS,
-  OPT_DROP, OPT_LOCKS, OPT_KEYWORDS, OPT_DELAYED, OPT_OPTIMIZE,
-  OPT_FTB, OPT_LTB, OPT_ENC, OPT_O_ENC, OPT_ESC, OPT_TABLES,
-  OPT_MASTER_DATA, OPT_AUTOCOMMIT, OPT_AUTO_REHASH,
-  OPT_LINE_NUMBERS, OPT_COLUMN_NAMES, OPT_CONNECT_TIMEOUT,
-  OPT_MAX_ALLOWED_PACKET, OPT_NET_BUFFER_LENGTH,
-  OPT_SELECT_LIMIT, OPT_MAX_JOIN_SIZE, OPT_SSL_SSL,
+  OPT_OPTIMIZE,
+  OPT_TABLES,
+  OPT_MASTER_DATA,
   OPT_SSL_KEY, OPT_SSL_CERT, OPT_SSL_CA, OPT_SSL_CAPATH,
-  OPT_SSL_CIPHER, OPT_TLS_VERSION, OPT_SHUTDOWN_TIMEOUT, OPT_LOCAL_INFILE,
-  OPT_DELETE_MASTER_LOGS, OPT_COMPACT,
-  OPT_PROMPT, OPT_IGN_LINES,OPT_TRANSACTION,OPT_MYSQL_PROTOCOL,
-  OPT_FRM, OPT_SKIP_OPTIMIZATION,
-  OPT_COMPATIBLE, OPT_RECONNECT, OPT_DELIMITER, OPT_SECURE_AUTH,
-  OPT_OPEN_FILES_LIMIT, OPT_SET_CHARSET, OPT_SERVER_ARG,
-  OPT_STOP_POSITION, OPT_START_DATETIME, OPT_STOP_DATETIME,
-  OPT_SIGINT_IGNORE, OPT_HEXBLOB, OPT_ORDER_BY_PRIMARY, OPT_COUNT,
-  OPT_FLUSH_TABLES,
-  OPT_TRIGGERS,
-  OPT_MYSQL_ONLY_PRINT,
-  OPT_MYSQL_LOCK_DIRECTORY,
-  OPT_USE_THREADS,
-  OPT_IMPORT_USE_THREADS,
-  OPT_MYSQL_NUMBER_OF_QUERY,
+  OPT_SSL_CIPHER, OPT_LOCAL_INFILE,
+  OPT_COMPACT,
+  OPT_MYSQL_PROTOCOL,
+  OPT_SKIP_OPTIMIZATION,
+  OPT_COMPATIBLE, OPT_DELIMITER,
+  OPT_SERVER_ARG,
+  OPT_START_DATETIME, OPT_STOP_DATETIME,
   OPT_IGNORE_DATABASE,
-  OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,
-  OPT_TZ_UTC, OPT_CREATE_SLAP_SCHEMA,
-  OPT_MYSQLDUMP_SLAVE_APPLY,
+  OPT_IGNORE_TABLE,
   OPT_MYSQLDUMP_SLAVE_DATA,
-  OPT_MYSQLDUMP_INCLUDE_MASTER_HOST_PORT,
-#ifdef WHEN_FLASHBACK_REVIEW_READY
-  OPT_REVIEW,
-  OPT_REVIEW_DBNAME, OPT_REVIEW_TABLENAME,
-#endif
-  OPT_SLAP_CSV, OPT_SLAP_CREATE_STRING,
-  OPT_SLAP_AUTO_GENERATE_SQL_LOAD_TYPE, OPT_SLAP_AUTO_GENERATE_WRITE_NUM,
-  OPT_SLAP_AUTO_GENERATE_ADD_AUTO,
-  OPT_SLAP_AUTO_GENERATE_GUID_PRIMARY,
-  OPT_SLAP_AUTO_GENERATE_EXECUTE_QUERIES,
-  OPT_SLAP_AUTO_GENERATE_SECONDARY_INDEXES,
-  OPT_SLAP_AUTO_GENERATE_UNIQUE_WRITE_NUM,
-  OPT_SLAP_AUTO_GENERATE_UNIQUE_QUERY_NUM,
-  OPT_SLAP_PRE_QUERY,
-  OPT_SLAP_POST_QUERY,
-  OPT_SLAP_PRE_SYSTEM,
-  OPT_SLAP_POST_SYSTEM,
-  OPT_SLAP_COMMIT,
-  OPT_SLAP_DETACH,
-  OPT_SLAP_NO_DROP,
-  OPT_MYSQL_REPLACE_INTO, OPT_BASE64_OUTPUT_MODE, OPT_SERVER_ID,
-  OPT_FIX_TABLE_NAMES, OPT_FIX_DB_NAMES, OPT_SSL_VERIFY_SERVER_CERT,
-  OPT_AUTO_VERTICAL_OUTPUT,
-  OPT_DEBUG_INFO, OPT_DEBUG_CHECK, OPT_COLUMN_TYPES, OPT_ERROR_LOG_FILE,
-  OPT_WRITE_BINLOG, OPT_DUMP_DATE,
-  OPT_INIT_COMMAND,
+  OPT_SLAP_CSV,
+  OPT_BASE64_OUTPUT_MODE,
+  OPT_FIX_TABLE_NAMES, OPT_FIX_DB_NAMES,
+  OPT_WRITE_BINLOG,
   OPT_PLUGIN_DIR,
   OPT_DEFAULT_AUTH,
-  OPT_ABORT_SOURCE_ON_ERROR,
   OPT_REWRITE_DB,
-  OPT_REPORT_PROGRESS,
-  OPT_SKIP_ANNOTATE_ROWS_EVENTS,
   OPT_SSL_CRL, OPT_SSL_CRLPATH,
   OPT_IGNORE_DATA,
   OPT_PRINT_ROW_COUNT, OPT_PRINT_ROW_EVENT_POSITIONS,
   OPT_CHECK_IF_UPGRADE_NEEDED,
   OPT_COMPATIBILTY_CLEARTEXT_PLUGIN,
-  OPT_SHUTDOWN_WAIT_FOR_SLAVES,
-  OPT_COPY_S3_TABLES,
-  OPT_PRINT_TABLE_METADATA,
-  OPT_ASOF_TIMESTAMP,
+  OPT_STOP_POSITION,
+  OPT_SERVER_ID,
   OPT_IGNORE_DOMAIN_IDS,
   OPT_DO_DOMAIN_IDS,
   OPT_IGNORE_SERVER_IDS,