1. 30 Mar, 2021 7 commits
    • Sergei Petrunia's avatar
      MDEV-25305: MyRocks: Killing server during RESET MASTER can lose last transactions · eb2d3629
      Sergei Petrunia authored
      Followup: the test requires debug sync facility
      eb2d3629
    • Sergei Petrunia's avatar
      MDEV-25305: MyRocks: Killing server during RESET MASTER can lose last transactions · ed221980
      Sergei Petrunia authored
      rocksdb_checkpoint_request() should call FlushWAL(sync=true) (which does
      write-out and sync), not just SyncWAL()  (which just syncs without writing
      out)
      ed221980
    • Marko Mäkelä's avatar
      Merge 10.5 into 10.6 (except MDEV-24630) · 75db05c5
      Marko Mäkelä authored
      Commit 76d2846a was for 10.5 only.
      It caused some performance regression on 10.6 in some cases,
      likely related to the removal of ib_mutex_t in MDEV-21452.
      75db05c5
    • Krunal Bauskar's avatar
      MDEV-24630: MY_RELAX_CPU assembly instruction upgrade/research for · 76d2846a
      Krunal Bauskar authored
                  memory barrier on ARM
      
      As suggested in the said JIRA ticket based on the contribution done by
      the community (in an attempt to optimize the spin-loop) the said approach
      was evaluated against MariaDB Server 10.5 and found to help improve
      throughput in the range of 2-5%.
      
      Note: 10.6 timing graph and model are different as home-brew
      mutexes are replaced with pthread mutexes. Said patch has mixed
      impact on 10.6 so not recommended for 10.6.
      76d2846a
    • Marko Mäkelä's avatar
      MDEV-24302 follow-up: RESET MASTER hangs · 8c2e3259
      Marko Mäkelä authored
      As pointed out by Andrei Elkin, the previous fix did not fix one
      race condition that may have caused the observed hang.
      
      innodb_log_flush_request(): If we are enqueueing the very first
      request at the same time the log write is being completed,
      we must ensure that a near-concurrent call to log_flush_notify()
      will not result in a missed notification. We guarantee this by
      release-acquire operations on log_requests.start and
      log_sys.flushed_to_disk_lsn.
      
      log_flush_notify_and_unlock(): Cleanup: Always release the mutex.
      
      log_sys_t::get_flushed_lsn(): Use acquire memory order.
      
      log_sys_t::set_flushed_lsn(): Use release memory order.
      
      log_sys_t::set_lsn(): Use release memory order.
      
      log_sys_t::get_lsn(): Use relaxed memory order by default, and
      allow the caller to specify acquire memory order explicitly.
      Whenever the log_sys.mutex is being held or when log writes are
      prohibited during startup, we can use a relaxed load. Likewise,
      in some assertions where reading a stale value of log_sys.lsn
      should not matter, we can use a relaxed load.
      
      This will cause some additional instructions to be emitted on
      architectures that do not implement Total Store Ordering (TSO),
      such as POWER, ARM, and RISC-V Weak Memory Ordering (RVWMO).
      8c2e3259
    • Daniel Black's avatar
      revert make_binary_distribution script creation · 49ddfb63
      Daniel Black authored
      This was removed in 09202b2e however
      as Roel said, still in use.
      
      Adjusted to not create in WITHOUT_SERVER.
      49ddfb63
    • Daniel Black's avatar
      Merge 10.5 into 10.6 · 6ca07c21
      Daniel Black authored
      6ca07c21
  2. 29 Mar, 2021 9 commits
    • Daniel Black's avatar
      MDEV-17239 default max_recursive_iterations 4G -> 1000 · 831adb1e
      Daniel Black authored
      A default 4G max_recursive_iterations allows users to far
      to easily exhaust CPU, memory and time for a incorrect query.
      
      Reduce this value down to 1000 consistent with Oracle MySQL's
      cte_max_recursion_depth.
      831adb1e
    • Otto Kekäläinen's avatar
      Deb: Fix failing Salsa-CI by syncing fixes from downstream to upstream · 0df74a01
      Otto Kekäläinen authored
      Fixes jobs:
      - mysql-8.0 Sid to mariadb-10.5 upgrade
      - mariadb.org-10.5 to mariadb-10.5 upgrade
      
      Downstream source:
      https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/8db0e530872fea258e87533349fa83568eeed02d
      0df74a01
    • Otto Kekäläinen's avatar
      Deb: Add Breaks/Replaces · 5a4daa90
      Otto Kekäläinen authored
      Fix the following Breaks/Replaces errors detected by Salsa-CI:
      
        [ERROR] mariadb-server-10.5 conflicts with mysql-client-core-8.0 files:
          {'/usr/bin/myisam_ftdump', '/usr/share/man/man1/myisam_ftdump.1.gz'}
        [ERROR] mariadb-server-10.5 conflicts with mysql-server-core-8.0 files:
          {'/usr/share/man/man1/mysqlbinlog.1.gz',
           '/usr/share/man/man1/myisamlog.1.gz',
           '/usr/share/man/man1/mysql_tzinfo_to_sql.1.gz',
           '/usr/share/man/man1/perror.1.gz',
           '/usr/share/man/man1/myisampack.1.gz',
           '/usr/bin/mysqld_safe', '/usr/share/man/man1/myisamchk.1.gz',
           '/usr/bin/myisamchk', '/usr/bin/mysql_secure_installation',
           '/usr/bin/mysqld_multi', '/usr/bin/mysql_tzinfo_to_sql',
           '/usr/bin/perror', '/usr/share/man/man1/mysqld_multi.1.gz',
           '/usr/bin/myisampack', '/usr/share/man/man1/mysqld_safe.1.gz',
           '/usr/bin/myisamlog',
           '/usr/share/man/man1/mysql_secure_installation.1.gz',
           '/usr/bin/mysqlbinlog'}
        [ERROR] mariadb-test conflicts with mysql-server-core-8.0 files:
          {'/usr/lib/mysql/plugin/adt_null.so',
           '/usr/lib/mysql/plugin/mypluglib.so'}
      
      Upstreamed from Debian packaging commits:
      https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/9b6a67b53c2adf1bb5497d8649eb079767419835
      https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/f6d5545a0241de2cda81c878a157517b83378c04
      
      Also:
      - remove excess '<< ${source:Version}' on mysql-client-* and mysql-server-*
      - move more packages to Conflicts as it is semantically more correct than
        having those packages in Replaces
      5a4daa90
    • Otto Kekäläinen's avatar
      Revert "MDEV-23342 MariaDB cannot be installed over MySQL 5.7.30 on Bionic anymore" · ab3777a3
      Otto Kekäläinen authored
      This reverts commit 44885273.
      
      Reverting this commit is necessary to fix missing-breaks errors in the
      Debian packaging. The original fix was also not entirely necessary as a
      fix to the original problem.
      
      Partially also reverts commit e7c7f5c1 where this
      unsorted debian/control file was sorted.
      ab3777a3
    • Marko Mäkelä's avatar
      Merge 10.5 into 10.6 · 2ad61c67
      Marko Mäkelä authored
      2ad61c67
    • Krunal Bauskar's avatar
      MDEV-25281: Switch to use non-atomic (vs atomic) distributed counter to · 0f6f7296
      Krunal Bauskar authored
                  track page-access counter
      
      As part of MDEV-21212, n_page_gets that is meant to track page access,
      is ported to use distributed counter that default uses atomic sub-counters.
      
      n_page_gets originally was a non-atomic counter that represented an approximate
      value of pages tracked. Using the said analogy it doesn't need to be
      an atomic distributed counter.
      
      This patch introduces an interface that allows distributed counter to be
      used with atomic and non-atomic sub-counter (through template) and also
      port n_page_gets to use non-atomic distributed counter using the said
      updated interface.
      0f6f7296
    • Vladislav Vaintroub's avatar
    • Marko Mäkelä's avatar
      MDEV-24302: RESET MASTER hangs · e8b7fceb
      Marko Mäkelä authored
      Starting with MariaDB 10.5, roughly after MDEV-23855 was fixed,
      we are observing sporadic hangs during the execution of the
      RESET MASTER statement. We are hoping to fix the hangs with these
      changes, but due to the rather infrequent occurrence of the hangs
      and our inability to reliably reproduce the hangs, we cannot be
      sure of this.
      
      What we do know is that innodb_force_recovery=2 (or a larger setting)
      will prevent srv_master_callback (the former srv_master_thread) from
      running. In that mode, periodic log flushes would never occur and
      RESET MASTER could hang indefinitely. That is demonstrated by the new
      test case that was developed by Andrei Elkin. We fix this case by
      implementing a special case for it.
      
      This also includes some code cleanup and renames of misleadingly
      named code. The interface has nothing to do with log checkpoints in
      the storage engine; it is only about requesting log writes to be
      persistent.
      
      handlerton::commit_checkpoint_request,
      commit_checkpoint_notify_ha(): Remove the unused parameter hton.
      
      log_requests.start: Replaces pending_checkpoint_list.
      log_requests.end: Replaces pending_checkpoint_list_end.
      log_requests.mutex: Replaces pending_checkpoint_mutex.
      
      log_flush_notify_and_unlock(), log_flush_notify(): Replaces
      innobase_mysql_log_notify().  The new implementation should be
      functionally equivalent to the old one.
      
      innodb_log_flush_request(): Replaces innobase_checkpoint_request().
      Implement a fast path for common cases, and reduce the mutex hold time.
      POSSIBLE FIX OF THE HANG: We will invoke commit_checkpoint_notify_ha()
      for the current request if it is already satisfied, as well as invoke
      log_flush_notify_and_unlock() for any satisfied requests.
      
      log_write(): Invoke log_flush_notify() when the write is already durable.
      This was missing WITH_PMEM when the log is in persistent memory.
      
      Reviewed by: Vladislav Vaintroub
      e8b7fceb
    • Sergei Petrunia's avatar
      MDEV-24325: Optimizer trace doesn't cover LATERAL DERIVED · bd43f39b
      Sergei Petrunia authored
      Provide basic coverage in the Optimizer Trace
      bd43f39b
  3. 28 Mar, 2021 14 commits
    • Daniel Black's avatar
      MDEV-5536: socket activation info - verbose · e1a514d5
      Daniel Black authored
      NI_MAXSERV is only 32 is a bit limiting on unix paths.
      
      use gai_strerror for errors as strings.
      
      Include extra info in log if those are marked as such.
      e1a514d5
    • Monty's avatar
      Fixed access to undefined memory · 8e2d69f7
      Monty authored
      alloc_query() is examined the content of it's argument, which was
      uninitalized.
      Fixed by storing stmt_id in llbuf, according to code comments.
      8e2d69f7
    • Daniel Black's avatar
      MDEV-5536: Deb - socket activation - service enable · cba6bbbf
      Daniel Black authored
      Enable mariadb.service but install mariadb.socket
      without enabling them.
      cba6bbbf
    • Daniel Black's avatar
      MDEV-5536: Debian systemd socket activation · 99f85eec
      Daniel Black authored
      Attempt to follow the rules using dh_system_enable
      to install the sockets.
      
      Enable the sockets as opposed to the services by default.
      99f85eec
    • Daniel Black's avatar
      MDEV-5536: add systemd socket activation · 460d480c
      Daniel Black authored
      Systemd has a socket activation feature where a mariadb.socket
      definition defines the sockets to listen to, and passes those
      file descriptors directly to mariadbd to use when a connection
      occurs.
      
      The new functionality is utilized when starting as follows:
      
        systemctl start mariadb.socket
      
      The mariadb.socket definition only needs to contain the network
      information, ListenStream= directives, the mariadb.service
      definition is still used for service instigation.
      
      When mariadbd is started in this way, the socket, port, bind-address
      backlog are all assumed to be self contained in the mariadb.socket
      definition and as such the mariadb settings and command line
      arguments of these network settings are ignored.
      See man systemd.socket for how to limit this to specific ports.
      
      Extra ports, those specified with extra_port in socket activation
      mode, are those with a FileDescriptorName=extra. These need
      to be in a separate service name like mariadb-extra.socket and
      these require a Service={mariadb.service} directive to map to the
      original service. Extra ports need systemd v227 or greater
      (not RHEL/Centos7 - v219) when FileDescriptorName= was added,
      otherwise the extra ports are treated like ordinary ports.
      
      The number of sockets isn't limited when using systemd socket activation
      (except by operating system limits on file descriptors and a minimal
      amount of memory used per file descriptor). The systemd sockets passed
      can include any ownership or permissions, including those the
      mariadbd process wouldn't normally have the permission to create.
      
      This implementation is compatible with mariadb.service definitions.
      Those services started with:
      
        systemctl start mariadb.service
      
      does actually start the mariadb.service and used all the my.cnf
      settings of sockets and ports like it previously did.
      460d480c
    • Anel Husakovic's avatar
      Add mariadb-dumpslow to scripts. · fa0ad2fb
      Anel Husakovic authored
      fa0ad2fb
    • Daniel Black's avatar
    • Daniel Black's avatar
    • Anel Husakovic's avatar
      Separate client and server components (man/scripts) · 09202b2e
      Anel Husakovic authored
      cleanups from PR 900:
      
      - Use mariadb names instead of mysql and add secure-installation and
      additionally organize man pages.
      
      - Remove obsolete script `/make_binary_distribution`
      - Don't build binary `mariadb-install-db` in case of without-server
      09202b2e
    • Bernard Spil's avatar
      Make `replace` utility a Client component · 3523aedb
      Bernard Spil authored
      based on the man-page
      ```
      The replace program is used by msql2mysql. See msql2mysql(1).
      ```
      msql2mysql is labeled as Client component, so should the dependency
      
      Closes PR #900
      3523aedb
    • Anel Husakovic's avatar
    • Bernard Spil's avatar
      Make my_print_default a client app (required by mytop) · 4f8945e0
      Bernard Spil authored
      Closes PR #1566
      4f8945e0
    • Daniel Black's avatar
      Remove server man pages from WITHOUT_SERVER · 4cea3843
      Daniel Black authored
      4cea3843
    • Anel Husakovic's avatar
      MDEV-23429: Remove WSREP when using WITHOUT_SERVER · 67eeb777
      Anel Husakovic authored
      Under WITHOUT_WSREP:
      
      Exclude support files that are server only like
      * wsrep.cnf
      * wsrep_notify
      * log rotate config files
      * mysqld_multi
      
      Exclude man pages of server components
      67eeb777
  4. 27 Mar, 2021 4 commits
  5. 26 Mar, 2021 6 commits
    • Michael Okoko's avatar
      Replace mallinfo with mallinfo2 on supported systems · 48141f3c
      Michael Okoko authored
      `mallinfo` is deprecated since glibc 2.33 and has been replaced by mallinfo2.
      The deprecation causes building the server to fail if glibc version is > 2.33.
      
      Check if mallinfo2 exist on the system and use it instead.
      48141f3c
    • Eugene Kosov's avatar
    • Eugene Kosov's avatar
      MDEV-25238 add support for -fsanitize-address-use-after-scope · dfae51de
      Eugene Kosov authored
      Use like this: cmake -DWITH_ASAN=ON -DWITH_ASAN_SCOPE=ON
      dfae51de
    • Marko Mäkelä's avatar
      MDEV-24786: row_upd_clust_step() skips mtr_t::commit() on virtual column error · a6d66fe7
      Marko Mäkelä authored
      The function row_upd_clust_step() is invoking several static functions,
      some of which used to commit the mini-transaction in some cases.
      If innobase_get_computed_value() would fail due to some reason,
      we would fail to invoke mtr_t::commit() and release buffer pool
      page latches. This would likely lead to a hanging server later.
      
      This regression was introduced in
      commit 97db6c15 (MDEV-20618).
      
      row_upd_index_is_referenced(), row_upd_sec_index_entry(),
      row_upd_sec_index_entry(): Cleanup: Replace some ibool with bool.
      
      row_upd_clust_rec_by_insert(), row_upd_clust_rec(): Guarantee that
      the mini-transaction will always remain in active state.
      
      row_upd_del_mark_clust_rec(): Guarantee that
      the mini-transaction will always remain in active state.
      This fixes one "leak" of mini-transaction on DB_COMPUTE_VALUE_FAILED.
      
      row_upd_clust_step(): Use only one return path, which will always
      invoke mtr.commit(). After a failed row_upd_store_row() call, we
      will no longer "leak" the mini-transaction.
      
      This fix was verified by RQG on 10.6 (depending on MDEV-371 that
      was introduced in 10.4). Unfortunately, it is challenging to
      create a regression test for this, and a test case could soon become
      invalid as more bugs in virtual column evaluation are fixed.
      a6d66fe7
    • Marko Mäkelä's avatar
      Merge 10.5 into 10.6 · 356c1496
      Marko Mäkelä authored
      356c1496
    • Marko Mäkelä's avatar
      MDEV-25265: ALTER TABLE...IMPORT TABLESPACE fails after DROP INDEX · 2e67b9f6
      Marko Mäkelä authored
      A side effect of the MDEV-24589 bug fix is that if
      FLUSH TABLE...FOR EXPORT is initiated before the history of an
      earlier DROP INDEX operation has been purged, then the data file
      will contain allocated pages that belonged to the dropped indexes.
      These pages would never be freed after a subsequent IMPORT TABLESPACE.
      
      We will work around this regression by making IMPORT TABLESPACE
      tolerate pages that refer to an unknown index.
      2e67b9f6