Merge branch 'mysql:trunk' into trunk

Author: TimeLooper

CMakeLists.txt

@@ -271,32 +271,71 @@ endif()
 # TODO: Fix these warnings.
 #
 
-if(MSVC)
+# TODO: Also cover linker warnings
+
+add_config_option(WERROR BOOL ADVANCED DEFAULT OFF
+  "Turn compile warnings into errors"
+)
+
+#
+# Note: If WERROR is enabled we change its value to be the actual compiler
+# option to be used on the current platform. That is used for easier
+# propagation to external builds.
+#
+# Note: In more recent cmake there is CMAKE_COMPILE_WARNING_AS_ERROR variable
+# but at the moment we can't ensure using that recent cmake.
+#
+
+if(WERROR)
+  set(WERROR -Werror)
+endif()
+
+if(MSVC OR TOOLSET_MSVC)
 
   add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS)
 
   if(CXX_FRONTEND_MSVC)
+
+    if(WERROR)
+      set(WERROR /WX)  # MSVC equivalent of -Werror
+    endif()
+
     # Disable MSVC unreachable code warnings unless requested.
     add_compile_options(/wd4702)
 
     # Disable MSVC warning C4297 as it seems to be buggy.
     # Seehttps://connect.microsoft.com/VisualStudio/feedback/details/897611/incorrect-warning-of-c4297-for-destructor-with-try-catch-statement
 
     add_compile_options(/wd4297)
+
   endif()
 
-endif()
+elseif(SUNPRO)
 
+  # Note: For simplicity we do not handle WERROR on SunOS
 
-if(SUNPRO)
+  set(WERROR)
 
   add_compile_options(
     -errtags=yes -erroff=hidevf,wvarhidemem
   )
 
 endif()
 
-if (CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 12.0)
+if(NOT WERROR)
+  # clear if WERROR was set to something like OFF or FALSE
+  # message(STATUS "WERROR: cleared")
+  unset(WERROR CACHE)
+else()
+  # overwrite cache entry with changed value
+  set(WERROR "${WERROR}" CACHE INTERNAL "WERROR flags" FORCE)
+endif()
+
+# message(STATUS "WERROR: ${WERROR}")
+add_compile_options(${WERROR})
+
+
+if (GCC AND GCC VERSION_GREATER 11)
   # Silence a warning produced by a regression in GCC 12.0 and newer
   # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106199
   # Note: The stringop-overflow warnings are shown also during linking phase
@@ -383,7 +422,8 @@ if(MAINTAINER_MODE)
     # (and this is the case for MSVC 2015).
     # See: http://en.cppreference.com/w/cpp/language/copy_assignment
 
-    add_compile_options(/W4 /wd4512 /wd4127)
+    set_warnings_level(4)
+    add_compile_options(/wd4512 /wd4127)
 
   elseif(SUNPRO)
   else()

LICENSE.txt

@@ -1,25 +1,25 @@
 Licensing Information User Manual
 
-MySQL Connector/C++ 9.2.0 Community
+MySQL Connector/C++ 9.3.0 Community
      __________________________________________________________________
 
 Introduction
 
    This License Information User Manual contains Oracle's product license
    and other licensing information, including licensing information for
    third-party software which may be included in this distribution of
-   MySQL Connector/C++ 9.2.0 Community.
+   MySQL Connector/C++ 9.3.0 Community.
 
-   Last updated: November 2024
+   Last updated: March 2025
 
 Licensing Information
 
-   This release of MySQL Connector/C++ 9.2.0 Community is brought to you
+   This release of MySQL Connector/C++ 9.3.0 Community is brought to you
    by the MySQL team at Oracle. This software is released under version 2
    of the GNU General Public License (GPLv2), as set forth below, with the
    following additional permissions:
 
-   This distribution of MySQL Connector/C++ 9.2.0 Community is designed to
+   This distribution of MySQL Connector/C++ 9.3.0 Community is designed to
    work with certain software (including but not limited to OpenSSL) that
    is licensed under separate terms, as designated in a particular file or
    component or in the license documentation. Without limiting your rights
@@ -34,7 +34,7 @@ Licensing Information
    a copy of which is reproduced below and can also be found along with
    its FAQ at http://oss.oracle.com/licenses/universal-foss-exception.
 
-   Copyright (c) 2008, 2024, Oracle and/or its affiliates.
+   Copyright (c) 2008, 2025, Oracle and/or its affiliates.
 
 Election of GPLv2
 
@@ -2142,49 +2142,20 @@ but the Oracle program might not operate properly or at all without it.
 // SPDX-License-Identifier: Apache-2.0
 
 LICENSE:
-                        Apache License
-                  Version 2.0, January 2004
-               http://www.apache.org/licenses/
-A copy of the Apache License v2.0, January 2004 license can be found
-in the 'Standard Licenses' section.
-
-
-4th party code included
-=======================
-exporters/etw
--------------
-TraceLogging Dynamic for Windows
-
-Copyright (c) Microsoft Corporation. All rights reserved.
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
+A copy of the Apache License v2.0, January 2004 license can be found
+in the 'Standard Licenses' section.
 
 
-4th Party Libraries
-===================
+4th Party Dependencies
+======================
 opentelemetry-proto
 -------------------
 // Copyright 2019, OpenTelemetry Authors
-// Copyright 2020, OpenTelemetry Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -2198,48 +2169,75 @@ opentelemetry-proto
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-Apache License Text as listed above
+Some files include
+// Copyright 2020, OpenTelemetry Authors
+(same license header)
+
+A copy of the Apache License v2.0, January 2004 license can be found
+in the 'Standard Licenses' section.
+
+================================================================================
+==
 
