Bug #34638573 Compile MySQL with clang 15

Clang 15 comes with a few new warnings:

variable 'cnt' set but not used
-Wunused-but-set-variable

argument 'ptr' of type 'const LinearSectionPtr[3]' with mismatched bound
-Warray-parameter

out-of-line definition of constexpr static data member is redundant in C++17
and is deprecated
-Wdeprecated

unqualified call to 'std::move'
-Wunqualified-std-cast-call

builtin __has_trivial_copy is deprecated; use __is_trivially_copyable instead
-Wdeprecated-builtins

Fix these, to get a clean build also with Clang 15.

Change-Id: I315b7b77e2bf3a6bacf091aeb8887d0902d3f950
(cherry picked from commit 05a8ca809e5bc3a42359158de0d99dedf7f00b66)

Author: Tor Didriksen

client/check/mysqlcheck_core.cc

@@ -269,7 +269,6 @@ static void print_result() {
   MYSQL_ROW row;
   char prev[NAME_LEN * 3 + 2];
   char prev_alter[MAX_ALTER_STR_SIZE];
-  uint i;
   size_t dot_pos;
   bool found_error = false, table_rebuild = false;
 
@@ -279,7 +278,7 @@ static void print_result() {
   prev[0] = '\0';
   prev_alter[0] = 0;
 
-  for (i = 0; (row = mysql_fetch_row(res)); i++) {
+  while ((row = mysql_fetch_row(res))) {
     int changed = strcmp(prev, row[0]);
     bool status = !strcmp(row[2], "status");
 

client/mysqlslap.cc

@@ -1673,12 +1673,11 @@ static int run_scheduler(stats *sptr, statement *stmts, uint concur,
 }
 
 extern "C" void *run_task(void *p) {
-  ulonglong counter = 0, queries;
+  ulonglong queries;
   ulonglong detach_counter;
   unsigned int commit_counter;
   MYSQL *mysql;
   MYSQL_RES *result;
-  MYSQL_ROW row;
   statement *ptr;
   thread_context *con = (thread_context *)p;
 
@@ -1783,7 +1782,8 @@ extern "C" void *run_task(void *p) {
             fprintf(stderr, "%s: Error when storing result: %d %s\n",
                     my_progname, mysql_errno(mysql), mysql_error(mysql));
           else {
-            while ((row = mysql_fetch_row(result))) counter++;
+            while (mysql_fetch_row(result)) {
+            }
             mysql_free_result(result);
           }
         }

extra/libfido2/libfido2-1.8.0/CMakeLists.txt

@@ -309,6 +309,9 @@ if(CMAKE_COMPILER_IS_GNUCC)
 endif()
 
 DISABLE_MISSING_PROFILE_WARNING()
+IF(MY_COMPILER_IS_GNU_OR_CLANG)
+  STRING_APPEND(CMAKE_C_FLAGS " -Wno-strict-prototypes")
+ENDIF()
 
 # Decide which keyword to use for thread-local storage.
 if(CMAKE_COMPILER_IS_GNUCC OR

plugin/clone/src/clone_hton.cc

@@ -236,7 +236,7 @@ int hton_clone_apply_begin(THD *thd, const char *clone_data_dir,
     return (clone_args.m_err);
   }
 
-  uint32_t loop_index = 0;
+  uint32_t loop_index [[maybe_unused]] = 0;
 
   for (auto &loc_iter : clone_loc_vec) {
     uint32_t task_id = 0;

plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task_debug.cc

@@ -38,9 +38,7 @@ char *mystrcat(char *dest, int *size, const char *src) {
   int current_size = *size;
   char *ret = dest;
 
-  int num = 0;
   while (*dest) {
-    num++;
     dest++;
   }
 

plugin/group_replication/src/plugin.cc

@@ -80,7 +80,6 @@ SERVICE_TYPE(log_builtins_string) * log_bs;
   These pointers will be initialized on plugin_group_replication_init()
   or plugin_group_replication_start().
 */
-constexpr gr_modules::mask gr_modules::all_modules;
 /** The plugin applier */
 Applier_module *applier_module = nullptr;
 /** The plugin recovery module */

router/src/harness/include/mysql/harness/net_ts/internet.cpp

@@ -23,7 +23,3 @@
 */
 
 #include "mysql/harness/net_ts/internet.h"
-
-// materialize constexpr's
-
-constexpr net::ip::resolver_base::flags net::ip::resolver_base::passive;

router/src/harness/include/mysql/harness/net_ts/socket.cpp

@@ -23,18 +23,3 @@
 */
 
 #include "mysql/harness/net_ts/socket.h"
-
-// materialize constexpr's
-
-constexpr net::socket_base::wait_type net::socket_base::wait_write;
-constexpr net::socket_base::wait_type net::socket_base::wait_read;
-constexpr net::socket_base::wait_type net::socket_base::wait_error;
-
-constexpr net::socket_base::shutdown_type net::socket_base::shutdown_receive;
-constexpr net::socket_base::shutdown_type net::socket_base::shutdown_send;
-constexpr net::socket_base::shutdown_type net::socket_base::shutdown_both;
-
-constexpr net::socket_base::message_flags net::socket_base::message_peek;
-constexpr net::socket_base::message_flags
-    net::socket_base::message_do_not_route;
-constexpr net::socket_base::message_flags net::socket_base::message_out_of_band;

router/src/harness/src/config_parser.cc

@@ -53,9 +53,6 @@ using mysql_harness::utility::strip;
 
 namespace mysql_harness {
 
-// satisfy ODR requirements
-constexpr const char *Config::DEFAULT_PATTERN;
-
 bool is_valid_conf_ident_char(const char ch) {
   return isalnum(ch) || ch == '_';
 }

router/src/harness/src/logging/handler.cc

@@ -132,9 +132,6 @@ std::string Handler::format(const Record &record) const {
 
 void Handler::handle(const Record &record) { do_log(record); }
 
-// satisfy ODR
-constexpr const char *StreamHandler::kDefaultName;
-
 ////////////////////////////////////////////////////////////////
 // class StreamHandler
 
@@ -159,9 +156,6 @@ NullHandler::NullHandler(bool format_messages, LogLevel level,
 
 void NullHandler::do_log(const Record & /*record*/) {}
 
-// satisfy ODR
-constexpr const char *NullHandler::kDefaultName;
-
 ////////////////////////////////////////////////////////////////
 // class FileHandler
 
@@ -299,9 +293,6 @@ void FileHandler::do_log(const Record &record) {
   }
 }
 
-// satisfy ODR
-constexpr const char *FileHandler::kDefaultName;
-
 FileHandler::~FileHandler() = default;
 
 }  // namespace logging

router/src/harness/src/stdx/io/file_handle.cc

@@ -62,9 +62,6 @@ using namespace std::string_literals;
 namespace stdx {
 namespace io {
 
-constexpr const file_handle::native_handle_type file_handle::invalid_handle;
-constexpr const flag::value_type flag::unlink_on_first_close;
-
 static std::error_code last_posix_error_code() {
   return {errno, std::generic_category()};
 }

router/src/harness/src/tls_server_context.cc

@@ -57,9 +57,6 @@ constexpr int kMinRsaKeySize{2048};
 #endif
 constexpr int kMinDhKeySize{1024};
 
-constexpr std::array<const char *, 9>
-    TlsServerContext::unacceptable_cipher_spec;
-
 namespace {
 const SSL_METHOD *server_method =
 #if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0)

router/src/http/src/CMakeLists.txt

@@ -162,7 +162,6 @@ TARGET_INCLUDE_DIRECTORIES(http_auth_realm PRIVATE
 
 ADD_HARNESS_PLUGIN(http_server
   SOURCES
-  content_type.cc
   http_auth.cc
   http_auth_method_basic.cc
   http_server_component.cc

router/src/http/src/base64.cc

@@ -23,18 +23,3 @@
 */
 
 #include "../src/base64.h"
-
-// instantiate the constexpr's
-
-namespace Base64Alphabet {
-constexpr alphabet_type Base64::alphabet;
-constexpr inverse_alphabet_type Base64::inverse_alphabet;
-constexpr alphabet_type Mcf::alphabet;
-constexpr inverse_alphabet_type Mcf::inverse_alphabet;
-constexpr alphabet_type Crypt::alphabet;
-constexpr inverse_alphabet_type Crypt::inverse_alphabet;
-constexpr alphabet_type Bcrypt::alphabet;
-constexpr inverse_alphabet_type Bcrypt::inverse_alphabet;
-constexpr alphabet_type Uuencode::alphabet;
-constexpr inverse_alphabet_type Uuencode::inverse_alphabet;
-}  // namespace Base64Alphabet

router/src/http/src/content_type.cc

@@ -32,9 +32,6 @@
 
 #include "../src/base64.h"
 
-// instantiate the constexpr members
-constexpr const char HttpAuthMethodBasic::kMethodName[];
-
 HttpAuthMethodBasic::AuthData HttpAuthMethodBasic::decode_authorization(
     const std::string &http_auth_data, std::error_code &ec) {
   std::vector<uint8_t> decoded;

router/src/http/src/http_auth_method_basic.cc

@@ -42,12 +42,6 @@
 
 #include "base64.h"
 
-constexpr char Pbkdf2McfType::kTypeSha256[];
-constexpr char Pbkdf2McfType::kTypeSha512[];
-constexpr unsigned long Pbkdf2McfAdaptor::kMaxRounds;
-constexpr unsigned long Pbkdf2McfAdaptor::kMinRounds;
-constexpr size_t Pbkdf2McfAdaptor::kMaxSaltLength;
-
 std::vector<uint8_t> Pbkdf2::salt() {
   std::vector<uint8_t> out(16);
 

router/src/http/src/kdf_pbkdf2.cc

@@ -42,13 +42,6 @@
 
 #include "base64.h"
 
-constexpr char ShaCryptMcfType::kTypeSha256[];
-constexpr char ShaCryptMcfType::kTypeSha512[];
-constexpr char ShaCryptMcfType::kTypeCachingSha2Password[];
-constexpr unsigned long ShaCryptMcfAdaptor::kDefaultRounds;
-constexpr unsigned long ShaCryptMcfAdaptor::kMinRounds;
-constexpr unsigned long ShaCryptMcfAdaptor::kMaxRounds;
-
 std::string ShaCrypt::salt() {
   // 12 byte input, generate 16 byte output
   std::vector<uint8_t> out(12);

router/src/http/src/kdf_sha_crypt.cc

@@ -79,7 +79,6 @@ SET_TARGET_PROPERTIES(routertest_http_auth_method PROPERTIES
 
 add_test_file(test_content_type.cc
   MODULE http
-  EXTRA_SOURCES ../src/content_type.cc
   )
 ## content_type.cc is from the http_server plugin and its symbols are marked a "dllimport"
 ## by default. As we use them directly, mark them as "static" instead.
@@ -105,7 +104,6 @@ IF(LIBFUZZER_COMPILE_FLAGS)
     ../src/kdf_sha_crypt.cc
     ../src/kdf_pbkdf2.cc
     ../src/mcf_error.cc
-    ../src/base64.cc
     COMPONENT Router
     LINK_LIBRARIES ${SSL_LIBRARIES} metadata_cache
     RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
@@ -121,7 +119,6 @@ IF(LIBFUZZER_COMPILE_FLAGS)
   MYSQL_ADD_EXECUTABLE(routerfuzz_auth_method_basic
     fuzz_auth_method_basic.cc
     ../src/http_auth_method_basic.cc
-    ../src/base64.cc
     COMPONENT Router
     RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     SKIP_INSTALL
@@ -135,7 +132,6 @@ IF(LIBFUZZER_COMPILE_FLAGS)
   ## base64
   MYSQL_ADD_EXECUTABLE(routerfuzz_base64
     fuzz_base64.cc
-    ../src/base64.cc
     COMPONENT Router
     RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     SKIP_INSTALL

router/src/http/tests/CMakeLists.txt

@@ -70,10 +70,9 @@ int main(int argc, const char **argv) {
               "//\n"
               "// (see " __FILE__ ")\n"
               "#include \"%s\"\n"
-              "\n"
-              "constexpr const char %s::data_[];\n",
+              "\n",
               argv[0], in_filename, out_filename, hdr_filename, symbol_name,
-              hdr_filename, symbol_name))
+              hdr_filename))
         throw_error("Failed writing output file", out_filename);
       if (fclose(out_file))
         throw_error("Failed closing output file", out_filename);

router/src/json_schema_embedder/json_schema_embedder.cc

@@ -113,15 +113,12 @@ std::optional<std::vector<uint8_t>> MySQLNativePassword::scramble(
   return impl::scramble(nonce, password, EVP_sha1(), true);
 }
 
-constexpr char MySQLNativePassword::name[];
-
 // caching_sha2_password
 
 std::optional<std::vector<uint8_t>> CachingSha2Password::scramble(
     std::string_view nonce, std::string_view password) {
   return impl::scramble(nonce, password, EVP_sha256(), false);
 }
-constexpr char CachingSha2Password::name[];
 
 // clear_text_password
 
@@ -134,5 +131,3 @@ std::optional<std::vector<uint8_t>> ClearTextPassword::scramble(
 
   return res;
 }
-
-constexpr char ClearTextPassword::name[];

router/src/mock_server/src/authentication.cc

@@ -37,11 +37,6 @@
 #include <stdexcept>
 #include <thread>
 
-/* static */ constexpr std::chrono::milliseconds
-    MockServerRestClient::kMockServerMaxRestEndpointStepTime;
-/* static */ constexpr std::chrono::milliseconds
-    MockServerRestClient::kMockServerDefaultRestEndpointTimeout;
-
 MockServerRestClient::MockServerRestClient(const uint16_t http_port,
                                            const std::string &http_hostname)
     : http_hostname_(http_hostname), http_port_(http_port) {}

router/src/mock_server/src/mock_server_rest_client.cc

@@ -35,8 +35,6 @@
 #include "mysqlrouter/connection_pool_component.h"
 #include "mysqlrouter/rest_api_utils.h"
 
-constexpr const char RestConnectionPoolConfig::path_regex[];
-
 bool RestConnectionPoolConfig::on_handle_request(
     HttpRequest &req, const std::string & /* base_path */,
     const std::vector<std::string> &path_matches) {

router/src/rest_connection_pool/src/rest_connection_pool_config.cc

@@ -30,8 +30,6 @@
 #include "mysqlrouter/connection_pool_component.h"
 #include "mysqlrouter/rest_api_utils.h"
 
-constexpr const char RestConnectionPoolList::path_regex[];
-
 bool RestConnectionPoolList::on_handle_request(
     HttpRequest &req, const std::string & /* base_path */,
     const std::vector<std::string> & /* path_matches */) {

router/src/rest_connection_pool/src/rest_connection_pool_list.cc

@@ -37,8 +37,6 @@
 #include "mysqlrouter/connection_pool_component.h"
 #include "mysqlrouter/rest_api_utils.h"
 
-constexpr const char RestConnectionPoolStatus::path_regex[];
-
 bool RestConnectionPoolStatus::on_handle_request(
     HttpRequest &req, const std::string & /* base_path */,
     const std::vector<std::string> &path_matches) {

router/src/rest_connection_pool/src/rest_connection_pool_status.cc

@@ -34,8 +34,6 @@
 #include "mysqlrouter/metadata_cache.h"
 #include "mysqlrouter/rest_api_utils.h"
 
-constexpr const char RestClustersList::path_regex[];
-
 bool RestClustersList::on_handle_request(
     HttpRequest &req, const std::string & /* base_path */,
     const std::vector<std::string> & /* path_matches */) {

router/src/rest_metadata_cache/src/rest_clusters_list.cc

@@ -34,8 +34,6 @@
 #include "mysqlrouter/metadata_cache.h"
 #include "mysqlrouter/rest_api_utils.h"
 
-constexpr const char RestClustersNodes::path_regex[];
-
 static const char *server_mode_to_string(metadata_cache::ServerMode mode) {
   switch (mode) {
     case metadata_cache::ServerMode::ReadOnly:

router/src/rest_metadata_cache/src/rest_clusters_nodes.cc

@@ -34,8 +34,6 @@
 #include "mysqlrouter/metadata_cache.h"
 #include "mysqlrouter/rest_api_utils.h"
 
-constexpr const char RestMetadataCacheConfig::path_regex[];
-
 template <class AllocatorType>
 static rapidjson::Value json_value_from_string(const std::string &s,
                                                AllocatorType &allocator) {