1. 28 Mar, 2022 1 commit
  2. 25 Mar, 2022 6 commits
  3. 24 Mar, 2022 5 commits
    • Rucha Deodhar's avatar
      MDEV-27819: func_2.xxx_charset skipped after renaming utf8 to utf8mb3 · 0da5f45a
      Rucha Deodhar authored
      Analysis: utf8 character set is now utf8mb3 or utf8mb4. So charset_master
      is not able to find utf8 at the beginning of test. Hence it skips the tests
      that use charset_master.
      Fix: rename utf8 to utf8mb3 in charset_master.
      0da5f45a
    • Marko Mäkelä's avatar
      MDEV-28137 Some memory transactions are unnecessarily complex · 8684af76
      Marko Mäkelä authored
      buf_page_get_zip(): Do not perform a system call inside a
      memory transaction. Instead, if the page latch is unavailable,
      abort the memory transaction and let the fall-back code path
      wait for the page latch.
      
      buf_pool_t::watch_remove(): Return the previous state of the block.
      
      buf_page_init_for_read(): Use regular stores for moving the
      buffer fix count of watch_remove() to the new block descriptor.
      
      A more extensive version of this was reviewed by Daniel Black
      and tested with Intel TSX-NI by Axel Schwenke and Matthias Leich.
      My assumption that regular loads and stores would execute faster
      in a memory transaction than operations like std::atomic::fetch_add()
      turned out to be incorrect.
      8684af76
    • Marko Mäkelä's avatar
      MDEV-23974 fixup: rpl.rpl_gtid_stop_start fails · b101f19d
      Marko Mäkelä authored
      The call mtr.add_suppression() that was added
      in commit 75b7cd68
      for MemorySanitizer and Valgrind runs is causing
      a result difference for the test rpl.rpl_gtid_stop_start.
      Let us disable the binlog for executing that statement.
      
      Also, the test perfschema.statement_program_lost_inst
      would fail due to the changes to have_innodb.inc in this commit.
      To compensate for that, we will make more --suite=perfschema
      tests run without InnoDB, and explicitly enable InnoDB in
      those tests that depend on a transactional storage engine.
      b101f19d
    • Daniel Black's avatar
      Merge 10.7 · 0444d86b
      Daniel Black authored
      0444d86b
    • Daniel Black's avatar
      Merge 10.6 into 10.7 · e86986a1
      Daniel Black authored
      e86986a1
  4. 23 Mar, 2022 8 commits
    • Sergei Golubchik's avatar
    • Sergei Golubchik's avatar
      MDEV-28106 S3 tries to include thread.h while compiling on Windows · 2ca3861b
      Sergei Golubchik authored
      S3 engine and libmarias3 don't compile on Windows
      
      also fixes:
      MDEV-28104 Typo in storage/maria/s3_func.c: 'FN_DECVHAR
      2ca3861b
    • Marko Mäkelä's avatar
      MDEV-23974 Tests fail due to [Warning] InnoDB: Trying to delete tablespace · 75b7cd68
      Marko Mäkelä authored
      A few regression tests invoke heavy flushing of the buffer pool
      and may trigger warnings that tablespaces could not be deleted
      because of pending writes. Those warnings are to be expected
      during the execution of such tests.
      
      The warnings are also frequently seen with Valgrind or MemorySanitizer.
      For those, the global suppression in have_innodb.inc does the trick.
      75b7cd68
    • Marko Mäkelä's avatar
      Cleanup: have_sanitizer='ASAN,UBSAN' · 44231dc6
      Marko Mäkelä authored
      This was suggested by Sergei Golubhick.
      Fixes up commit b91a123d
      44231dc6
    • Thirunarayanan Balathandayuthapani's avatar
      MDEV-27858 Assertion `page_dir_get_n_heap(new_page) == 2U' failed in PageBulk::init · c3ca729b
      Thirunarayanan Balathandayuthapani authored
      - InnoDB should check whether bulk transaction id set to its own
      transaction id before start bulk insert operation.
      
      - When bulk insert failure happens, InnoDB should set the error info
      of the transaction.
      c3ca729b
    • Tuukka Pasanen's avatar
      MDEV-28120 Remove false-positive Lintian linking error · 9c57bbda
      Tuukka Pasanen authored
      Lintian uses objdump-command to determine is share object linked against
      C-libary. Compression provider shared objects does not have any symbols
      from C-library they only depend compression library and MariaDB
      libaries. This is false-positive as Lintian error itself is correct as
      shared object does not share any symbols from for example Glibc.
      
      Added overrides suppress Lintian errors:
       * E: mariadb-plugin-provider-bzip2: library-not-linked-against-libc usr/lib/mysql/plugin/provider_bzip2.so
       * E: mariadb-plugin-provider-lz4: library-not-linked-against-libc usr/lib/mysql/plugin/provider_lz4.so
       * E: mariadb-plugin-provider-lzma: library-not-linked-against-libc usr/lib/mysql/plugin/provider_lzma.so
       * E: mariadb-plugin-provider-lzo: library-not-linked-against-libc usr/lib/mysql/plugin/provider_lzo.so
       * E: mariadb-plugin-provider-snappy: library-not-linked-against-libc usr/lib/mysql/plugin/provider_snappy.so
      9c57bbda
    • Tuukka Pasanen's avatar
      MDEV-28135: Add missing conflict and breaks for MariaDB 10.6 · 770f62bf
      Tuukka Pasanen authored
      There is missing conflict and breaks for MariaDB 10.6 which
      can cause upgrading from 10.6 not be clean and end up with
      errors on Debian.
      770f62bf
    • Tuukka Pasanen's avatar
      MDEV-27033: Clean lintian 'extended-description-is-empty' errors · 1960f7b2
      Tuukka Pasanen authored
      Fix Debian lintian errors:
        E: mariadb-plugin-provider-bzip2: extended-description-is-empty
        E: mariadb-plugin-provider-lz4: extended-description-is-empty
        E: mariadb-plugin-provider-lzma: extended-description-is-empty
        E: mariadb-plugin-provider-lzo: extended-description-is-empty
        E: mariadb-plugin-provider-snappy: extended-description-is-empty
      by adding Debian Policy Manual section 3.4 (The description
      of a package) extended descriptions to mariadb-plugin-provide-*
      packages
      1960f7b2
  5. 22 Mar, 2022 2 commits
    • Andrei's avatar
      MDEV-27760 event may non stop replicate in circular semisync setup · 5ccd845d
      Andrei authored
      MDEV-21117 had to relax own events acceptance condition for a case
      when a former semisync master server recovers after crash as the
      semisync slave. That however admitted a possibility for endless event
      "orbiting" in the non-strict slave gtid mode of semisync circular
      setup.
      
      The same server-id event termination is restored now for
      the non-strict gtid mode to follow regular rules (that is it's ignored
      unless @@global.replicate_same_server_id allows it in).
      
      To address MDEV-21117 recovery agenda,
      in the strict gtid mode and the transaction's gtid ordered strictly
      greater than the current slave gtid state, the same server-id
      transaction is accepted.
      
      The gtid strict mode is safe to accept transactions even if
      the slave state were not set correct by the user, e.g
      at the former master.
      An added test shows a typical out-of-order error at execution so
      no data corruption is guaranteed in such a case.
      5ccd845d
    • Julius Goryavsky's avatar
  6. 18 Mar, 2022 3 commits
    • Marko Mäkelä's avatar
      MDEV-27909 InnoDB: Failing assertion: state == TRX_STATE_NOT_STARTED ... on DDL · 8840583a
      Marko Mäkelä authored
      The fix in commit 6e390a62 (MDEV-26772)
      was a step to the right direction, but implemented incorrectly.
      When an InnoDB persistent statistics table cannot be locked immediately,
      we must not let row_mysql_handle_errors() to roll back the transaction.
      
      lock_table_for_trx(): Add the parameter no_wait (default false)
      for an immediate return of DB_LOCK_WAIT in case of a conflict.
      
      ha_innobase::delete_table(), ha_innobase::rename_table():
      Pass no_wait=true to lock_table_for_trx() when needed,
      instead of temporarily setting THDVAR(thd, lock_wait_timeout) to 0.
      8840583a
    • Otto Kekäläinen's avatar
      Deb: Sync Salsa-CI from Debian MariaDB 10.5 repository · 9595ea89
      Otto Kekäläinen authored
      Since Debian Sid now has MariaDB 10.6, we can't do any upgrade tests in
      Debian Sid for the 10.5 branch anymore. It would just fail with downgrade
      errors.
      
      Also, since MariaDB 10.5 is no longer in Sid, we can't even test 10.5.x
      to 10.5.y upgrades in Sid.
      
      Instead the 10.5 branch salsa-ci.yml should run all builds and tests based
      on Debian Bullseye, which has MariaDB 10.5 (only).
      
      To achieve this, essentially sync most the the salsa-ci.yml contents from
      https://salsa.debian.org/mariadb-team/mariadb-10.5/-/tree/bullseye
      
      Also add a couple Lintian overrides to make Salsa-CI pass.
      
      NOTE TO MERGERS: This commit is intended for the 10.5 branch only, do not
      merge anything from it on 10.6 or any other branch.
      9595ea89
    • Daniel Black's avatar
      Merge branch 10.5 into 10.6 · 065f995e
      Daniel Black authored
      065f995e
  7. 17 Mar, 2022 3 commits
  8. 16 Mar, 2022 5 commits
  9. 15 Mar, 2022 7 commits
    • Daniel Black's avatar
      MDEV-27955 main.func_json_notembedded test fails on out-of-memory · b2c81e06
      Daniel Black authored
      Uses 500M+ of memory by repeating an 8 byte sequence 62.5M times.
      
      Reduce the number of repeats on string reduced by 100 times.
      
      Tested by applying against the reverted MDEV-24909 code. 1000 times
      reduction was too much, but 100 still managed to trigger the bug.
      b2c81e06
    • Daniel Black's avatar
      MDEV-23915 ER_KILL_DENIED_ERROR not passed a thread id (part 2) · 57dbe878
      Daniel Black authored
      Per Marko's comment in JIRA, sql_kill is passing the thread id
      as long long. We change the format of the error messages to match,
      and cast the thread id to long long in sql_kill_user.
      57dbe878
    • Daniel Black's avatar
      MDEV-23915 ER_KILL_DENIED_ERROR not passed a thread id · 99837c61
      Daniel Black authored
      The 10.5 test error main.grant_kill showed up a incorrect
      thread id on a big endian architecture.
      
      The cause of this is the sql_kill_user function assumed the
      error was ER_OUT_OF_RESOURCES, when the the actual error was
      ER_KILL_DENIED_ERROR. ER_KILL_DENIED_ERROR as an error message
      requires a thread id to be passed as unsigned long, however a
      user/host was passed.
      
      ER_OUT_OF_RESOURCES doesn't even take a user/host, despite
      the optimistic comment. We remove this being passed as an
      argument to the function so that when MDEV-21978 is implemented
      one less compiler format warning is generated (which would
      have caught this error sooner).
      
      Thanks Otto for reporting and Marko for analysis.
      99837c61
    • Marko Mäkelä's avatar
      Merge 10.6 into 10.7 · dc4b7f38
      Marko Mäkelä authored
      dc4b7f38
    • Marko Mäkelä's avatar
      Merge 10.5 into 10.6 · 4ef44cc2
      Marko Mäkelä authored
      4ef44cc2
    • Marko Mäkelä's avatar
      MDEV-27985 buf_flush_freed_pages() causes InnoDB to hang · 73fee39e
      Marko Mäkelä authored
      buf_flush_freed_pages(): Assert that neither buf_pool.mutex
      nor buf_pool.flush_list_mutex are held. Simplify the loops.
      Return the tablespace and the number of pages written or punched.
      
      buf_flush_LRU_list_batch(), buf_do_flush_list_batch():
      Release buf_pool.mutex before invoking buf_flush_space().
      
      buf_flush_list_space(): Acquire the mutexes only after invoking
      buf_flush_freed_pages().
      
      Reviewed by: Thirunarayanan Balathandayuthapani
      73fee39e
    • Marko Mäkelä's avatar
      Fix clang -Wtypedef-redefinition · de4ec44b
      Marko Mäkelä authored
      Include my_global.h before mysql.h so that the latter will not
      redefine my_socket and my_ulonglong.
      
      Fixup for commit 77c184df
      de4ec44b