1. 05 May, 2024 11 commits
    • Monty's avatar
      MDEV-34077 scripts/mariadb-install-db: Error in my_thread_global_end(): 1 threads didn't exit · cd0356a7
      Monty authored
      followup for 952ab9a5
      
      chery-pick of 814dc467 into 10.5
      cd0356a7
    • Sergei Golubchik's avatar
      bugfix: buffer overwrite in mariadb-backup · 983e6ca0
      Sergei Golubchik authored
      this fixes galera.galera_sst_mariabackup_table_options
      
      Note that `man snprintf` says
      
        The functions snprintf() and vsnprintf() do not write more
        than size bytes (including the terminating null byte
        ('\0')). If the output was truncated due to this limit, then
        the return value is the number of characters (excluding the
        terminating null byte) which would have been written to the
        final string if enough space had been available.
      983e6ca0
    • Sergei Golubchik's avatar
      mtr: remove innodb combinations · 349ca2be
      Sergei Golubchik authored
      dead code for about 10 years
      349ca2be
    • Sergei Golubchik's avatar
      bugfix: mysqld --safe-mode crashes · df6899b3
      Sergei Golubchik authored
      df6899b3
    • Sergei Golubchik's avatar
      MDEV-19487 fix for --view · d74fee9e
      Sergei Golubchik authored
      followup for d7df63e1
      d74fee9e
    • Sergei Golubchik's avatar
      MDEV-30727 Check spider_hton_ptr in spider udfs · 03295f0c
      Sergei Golubchik authored
      UDF isn't supposed to use my_error(), it should return
      the error message in the provided error message buffer
      
      Fixes valgrind:
      
      ==93993== Conditional jump or move depends on uninitialised value(s)
      ==93993==    at 0x484ECCD: strnlen (in /usr/libexec/valgrind/vgpreload_memcheck-amd64-linux.so)
      ==93993==    by 0x1AD2B2C: process_str_arg (my_vsnprintf.c:259)
      ==93993==    by 0x1AD47E0: my_vsnprintf_ex (my_vsnprintf.c:696)
      ==93993==    by 0x1A3B91E: my_error (my_error.c:120)
      ==93993==    by 0xF87BE8: udf_handler::fix_fields(THD*, Item_func_or_sum*, unsigned int, Item**) (item_func.cc:3638)
      
      followup for 267dd5a9
      03295f0c
    • Sergei Golubchik's avatar
      sporadic failures of rpl.rpl_parallel_sbm · 7a789e20
      Sergei Golubchik authored
      the test waits for the event to get stuck on MASTER_DELAY,
      but on a slow/overloaded slave the event might pass MASTER_DELAY
      before the test starts waiting.
      
      Wait for the event to get stuck on the LOCK TABLES (after MASTER_DELAY),
      the event cannot avoid that,
      7a789e20
    • Sergei Golubchik's avatar
      cleanup: use THD_STAGE_INFO, not thd_proc_info · cea083af
      Sergei Golubchik authored
      and put master-slave.inc *last* in the series of includes
      cea083af
    • Sergei Golubchik's avatar
      sporadic failure of perfschema.func_file_io · cb7c9967
      Sergei Golubchik authored
      --- func_file_io.result
      +++ func_file_io.reject
      @@ -134,7 +134,7 @@
       Variable_name	Value
       Performance_schema_accounts_lost	0
       Performance_schema_cond_classes_lost	0
      -Performance_schema_cond_instances_lost	0
      +Performance_schema_cond_instances_lost	5
       Performance_schema_digest_lost	0
       Performance_schema_file_classes_lost	0
       Performance_schema_file_handles_lost	0
      cb7c9967
    • Nikita Malyavin's avatar
      MDEV-30046 wrong row targeted with "insert ... on duplicate" and "replace" · 72429cad
      Nikita Malyavin authored
      When HA_DUPLICATE_POS is not supported, the row to replace was navigated by
      ha_index_read_idx_map, which uses only hash to navigate.
      
      Suchwise, given a hash collision it may choose an incorrect row.
      
      handler::position would be correct and very convenient to use here.
      
      dup_ref is already set by handler independently of the engine
      capabilities, when an extra lookup is made (for long unique or something else,
      for example WITHOUT OVERLAPS) such error will be indicated by
      file->lookup_errkey != -1.
      72429cad
    • Alexander Barkov's avatar
      MDEV-34088 The TIMESTAMP value of '1970-01-01 00:00:00' can be indirectly inserted in strict mode · 7f161a5c
      Alexander Barkov authored
      In strict mode a timestamp(0) column could be directly assigned from
      another timestamp(N>0) column with the value '1970-01-01 00:00:00.1'
      (at time zone '+00:00'), or with any other value '1970-01-01 00:00:00.XXXXXX'
      with non-zero microsecond value XXXXXX.
      This assignment happened silently without warnings or errors.
      
      It worked as follows:
      
      - The value {tv_sec=0, tv_usec=100000}, which is '1970-01-01 00:00:00.1'
        was rounded to {tv_sec=0, tv_usec=0}, which is '1970-01-01 00:00:00.0'
      
      - Then {tv_sec=0, tv_usec=0} was silently re-interpreted as zero datetime.
      
      After the fix this assignment always raises a warning,
      which in case of the strict mode is escalated to an error.
      
      The problem in this scenario is that '1970-01-01 00:00:00' cannot be stored,
      because its timeval value {tv_sec=0, tv_usec=0} is reserved for zero datetimes.
      Thus the warning should be raised no matter if sql_mode allows or disallows
      zero dates.
      7f161a5c
  2. 04 May, 2024 2 commits
  3. 03 May, 2024 6 commits
    • Vladislav Vaintroub's avatar
      MDEV-34063 tpool - integer overflow in multiplication. · 88f49da8
      Vladislav Vaintroub authored
      When calculating next wakeup timepoint for the timer thread, with large
      thread_pool_stall_limit values, 32bit int overflow can happen.
      Fixed by making one operand 8 byte large.
      
      Also fixed the type of tick_interval to be unsigned, so it does not
      go negative for very thread_pool_stall_limit.
      88f49da8
    • Vladislav Vaintroub's avatar
      b18259ec
    • Vladislav Vaintroub's avatar
      MDEV-33876 CMake, zlib - use names compatible with official FindZLIB.cmake · 029e2a5f
      Vladislav Vaintroub authored
      - ZLIB_LIBRARIES, not ZLIB_LIBRARY
      - ZLIB_INCLUDE_DIRS, not ZLIB_INCLUDE_DIR
      
      For building libmariadb, ZLIB_LIBRARY/ZLIB_INCLUDE_DIR are still defined
      This workaround will be removed later.
      029e2a5f
    • Marko Mäkelä's avatar
      MDEV-33817: AVX512BW and VPCLMULQDQ based CRC-32 · 9ec7819c
      Marko Mäkelä authored
      This is based on https://github.com/intel/intel-ipsec-mb/
      and has been tested both on x86 and x86-64, with code that
      was generated by several versions of GCC and clang.
      GCC 11 or clang 8 or later should be able to compile this,
      and so should recent versions of MSVC.
      
      Thanks to Intel Corporation for providing access to hardware,
      for answering my questions regarding the code, and for
      providing the coefficients for the CRC-32C computation.
      
      crc32_avx512(): Compute a reverse polynomial CRC-32 using
      precomputed tables and carry-less product, for up to 256 bytes
      of unaligned input per loop iteration.
      
      Reviewed by: Vladislav Vaintroub
      9ec7819c
    • Marko Mäkelä's avatar
      MDEV-33817 preparation: Restructuring and unit tests · 611cd6b9
      Marko Mäkelä authored
      In our unit test, let us rely on our own reference
      implementation using the reflected
      CRC-32 ISO 3309 and CRC-32C polynomials. Let us also
      test with various lengths.
      
      Let us refactor the CRC-32 and CRC-32C implementations
      so that no special compilation flags will be needed and
      that some function call indirection will be avoided.
      
      pmull_supported: Remove. We will have pointers to two separate
      functions crc32c_aarch64_pmull() and crc32c_aarch64().
      611cd6b9
    • Yuchen Pei's avatar
      MDEV-33538 make auxiliary spider plugins init depend on actual spider · b84d335d
      Yuchen Pei authored
      The two I_S plugins SPIDER_ALLOC_MEM and SPIDER_WRAPPER_PROTOCOL
      only makes sense if the main SPIDER plugin is installed. Further,
      SPIDER_ALLOC_MEM requires a mutex that requires SPIDER init to fill
      the table.
      
      We also update the spider init query to override
      --transaction_read_only=on so that it does not affect the spider init.
      
      Also fixed error handling in spider_db_init() so that failure in
      spider table init does not result in memory leak
      b84d335d
  4. 02 May, 2024 1 commit
    • Vladislav Vaintroub's avatar
      postfix a09ebe55 (PCRE-10.43) · 20f60fe7
      Vladislav Vaintroub authored
      - no need to switch off -fsanitize-address for MSVC anymore
      - option /WX is MSVC only
      - CMAKE_C_STANDARD C99 is already in pcre's own CMakeLists.txt
      20f60fe7
  5. 30 Apr, 2024 3 commits
    • Daniel Black's avatar
      MDEV-33631 Ubuntu/Debian MYSQL_SERVER_SUFFIX is version+suffix on MariaDB packaged versions · e63ed4e0
      Daniel Black authored
      The debian/rules removed sufficient version information from the
      downstream version, however the mariadb upstream has a +
      separator from the suffix.
      
      While we are at it, remove the Debian/Ubuntu revision -1.
      
      Other revisions used:
      * Debian unstable (inherited to both Debian and Ubuntu if package unchanged): 1:10.11.6-2
      * Ubuntu stable updates example: 1:10.11.6-0ubuntu0.23.10.2
      * Debian stable updates example: 1:10.11.4-1~deb12u1
      
      The result is compulation with:
          -DMYSQL_SERVER_SUFFIX="-1:10.4.34+maria~deb10" \
      
      Compared to Debian:
          -DMYSQL_SERVER_SUFFIX="-1~deb12u1" \
      
      The impact comes into play with SELECT VERSION():
          10.4.34-MariaDB-1:10.4.34+maria~deb10
      
      A more abbreviated form of the following is much more human/machine parsable:
          10.6.16-MariaDB~ubu2004
      
      Reviewer: Otto Kekäläinen
      e63ed4e0
    • Dimitri John Ledkov's avatar
      openssl: add a more specific DES support detection · bf77f979
      Dimitri John Ledkov authored
      Improve detection for DES support in OpenSSL, to allow compilation
      against system OpenSSL without DES.
      
      Note that MariaDB needs to be compiled against OpenSSL-like library
      that itself has DES support which cmake detected. Positive detection
      is indicated with CMake variable HAVE_des 1.
      Signed-off-by: default avatarDimitri John Ledkov <dimitri.ledkov@surgut.co.uk>
      bf77f979
    • Bernard Spil's avatar
      Fix typo · f9575495
      Bernard Spil authored
      There is no component `SuportFiles` in MariaDB server, yet a `SupportFiles` component exists.
      f9575495
  6. 29 Apr, 2024 6 commits
    • Rucha Deodhar's avatar
      MDEV-22141: JSON_REMOVE returns NULL on valid arguments · 9e6858a4
      Rucha Deodhar authored
      Analysis:
      When we scan json to get to a beginning according to the path, we end up
      scanning json even if we have exhausted it. When eventually returns error.
      
      Fix:
      Continue scanning json only if we have not exhausted it and return result
      accordingly.
      9e6858a4
    • Rucha Deodhar's avatar
      MDEV-32287: JSON_EXTRACT not returning multiple values for same path · 5ca64e65
      Rucha Deodhar authored
      Analysis:
      When scanning json and getting the exact path at each step, if a path
      is reached, we end up adding the item in the result and immediately get the
      next item which results in current path changing.
      Fix:
      Instead of immediately returning the item, count the occurences of the path
      in argument and append in the result as needed.
      5ca64e65
    • Rucha Deodhar's avatar
      MDEV-19487: JSON_TYPE doesnt detect the type of String Values · d7df63e1
      Rucha Deodhar authored
      (returns NULL) and for Date/DateTime returns "INTEGER"
      
      Analysis:
      When the first character of json is scanned it is number. Based on that
      integer is returned.
      Fix:
      Scan rest of the json before returning the final result to ensure json is
      valid in the first place in order to have a valid type.
      d7df63e1
    • Alexander Barkov's avatar
      MDEV-30646 View created via JSON_ARRAYAGG returns incorrect json object · c6e3fe29
      Alexander Barkov authored
      Backporting add782a1 from 10.6, this fixes the problem.
      c6e3fe29
    • Alexander Barkov's avatar
      MDEV-21058 CREATE TABLE with generated column and RLIKE results in sigabrt · dc25d600
      Alexander Barkov authored
      Regexp_processor_pcre::fix_owner() called Regexp_processor_pcre::compile(),
      which could fail on the regex syntax error in the pattern and put
      an error into the diagnostics area. However, the callers:
        - Item_func_regex::fix_length_and_dec()
        - Item_func_regexp_instr::fix_length_and_dec()
      still returned "false" in such cases, which made the code
      crash later inside Diagnostics_area::set_ok_status().
      
      Fix:
      
      - Change the return type of fix_onwer() from "void" to "bool"
        and return "true" whenever an error is put to the DA
        (e.g. on the syntax error in the pattern).
      - Fixing fix_length_and_dec() of the mentioned Item_func_xxx
        classes to return "true" if fix_onwer() returned "true".
      dc25d600
    • Yuchen Pei's avatar
      MDEV-30727 Check spider_hton_ptr in spider udfs · 267dd5a9
      Yuchen Pei authored
      We have to #undef my_error and find it from udfs when spider is not
      installed.
      267dd5a9
  7. 28 Apr, 2024 2 commits
  8. 27 Apr, 2024 1 commit
    • Alexander Barkov's avatar
      MDEV-33534 UBSAN: Negation of -X cannot be represented in type 'long long... · 3141a68b
      Alexander Barkov authored
      MDEV-33534 UBSAN: Negation of -X cannot be represented in type 'long long int'; cast to an unsigned type to negate this value to itself in my_double_round from sql/item_func.cc|
      
      The negation in this line:
        ulonglong abs_dec= dec_negative ? -dec : dec;
      did not take into account that 'dec' can be the smallest possible
      signed negative value -9223372036854775808. Its negation is
      an operation with an undefined behavior.
      
      Fixing the code to use Longlong_hybrid, which implements a safe
      method to get an absolute value.
      3141a68b
  9. 26 Apr, 2024 1 commit
    • Hugo Wen's avatar
      MDEV-33574 Improve mysqlbinlog error message · 3d417476
      Hugo Wen authored
      Previously, when running mysqlbinlog without providing a binlog file, it
      would print the entire help text, which was very verbose and made it
      difficult to identify the actual issue.
      
      Now change the behavior to print a more concise error message instead:
      
          "ERROR: Please provide the log file(s). Run with '--help' for usage instructions."
      
      This makes the error output more user-friendly and easier to understand,
      especially when running the tool in scripts or automated processes.
      
      All new code of the whole pull request, including one or several files
      that are either new files or modified ones, are contributed under the
      BSD-new license. I am contributing on behalf of my employer
      Amazon Web Services, Inc.
      3d417476
  10. 25 Apr, 2024 5 commits
    • Jan Lindström's avatar
      MDEV-33896 : Galera test failure on galera_3nodes.MDEV-29171 · b3e531a3
      Jan Lindström authored
      Based on logs we might start SST before donor has reached
      Primary state. Because this test shutdowns all nodes we
      need to make sure when we start nodes that previous nodes
      have reached Primary state and joined the cluster.
      Signed-off-by: default avatarJulius Goryavsky <julius.goryavsky@mariadb.com>
      b3e531a3
    • Marko Mäkelä's avatar
      MDEV-26450 fixup: Remove a bogus assertion · 10d251e0
      Marko Mäkelä authored
      mtr_t::commit_shrink(): Do not assert that some previously clean pages
      will be flagged as modified by this mini-transaction. It could be the
      case that there had been no recent write-back of any of the undo
      tablespace pages that we are modifying when truncating the tablespace.
      It suffices to assert that some pages were modified again:
      ut_ad(m_modifications).
      
      This fixes up commit f5fddae3
      10d251e0
    • Kristian Nielsen's avatar
      MDEV-33602: Sporadic test failure in rpl.rpl_gtid_stop_start · 553a4d62
      Kristian Nielsen authored
      The test could fail with a duplicate key error because switching to non-GTID
      mode could start at the wrong old-style position. The position could be
      wrong when the previous GTID connect was stopped before receiving the fake
      GTID list event which gives the old-style position corresponding to the GTID
      connected position.
      
      Work-around by injecting an extra event and syncing the slave before
      switching to non-GTID mode.
      Signed-off-by: default avatarKristian Nielsen <knielsen@knielsen-hq.org>
      553a4d62
    • Marko Mäkelä's avatar
      MDEV-33974 Enable GNU libstdc++ debugging · a1c1f502
      Marko Mäkelä authored
      Starting with GCC 10, let us enable _GLIBCXX_DEBUG as well as
      _GLIBCXX_ASSERTIONS which have an impact on the GNU libstdc++.
      On GCC 8, we observed a compilation failure related to some
      missing type conversion.
      
      Even though clang on GNU/Linux would default to using libstdc++
      and enabling the debugging seems to work with clang-18, we will
      not enable this on clang, in case it would lead to compilation
      errors.
      
      For the clang libc++ before clang-15 there was _LIBCPP_DEBUG,
      but according to
      llvm/llvm-project@f3966eaf869b7bdd9113ab9d5b78469eb0f5f028 and
      llvm/llvm-project@13ea1343231fa4ae12fe9fba4c789728465783d7 and
      llvm/llvm-project@ff573a42cd1f1d05508f165dc3e645a0ec17edb5 it
      looks like that for proper results, a specially built debug version
      of libc++ would have to be used in order to enable equivalent checks.
      
      This should help catch bugs like the one that
      commit 455a15fd fixed.
      
      Reviewed by: Sergei Golubchik
      a1c1f502
    • Marko Mäkelä's avatar
      MDEV-23974 fixup: Cover all debug builds · 72293842
      Marko Mäkelä authored
      While commit 75b7cd68 was a significant
      improvement, we occasionally got test failures of debug builds. One of
      the affected tests is innodb.innodb-64k-crash.
      72293842
  11. 24 Apr, 2024 2 commits