-------------------------------------------------------------------------------
 protobuf
 --------
+COPYRIGHT AND PERMISSION NOTICE
 
-Copyright 2008 Google Inc.  All rights reserved.
+Copyright (c) 1996 - 2024, Daniel Stenberg, <[email protected]>, and many
+contributors, see the THANKS file.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+All rights reserved.
 
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+Permission to use, copy, modify, and distribute this software for any purpose
+with or without fee is hereby granted, provided that the above copyright
+notice and this permission notice appear in all copies.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
+NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+OR OTHER DEALINGS IN THE SOFTWARE.
 
-Code generated by the Protocol Buffer compiler is owned by the owner
-of the input file used when generating it.  This code is not
-standalone and requires a support library to be linked with it.  This
-support library is itself covered by the above license.
+Except as contained in this notice, the name of a copyright holder shall not
+be used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization of the copyright holder.
+
+Protobuf dependency - abseil-cpp
+--------------------------------
+=== Header in source files:
+// Copyright 2017 The Abseil Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// This header file contains C++11 versions of standard <utility> header
+// abstractions available within C++14 and C++17, and are designed to be drop-in
+// replacement for code compliant with C++14 and C++17.
+
+=== License File
+                                 Apache License
+                           Version 2.0, January 2004
+                        https://www.apache.org/licenses/
+
+A copy of the Apache License v2.0, January 2004 license can be found
+in the 'Standard Licenses' section.
+================================================================================
+==
 
-------------------------------------------------------------------------------
 json (nlohmann)
 ----
+
 MIT License
 
 Copyright (c) 2013-2022 Niels Lohmann
@@ -2262,14 +2260,14 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
-------------------------------------------------------------------------------
-
+================================================================================
+==
 
 curl
 ----
 COPYRIGHT AND PERMISSION NOTICE
 
-Copyright (c) 1996 - 2023, Daniel Stenberg, <[email protected]>, and many
+Copyright (c) 1996 - 2024, Daniel Stenberg, <[email protected]>, and many
 contributors, see the THANKS file.
 
 All rights reserved.

cdk/CMakeLists.txt

@@ -28,9 +28,9 @@
 
 
 
-CMAKE_MINIMUM_REQUIRED(VERSION 3.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.15)
 
-cmake_policy(VERSION 3.0)
+cmake_policy(VERSION 3.15)
 
 if(POLICY CMP0022)
   cmake_policy(SET CMP0022 NEW)  # consistently use INTERFACE_LINK_LIBRARIES property
@@ -150,7 +150,7 @@ IF(MSVC)
 
   # TODO: move to /Wall when code base is ready for this
 
-  add_compile_options(/W4)
+  set_warnings_level(4)
 
   # Note: We disable warnings related to C++11 language because we want this
   # to be pure C++ code.

cdk/cmake/DepFindProtobuf.cmake

@@ -115,7 +115,7 @@ function(mysqlx_protobuf_generate_cpp SRCS HDRS)
   ELSEIF(MSVC)
     set_source_files_properties(${srcs}
       APPEND_STRING PROPERTY COMPILE_FLAGS
-      "/W1 /wd4018 /wd4996 /wd4244 /wd4267"
+      "/wd4018 /wd4996 /wd4244 /wd4267"
     )
   ENDIF()
 

cdk/cmake/compiler/MSVC.cmake

@@ -89,6 +89,16 @@ function(set_visibility)
 endfunction()
 
 
+function(set_warnings_level N)
+
+  # Note: The /Wn flag must be set only once, otherwise msvc shows warnings
+
+  string(REGEX REPLACE "/W[123456789]" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W${N}")
+
+endfunction()
+
+
 function(set_msvcrt TYPE)
 
   if(TYPE MATCHES "^(STATIC|Static|static)$")

cdk/cmake/dependency.cmake

@@ -60,6 +60,7 @@ set(EXT_FWD
   CMAKE_SYSTEM_PROCESSOR
   CMAKE_C_COMPILER CMAKE_CXX_COMPILER
   MSVC
+  WERROR
 )
 
 set(EXT_DIR ${CMAKE_CURRENT_LIST_DIR}/ext CACHE INTERNAL "external project utils location")
@@ -129,7 +130,7 @@ function(add_ext NAME HEADER)
     "${EXT_LIB} library name"
   )
 
-  
+
   #show_config_options()
 
   # Handle non-path value of WITH_X option

cdk/cmake/gtest.cmake

@@ -32,9 +32,6 @@
 # Set up gtest for use by targets in given folder and its sub-folders.
 #
 MACRO(SETUP_GTEST)
-  IF (WITH_GTEST)
-    INCLUDE_DIRECTORIES(${GTEST_INCLUDE_DIRS})
-  ENDIF (WITH_GTEST)
 ENDMACRO(SETUP_GTEST)
 
 
@@ -135,6 +132,14 @@ MESSAGE("gtest_main location: ${gtest_main_location}")
 add_library(gtest STATIC IMPORTED)
 add_library(gtest_main STATIC IMPORTED)
 
+target_include_directories(gtest INTERFACE ${GTEST_INCLUDE_DIRS})
+
+# See: https://stackoverflow.com/questions/42847103/stdtr1-with-visual-studio-2017
+
+target_compile_definitions(gtest INTERFACE
+  -DGTEST_LANG_CXX11=1
+)
+
 set_target_properties(gtest PROPERTIES
   IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
   IMPORTED_LOCATION "${gtest_location}"