1. 21 Apr, 2021 4 commits
  2. 20 Apr, 2021 1 commit
  3. 19 Apr, 2021 3 commits
    • Marko Mäkelä's avatar
      MDEV-25404: ssux_lock_low: Introduce a separate writer mutex · 8751aa73
      Marko Mäkelä authored
      Having both readers and writers use a single lock word in
      futex system calls caused performance regression compared to
      SRW_LOCK_DUMMY (mutex and 2 condition variables).
      A contributing factor is that we did not accurately keep
      track of the number of waiting threads and thus had to invoke
      system calls to wake up any waiting threads.
      
      SUX_LOCK_GENERIC: Renamed from SRW_LOCK_DUMMY. This is the
      original implementation, with rw_lock (std::atomic<uint32_t>),
      a mutex and two condition variables. Using a separate writer
      mutex (as described below) is not possible, because the mutex ownership
      in a buf_block_t::lock must be able to transfer from a write submitter
      thread to an I/O completion thread, and pthread_mutex_lock() may assume
      that the submitter thread is recursively acquiring the mutex that it
      already holds, while in reality the I/O completion thread is the real
      owner. POSIX does not define an interface for requesting a mutex to
      be non-recursive.
      
      On Microsoft Windows, srw_lock_low will remain a simple wrapper of
      SRWLOCK. On 32-bit Microsoft Windows, sizeof(SRWLOCK)=4 while
      sizeof(srw_lock_low)=8.
      
      On other platforms, srw_lock_low is an alias of ssux_lock_low,
      the Simple (non-recursive) Shared/Update/eXclusive lock.
      
      In the futex-based implementation of ssux_lock_low (Linux, OpenBSD,
      Microsoft Windows), we shall use a dedicated mutex for exclusive
      requests (writer), and have a WRITER flag in the 'readers' lock word
      to inform that a writer is holding the lock or waiting for the lock to
      be granted. When the WRITER flag is set, all lock requests must acquire
      the writer mutex. Normally, shared (S) lock requests simply perform a
      compare-and-swap on the 'readers' word.
      
      Update locks are implemented as a combination of writer mutex
      and a normal counter in the 'readers' lock word. The conflict between
      U and X locks is guaranteed by the writer mutex.
      Unlike SUX_LOCK_GENERIC, wr_u_downgrade() will not wake up any pending
      rd_lock() waits. They will wait until u_unlock() releases the writer mutex.
      
      The ssux_lock_low is always wrapped by sux_lock (with a recursion count
      of U and X locks), used for dict_index_t::lock and buf_block_t::lock.
      Their memory footprint for the futex-based implementation will increase
      by sizeof(srw_mutex), or 4 bytes.
      
      This change addresses a performance regression in read-only benchmarks,
      such as sysbench oltp_read_only. Also write performance was improved.
      
      On 32-bit Linux and OpenBSD, lock_sys_t::hash_table will allocate
      two hash table elements for each srw_lock (14 instead of 15 hash
      table cells per 64-byte cache line on IA-32). On Microsoft Windows,
      sizeof(SRWLOCK)==sizeof(void*) and there is no change.
      
      Reviewed by: Vladislav Vaintroub
      Tested by: Axel Schwenke and Vladislav Vaintroub
      8751aa73
    • Marko Mäkelä's avatar
      MDEV-25404: Optimize srw_mutex on Linux, OpenBSD, Windows · 040c16ab
      Marko Mäkelä authored
      On Linux, OpenBSD and Microsoft Windows, srw_mutex was an alias for a
      rw-lock while we only need mutex functionality. Let us implement a
      futex-based mutex with one bit for HOLDER and 31 bits for counting
      waiting requests.
      
      srw_lock::wr_unlock() can avoid waking up a waiter when no waiting
      requests exist. (Previously, we only had 1-bit rw_lock::WRITER_WAITING
      flag that could be wrongly cleared if multiple waiting wr_lock() exist.
      Now we have no problem with up to 2,147,483,648 conflicting threads.)
      
      On 64-bit Microsoft Windows, the advantage is that
      sizeof(srw_mutex) is 4, while sizeof(SRWLOCK) would be 8.
      
      Reviewed by: Vladislav Vaintroub
      040c16ab
    • Daniel Black's avatar
      MDEV-25433: SKIP LOCKED should imply NOWAIT · af418bb9
      Daniel Black authored
      This also means SKIP LOCKED is compatible with the NOWAIT/
      WAIT n syntax consisten with the MySQL-8.0 implementation.
      af418bb9
  4. 18 Apr, 2021 1 commit
    • Jan Lindström's avatar
      Improve Galera SST tests · bfedf1eb
      Jan Lindström authored
      * Table should have primary key
      * Enable wsrep_sync_wait before final selects
      * Enable autocommit before final selects.
      * Fix joiner monitoring in case of mysqldump.
      * Add wait_conditions to stabilize
      bfedf1eb
  5. 17 Apr, 2021 1 commit
    • Alexey Yurchenko's avatar
      MDEV-25359 : Improve mariabackup SST script compliance with native MariaDB SSL... · fd9ca569
      Alexey Yurchenko authored
      MDEV-25359 : Improve mariabackup SST script compliance with native MariaDB SSL practices and configuration.
      
      1. Pass joiner's authentication information to donor together with address
         in State Transfer Request. This allows joiner to authenticate donor on
         connection. Previously joiner would accept data from anywhere.
      
      2. Deprecate custom SSL configuration variables tca, tcert and tkey in favor
         of more familiar ssl-ca, ssl-cert and ssl-key. For backward compatibility
         tca, tcert and tkey are still supported.
      
      3. Allow falling back to server-wide SSL configuration in [mysqld] if no SSL
         configuration is found in [sst] section of the config file.
      
      4. Introduce ssl-mode variable in [sst] section that takes standard values
         and has following effects:
          - old-style SSL configuration present in [sst]: no effect
            otherwise:
          - ssl-mode=DISABLED or absent: retains old, backward compatible behavior
            and ignores any other SSL configuration
          - ssl-mode=VERIFY*: verify joiner's certificate and CN on donor,
                              verify donor's secret on joiner
                              (passed to donor via State Transfer Request)
                              BACKWARD INCOMPATIBLE BEHAVIOR
          - anything else enables new SSL configuration convetions but does not
            require verification
      
          ssl-mode should be set to VERIFY only in a fully upgraded cluster.
      
          Examples:
      
          [mysqld]
          ssl-cert=/path/to/cert
          ssl-key=/path/to/key
          ssl-ca=/path/to/ca
      
          [sst]
      
           -- server-wide SSL configuration is ignored, SST does not use SSL
      
          [mysqld]
          ssl-cert=/path/to/cert
          ssl-key=/path/to/key
          ssl-ca=/path/to/ca
      
          [sst]
          ssl-mode=REQUIRED
      
           -- use server-wide SSL configuration for SST but don't attempt to
              verify the peer identity
      
          [sst]
          ssl-cert=/path/to/cert
          ssl-key=/path/to/key
          ssl-ca=/path/to/ca
          ssl-mode=VERIFY_CA
      
           -- use SST-specific SSL configuration for SST and require verification
              on both sides
      Reviewed-by: default avatarJan Lindström <jan.lindstrom@mariadb.com>
      fd9ca569
  6. 16 Apr, 2021 11 commits
    • Sergei Petrunia's avatar
      Cleanup: fake_select_lex->select_number=FAKE_SELECT_LEX_ID, not [U]INT_MAX · 2656e876
      Sergei Petrunia authored
      SELECT_LEX objects that are "fake_select_lex" (i.e read UNION output)
      used both INT_MAX and UINT_MAX as select_number.
      - mysql_explain_union() assigned UINT_MAX
      - st_select_lex_unit::add_fake_select_lex assigned INT_MAX
      
      This didn't matter initially (before EXPLAIN FORMAT=JSON), because the
      code  had no checks for this value.
      
      EXPLAIN FORMAT=JSON and later other features did introduce checks for
      select_number values. The check had to check for two constants and
      looked really confusing.
      
      This patch joins the two constants into one - FAKE_SELECT_LEX_ID.
      2656e876
    • Daniel Black's avatar
      3f138fa3
    • Daniel Black's avatar
      Merge branch '10.5' into 10.6 · f862f39f
      Daniel Black authored
      f862f39f
    • Daniel Black's avatar
      Revert "Deb: Use build flag to enforce default charset as utf8mb4" · fce3e4ee
      Daniel Black authored
      This reverts commit f26e3259.
      fce3e4ee
    • Otto Kekäläinen's avatar
      Deb: Update Conflicts/Replaces/Replaces for all upgrade scenarios · 62f5a4f0
      Otto Kekäläinen authored
      Update the debian/control file so that upgrades from basically any previous
      version of MariaDB, MySQL or even Percona will run smoothly.
      
      Based on extensive testing with all Debian and Ubuntu repos from past 5 years
      enabled, and also having MariaDB.org, MySQL.com and Percona.com repos enabled.
      
      Used tool check_for_missing_breaks_replaces.py from Salsa-CI to verify.
      
      Fixes the following errors:
      [ERROR] libmariadb-dev conflicts with libmariadb-client-lgpl-dev files: {'/usr/include/mariadb/mysql_version.h', '/usr/include/mariadb/errmsg.h', '/usr/share/man/man1/mariadb_config.1.gz', '/usr/include/mariadb/my_sys.h', '/usr/include/mariadb/mysqld_error.h', '/usr/include/mariadb/my_config.h', '/usr/lib/x86_64-linux-gnu/libmariadb.so', '/usr/lib/x86_64-linux-gnu/libmariadb.a', '/usr/include/mariadb/mysql.h', '/usr/include/mariadb/my_global.h', '/usr/include/mariadb/mysql/plugin_auth_common.h', '/usr/include/mariadb/mysql/plugin_auth.h', '/usr/include/mariadb/mysql_com.h', '/usr/bin/mariadb_config', '/usr/include/mariadb/mysql/client_plugin.h'}
      [ERROR] libmariadb-dev conflicts with libmariadb-dev-compat files: {'/usr/share/man/man1/mysql_config.1.gz'}
      [ERROR] mariadb-backup conflicts with mariadb-client-10.1 files: {'/usr/bin/mariabackup', '/usr/bin/mbstream'}
      [ERROR] mariadb-client-10.6 conflicts with percona-server-server-5.6 files: {'/usr/share/man/man1/mysqlbinlog.1.gz', '/usr/bin/perror', '/usr/share/man/man1/mysqlhotcopy.1.gz', '/usr/share/man/man1/mysql_setpermission.1.gz', '/usr/share/man/man1/mysql_tzinfo_to_sql.1.gz', '/usr/share/man/man1/replace.1.gz', '/usr/share/man/man1/mysql_convert_table_format.1.gz', '/usr/bin/replace', '/usr/share/man/man1/resolve_stack_dump.1.gz', '/usr/share/man/man1/perror.1.gz', '/usr/bin/msql2mysql', '/usr/share/man/man1/mysql_secure_installation.1.gz', '/usr/share/man/man1/msql2mysql.1.gz', '/usr/bin/resolve_stack_dump'}
      [ERROR] mariadb-client-10.6 conflicts with percona-xtradb-cluster-server-5.6 files: {'/usr/share/man/man1/mysqlbinlog.1.gz', '/usr/bin/perror', '/usr/share/man/man1/mysqlhotcopy.1.gz', '/usr/share/man/man1/mysql_setpermission.1.gz', '/usr/share/man/man1/mysql_tzinfo_to_sql.1.gz', '/usr/share/man/man1/replace.1.gz', '/usr/share/man/man1/mysql_convert_table_format.1.gz', '/usr/bin/replace', '/usr/share/man/man1/resolve_stack_dump.1.gz', '/usr/share/man/man1/perror.1.gz', '/usr/bin/msql2mysql', '/usr/share/man/man1/mysql_secure_installation.1.gz', '/usr/share/man/man1/msql2mysql.1.gz', '/usr/bin/resolve_stack_dump'}
      [ERROR] mariadb-client-10.6 conflicts with percona-xtradb-cluster-server-5.7 files: {'/usr/share/man/man1/mysqlbinlog.1.gz', '/usr/bin/perror', '/usr/share/man/man1/replace.1.gz', '/usr/share/man/man1/mysql_tzinfo_to_sql.1.gz', '/usr/share/man/man1/mysql_plugin.1.gz', '/usr/bin/replace', '/usr/share/man/man1/resolve_stack_dump.1.gz', '/usr/share/man/man1/perror.1.gz', '/usr/share/man/man1/mysql_secure_installation.1.gz', '/usr/bin/resolve_stack_dump'}
      [ERROR] mariadb-client-core-10.6 conflicts with mariadb-server-10.1 files: {'/usr/bin/my_print_defaults', '/usr/share/man/man1/my_print_defaults.1.gz'}
      [ERROR] mariadb-client-core-10.6 conflicts with percona-server-server-5.6 files: {'/usr/bin/my_print_defaults', '/usr/share/man/man1/my_print_defaults.1.gz'}
      [ERROR] mariadb-client-core-10.6 conflicts with percona-xtradb-cluster-server-5.6 files: {'/usr/bin/my_print_defaults', '/usr/share/man/man1/my_print_defaults.1.gz'}
      [ERROR] mariadb-client-core-10.6 conflicts with percona-xtradb-cluster-server-5.7 files: {'/usr/bin/my_print_defaults', '/usr/share/man/man1/my_print_defaults.1.gz'}
      [ERROR] mariadb-plugin-connect conflicts with mariadb-connect-engine-10.0 files: {'/usr/lib/mysql/plugin/ha_connect.so'}
      [ERROR] mariadb-plugin-oqgraph conflicts with mariadb-oqgraph-engine-10.0 files: {'/usr/lib/mysql/plugin/ha_oqgraph.so'}
      [ERROR] mariadb-server-10.6 conflicts with handlersocket-mysql-5.5 files: {'/usr/lib/mysql/plugin/handlersocket.so'}
      [ERROR] mariadb-server-10.6 conflicts with percona-server-server-5.6 files: {'/usr/bin/myisampack', '/usr/lib/mysql/plugin/handlersocket.so', '/usr/share/mysql/errmsg-utf8.txt', '/usr/share/man/man1/myisamlog.1.gz', '/usr/share/man/man1/mysqld_multi.1.gz', '/usr/share/mysql/debian-start.inc.sh', '/usr/share/man/man1/myisamchk.1.gz', '/usr/bin/mysqlbinlog', '/usr/bin/mysql_convert_table_format', '/usr/lib/mysql/plugin/query_response_time.so', '/usr/bin/mysql_tzinfo_to_sql', '/usr/bin/mysql_setpermission', '/usr/bin/myisamchk', '/usr/share/man/man1/myisampack.1.gz', '/usr/lib/mysql/plugin/auth_pam.so', '/usr/bin/mysql_secure_installation', '/usr/bin/mysqld_multi', '/usr/share/man/man1/mysqld_safe.1.gz', '/usr/bin/mysqld_safe', '/usr/bin/myisamlog', '/usr/bin/mysqlhotcopy'}
      [ERROR] mariadb-server-10.6 conflicts with percona-xtradb-cluster-server-5.6 files: {'/usr/bin/wsrep_sst_mysqldump', '/usr/bin/myisampack', '/usr/lib/mysql/plugin/handlersocket.so', '/usr/share/mysql/errmsg-utf8.txt', '/usr/share/man/man1/myisamlog.1.gz', '/usr/share/man/man1/mysqld_multi.1.gz', '/usr/share/mysql/debian-start.inc.sh', '/usr/share/man/man1/myisamchk.1.gz', '/usr/bin/mysqlbinlog', '/usr/bin/wsrep_sst_common', '/usr/bin/mysql_convert_table_format', '/usr/lib/mysql/plugin/query_response_time.so', '/usr/share/mysql/wsrep_notify', '/usr/bin/mysql_tzinfo_to_sql', '/usr/bin/mysql_setpermission', '/usr/bin/myisamchk', '/usr/share/man/man1/myisampack.1.gz', '/usr/lib/mysql/plugin/auth_pam.so', '/usr/bin/mysql_secure_installation', '/usr/bin/mysqld_multi', '/usr/share/man/man1/mysqld_safe.1.gz', '/usr/bin/wsrep_sst_rsync', '/usr/bin/mysqld_safe', '/usr/bin/myisamlog', '/usr/bin/mysqlhotcopy'}
      [ERROR] mariadb-server-10.6 conflicts with percona-xtradb-cluster-server-5.7 files: {'/usr/bin/wsrep_sst_mysqldump', '/usr/bin/myisampack', '/usr/share/mysql/errmsg-utf8.txt', '/usr/share/man/man1/myisamlog.1.gz', '/usr/share/man/man1/mysqld_multi.1.gz', '/usr/share/man/man1/myisamchk.1.gz', '/usr/bin/mysql_plugin', '/usr/bin/mysqlbinlog', '/usr/bin/wsrep_sst_common', '/usr/lib/mysql/plugin/query_response_time.so', '/usr/share/mysql/wsrep_notify', '/usr/bin/mysql_tzinfo_to_sql', '/lib/systemd/system/mysql.service', '/usr/bin/myisamchk', '/usr/share/man/man1/myisampack.1.gz', '/usr/lib/mysql/plugin/auth_pam.so', '/usr/bin/mysql_secure_installation', '/usr/bin/mysqld_multi', '/usr/share/man/man1/mysqld_safe.1.gz', '/usr/bin/wsrep_sst_rsync', '/usr/bin/mysqld_safe', '/usr/bin/myisamlog'}
      [ERROR] mariadb-server-core-10.6 conflicts with mariadb-server-10.0 files: {'/usr/share/mysql/mysql_system_tables.sql', '/usr/bin/resolveip', '/usr/share/mysql/mysql_system_tables_data.sql', '/usr/share/mysql/mysql_performance_tables.sql', '/usr/share/mysql/mysql_test_data_timezone.sql', '/usr/share/man/man1/mysql_upgrade.1.gz', '/usr/share/mysql/fill_help_tables.sql', '/usr/share/man/man1/resolveip.1.gz', '/usr/share/man/man1/mysql_install_db.1.gz', '/usr/bin/mysql_install_db', '/usr/bin/mysql_upgrade'}
      [ERROR] mariadb-server-core-10.6 conflicts with mariadb-server-10.1 files: {'/usr/share/mysql/mysql_system_tables.sql', '/usr/bin/resolveip', '/usr/share/mysql/mysql_system_tables_data.sql', '/usr/share/mysql/mysql_performance_tables.sql', '/usr/share/mysql/fill_help_tables.sql', '/usr/share/mysql/mysql_test_data_timezone.sql', '/usr/share/mysql/maria_add_gis_sp_bootstrap.sql', '/usr/share/man/man1/resolveip.1.gz'}
      [ERROR] mariadb-server-core-10.6 conflicts with mariadb-server-10.1 files: {'/usr/share/man/man1/resolveip.1.gz', '/usr/share/mysql/fill_help_tables.sql', '/usr/share/mysql/mysql_system_tables_data.sql', '/usr/share/mysql/mysql_performance_tables.sql', '/usr/share/mysql/mysql_system_tables.sql', '/usr/share/mysql/mysql_test_data_timezone.sql', '/usr/share/mysql/maria_add_gis_sp_bootstrap.sql', '/usr/bin/resolveip'}
      [ERROR] mariadb-server-core-10.6 conflicts with mysql-client-5.5 files: {'/usr/bin/innochecksum'}
      [ERROR] mariadb-server-core-10.6 conflicts with mysql-server-5.5 files: {'/usr/share/man/man1/resolveip.1.gz', '/usr/share/mysql/mysql_test_data_timezone.sql', '/usr/share/man/man1/innochecksum.1.gz', '/usr/bin/resolveip'}
      [ERROR] mariadb-server-core-10.6 conflicts with percona-server-server-5.6 files: {'/usr/share/mysql/russian/errmsg.sys', '/usr/share/mysql/charsets/armscii8.xml', '/usr/share/mysql/charsets/latin5.xml', '/usr/share/mysql/mysql_system_tables.sql', '/usr/share/man/man1/innochecksum.1.gz', '/usr/share/mysql/slovak/errmsg.sys', '/usr/share/mysql/swedish/errmsg.sys', '/usr/share/mysql/charsets/cp1251.xml', '/usr/share/mysql/japanese/errmsg.sys', '/usr/share/mysql/charsets/keybcs2.xml', '/usr/share/mysql/charsets/latin1.xml', '/usr/share/mysql/mysql_test_data_timezone.sql', '/usr/share/mysql/charsets/hp8.xml', '/usr/share/mysql/spanish/errmsg.sys', '/usr/share/mysql/greek/errmsg.sys', '/usr/share/mysql/charsets/hebrew.xml', '/usr/share/mysql/charsets/cp850.xml', '/usr/bin/innochecksum', '/usr/share/mysql/charsets/cp866.xml', '/usr/share/mysql/english/errmsg.sys', '/usr/bin/mysql_upgrade', '/usr/share/mysql/charsets/macroman.xml', '/usr/bin/resolveip', '/usr/share/mysql/charsets/dec8.xml', '/usr/share/mysql/charsets/koi8r.xml', '/usr/share/mysql/charsets/ascii.xml', '/usr/share/mysql/german/errmsg.sys', '/usr/share/mysql/charsets/koi8u.xml', '/usr/share/mysql/charsets/latin2.xml', '/usr/share/mysql/norwegian-ny/errmsg.sys', '/usr/share/mysql/french/errmsg.sys', '/usr/share/man/man1/mysql_install_db.1.gz', '/usr/share/mysql/charsets/cp1250.xml', '/usr/bin/mysql_install_db', '/usr/share/mysql/serbian/errmsg.sys', '/usr/share/mysql/charsets/greek.xml', '/usr/share/mysql/czech/errmsg.sys', '/usr/share/mysql/portuguese/errmsg.sys', '/usr/share/mysql/ukrainian/errmsg.sys', '/usr/share/mysql/charsets/README', '/usr/share/man/man1/mysql_upgrade.1.gz', '/usr/share/mysql/charsets/cp1256.xml', '/usr/share/mysql/charsets/Index.xml', '/usr/share/mysql/danish/errmsg.sys', '/usr/share/mysql/mysql_system_tables_data.sql', '/usr/share/mysql/dutch/errmsg.sys', '/usr/share/mysql/charsets/geostd8.xml', '/usr/share/mysql/estonian/errmsg.sys', '/usr/share/mysql/norwegian/errmsg.sys', '/usr/share/mysql/charsets/cp852.xml', '/usr/share/mysql/romanian/errmsg.sys', '/usr/share/mysql/hungarian/errmsg.sys', '/usr/share/mysql/charsets/cp1257.xml', '/usr/share/mysql/italian/errmsg.sys', '/usr/sbin/mysqld', '/usr/share/mysql/charsets/swe7.xml', '/usr/share/mysql/korean/errmsg.sys', '/usr/share/mysql/fill_help_tables.sql', '/usr/share/man/man1/resolveip.1.gz', '/usr/share/mysql/charsets/macce.xml', '/usr/share/mysql/polish/errmsg.sys', '/usr/share/man/man8/mysqld.8.gz', '/usr/share/mysql/charsets/latin7.xml'}
      [ERROR] mariadb-server-core-10.6 conflicts with percona-xtradb-cluster-server-5.6 files: {'/usr/share/mysql/russian/errmsg.sys', '/usr/share/mysql/charsets/armscii8.xml', '/usr/share/mysql/charsets/latin5.xml', '/usr/share/mysql/mysql_system_tables.sql', '/usr/share/man/man1/innochecksum.1.gz', '/usr/share/mysql/slovak/errmsg.sys', '/usr/share/mysql/swedish/errmsg.sys', '/usr/share/mysql/charsets/cp1251.xml', '/usr/share/mysql/japanese/errmsg.sys', '/usr/share/mysql/charsets/keybcs2.xml', '/usr/share/mysql/charsets/latin1.xml', '/usr/share/mysql/mysql_test_data_timezone.sql', '/usr/share/mysql/charsets/hp8.xml', '/usr/share/mysql/spanish/errmsg.sys', '/usr/share/mysql/greek/errmsg.sys', '/usr/share/mysql/charsets/hebrew.xml', '/usr/share/mysql/charsets/cp850.xml', '/usr/bin/innochecksum', '/usr/share/mysql/charsets/cp866.xml', '/usr/share/mysql/english/errmsg.sys', '/usr/bin/mysql_upgrade', '/usr/share/mysql/charsets/macroman.xml', '/usr/bin/resolveip', '/usr/share/mysql/charsets/dec8.xml', '/usr/share/mysql/charsets/koi8r.xml', '/usr/share/mysql/charsets/ascii.xml', '/usr/share/mysql/german/errmsg.sys', '/usr/share/mysql/charsets/koi8u.xml', '/usr/share/mysql/charsets/latin2.xml', '/usr/share/mysql/norwegian-ny/errmsg.sys', '/usr/share/mysql/french/errmsg.sys', '/usr/share/man/man1/mysql_install_db.1.gz', '/usr/share/mysql/charsets/cp1250.xml', '/usr/bin/mysql_install_db', '/usr/share/mysql/serbian/errmsg.sys', '/usr/share/mysql/charsets/greek.xml', '/usr/share/mysql/czech/errmsg.sys', '/usr/share/mysql/portuguese/errmsg.sys', '/usr/share/mysql/ukrainian/errmsg.sys', '/usr/share/mysql/charsets/README', '/usr/share/man/man1/mysql_upgrade.1.gz', '/usr/share/mysql/charsets/cp1256.xml', '/usr/share/mysql/charsets/Index.xml', '/usr/share/mysql/danish/errmsg.sys', '/usr/share/mysql/mysql_system_tables_data.sql', '/usr/share/mysql/dutch/errmsg.sys', '/usr/share/mysql/charsets/geostd8.xml', '/usr/share/mysql/estonian/errmsg.sys', '/usr/share/mysql/norwegian/errmsg.sys', '/usr/share/mysql/charsets/cp852.xml', '/usr/share/mysql/romanian/errmsg.sys', '/usr/share/mysql/hungarian/errmsg.sys', '/usr/share/mysql/charsets/cp1257.xml', '/usr/share/mysql/italian/errmsg.sys', '/usr/sbin/mysqld', '/usr/share/mysql/charsets/swe7.xml', '/usr/share/mysql/korean/errmsg.sys', '/usr/share/mysql/fill_help_tables.sql', '/usr/share/man/man1/resolveip.1.gz', '/usr/share/mysql/charsets/macce.xml', '/usr/share/mysql/polish/errmsg.sys', '/usr/share/man/man8/mysqld.8.gz', '/usr/share/mysql/charsets/latin7.xml'}
      [ERROR] mariadb-server-core-10.6 conflicts with percona-xtradb-cluster-server-5.7 files: {'/usr/share/mysql/russian/errmsg.sys', '/usr/share/mysql/charsets/armscii8.xml', '/usr/share/mysql/charsets/latin5.xml', '/usr/share/mysql/mysql_system_tables.sql', '/usr/share/man/man1/innochecksum.1.gz', '/usr/share/mysql/slovak/errmsg.sys', '/usr/share/mysql/swedish/errmsg.sys', '/usr/share/mysql/charsets/cp1251.xml', '/usr/share/mysql/japanese/errmsg.sys', '/usr/share/mysql/charsets/keybcs2.xml', '/usr/share/mysql/charsets/latin1.xml', '/usr/share/mysql/mysql_test_data_timezone.sql', '/usr/share/mysql/charsets/hp8.xml', '/usr/share/mysql/spanish/errmsg.sys', '/usr/share/mysql/greek/errmsg.sys', '/usr/share/mysql/charsets/hebrew.xml', '/usr/share/mysql/charsets/cp850.xml', '/usr/bin/innochecksum', '/usr/share/mysql/charsets/cp866.xml', '/usr/share/mysql/english/errmsg.sys', '/usr/bin/mysql_upgrade', '/usr/share/mysql/charsets/macroman.xml', '/usr/bin/resolveip', '/usr/share/mysql/charsets/dec8.xml', '/usr/share/mysql/charsets/koi8r.xml', '/usr/share/mysql/charsets/ascii.xml', '/usr/share/mysql/german/errmsg.sys', '/usr/share/mysql/charsets/koi8u.xml', '/usr/share/mysql/charsets/latin2.xml', '/usr/share/mysql/norwegian-ny/errmsg.sys', '/usr/share/mysql/french/errmsg.sys', '/usr/share/man/man1/mysql_install_db.1.gz', '/usr/share/mysql/charsets/cp1250.xml', '/usr/bin/mysql_install_db', '/usr/share/mysql/serbian/errmsg.sys', '/usr/share/mysql/charsets/greek.xml', '/usr/share/mysql/czech/errmsg.sys', '/usr/share/mysql/portuguese/errmsg.sys', '/usr/share/mysql/mysql_sys_schema.sql', '/usr/share/mysql/ukrainian/errmsg.sys', '/usr/share/mysql/charsets/README', '/usr/share/man/man1/mysql_upgrade.1.gz', '/usr/share/mysql/charsets/cp1256.xml', '/usr/share/mysql/charsets/Index.xml', '/usr/share/mysql/danish/errmsg.sys', '/usr/share/mysql/mysql_system_tables_data.sql', '/usr/share/mysql/dutch/errmsg.sys', '/usr/share/mysql/charsets/geostd8.xml', '/usr/share/mysql/estonian/errmsg.sys', '/usr/share/mysql/norwegian/errmsg.sys', '/usr/share/mysql/charsets/cp852.xml', '/usr/share/mysql/romanian/errmsg.sys', '/usr/share/mysql/hungarian/errmsg.sys', '/usr/share/mysql/charsets/cp1257.xml', '/usr/share/mysql/italian/errmsg.sys', '/usr/sbin/mysqld', '/usr/share/mysql/charsets/swe7.xml', '/usr/share/mysql/korean/errmsg.sys', '/usr/share/mysql/fill_help_tables.sql', '/usr/share/man/man1/resolveip.1.gz', '/usr/share/mysql/charsets/macce.xml', '/usr/share/mysql/polish/errmsg.sys', '/usr/share/man/man8/mysqld.8.gz', '/usr/share/mysql/charsets/latin7.xml'}
      [ERROR] mariadb-test conflicts with mysql-client-5.5 files: {'/usr/bin/mysql_client_test'}
      [ERROR] mariadb-test conflicts with mysql-server-5.5 files: {'/usr/bin/mysqltest', '/usr/lib/mysql/plugin/ha_example.so', '/usr/share/man/man1/mysqltest.1.gz', '/usr/lib/mysql/plugin/adt_null.so', '/usr/lib/mysql/plugin/auth_test_plugin.so', '/usr/lib/mysql/plugin/libdaemon_example.so', '/usr/lib/mysql/plugin/qa_auth_server.so', '/usr/lib/mysql/plugin/qa_auth_interface.so', '/usr/lib/mysql/plugin/mypluglib.so'}
      [ERROR] mariadb-test conflicts with percona-server-server-5.6 files: {'/usr/bin/mysqltest', '/usr/share/man/man1/mysqltest.1.gz', '/usr/lib/mysql/plugin/adt_null.so', '/usr/lib/mysql/plugin/auth_test_plugin.so', '/usr/lib/mysql/plugin/daemon_example.ini', '/usr/lib/mysql/plugin/libdaemon_example.so', '/usr/lib/mysql/plugin/qa_auth_server.so', '/usr/lib/mysql/plugin/qa_auth_interface.so', '/usr/lib/mysql/plugin/mypluglib.so'}
      [ERROR] mariadb-test conflicts with percona-xtradb-cluster-server-5.6 files: {'/usr/bin/mysqltest', '/usr/share/man/man1/mysqltest.1.gz', '/usr/lib/mysql/plugin/adt_null.so', '/usr/lib/mysql/plugin/auth_test_plugin.so', '/usr/lib/mysql/plugin/libdaemon_example.so', '/usr/lib/mysql/plugin/qa_auth_server.so', '/usr/lib/mysql/plugin/qa_auth_interface.so', '/usr/lib/mysql/plugin/mypluglib.so'}
      [ERROR] mariadb-test conflicts with percona-xtradb-cluster-server-5.7 files: {'/usr/bin/mysqltest', '/usr/lib/mysql/plugin/ha_example.so', '/usr/share/man/man1/mysqltest.1.gz', '/usr/lib/mysql/plugin/adt_null.so', '/usr/lib/mysql/plugin/auth_test_plugin.so', '/usr/lib/mysql/plugin/libdaemon_example.so', '/usr/lib/mysql/plugin/qa_auth_server.so', '/usr/lib/mysql/plugin/qa_auth_interface.so', '/usr/lib/mysql/plugin/mypluglib.so'}
      [ERROR] mariadb-server-core-10.6 conflicts with mariadb-server-10.1 files: {'/usr/share/man/man1/resolveip.1.gz', '/usr/share/mysql/fill_help_tables.sql', '/usr/share/mysql/mysql_system_tables_data.sql', '/usr/share/mysql/mysql_performance_tables.sql', '/usr/share/mysql/mysql_system_tables.sql', '/usr/share/mysql/mysql_test_data_timezone.sql', '/usr/share/mysql/maria_add_gis_sp_bootstrap.sql', '/usr/bin/resolveip'}
      
      This was not fixed:
      [ERROR] libmariadb-dev-compat conflicts with libmariadbclient-dev files: {'/usr/bin/mysql_config'}
      The reason is that as long as libmariadbclient-dev is also provided by libmariadb-dev
      as a kind of virtual package. If there is a breaks/replaces against it, it would
      prevent libmariadb-dev-compat to be co-installed with libmariadb-dev. If the breaks/replaces
      was versioned, then Lintian would complain about external versioned replace.
      
      See also https://github.com/mariadb-corporation/mariadb-columnstore-engine/pull/1846 that
      fixes one more conflict.
      62f5a4f0
    • Otto Kekäläinen's avatar
      Deb: Move my_print_defaults to MariaDB client core package · fc65417e
      Otto Kekäläinen authored
      The my_print_default is required by mytop which is also in the MariaDB
      client package, which in turn requires the client core package.
      This way it is ensured my_print_default is always available when mytop
      is installed.
      
      The my_print_defaults is also requires by the server logrotate files
      and mysqld_safe script etc, but this change is fine, since the server
      core package always depends on the MariaDB client core package anyway
      and they are both installed on server installations.
      
      Closes: #1566, #1581
      fc65417e
    • Daniel Black's avatar
      Deb: Move client programs to client package from MariaDB server package · f55d53e2
      Daniel Black authored
      There are many programs that actually belong to the client or even client
      core package, as they should be fully usable without a locally installed
      server.
      f55d53e2
    • Sujatha's avatar
      MDEV-16437: merge 5.7 P_S replication instrumentation and tables · 41083231
      Sujatha authored
      Merge 'replication_applier_status' table.
      
      This table captures SQL_THREAD status.
      41083231
    • Sujatha's avatar
      MDEV-16437: merge 5.7 P_S replication instrumentation and tables · 767648cc
      Sujatha authored
      Merge 'replication_applier_configuration' table.
      
      This table captures SQL_THREAD configuration parameters.
      767648cc
    • Sujatha's avatar
      MDEV-16437: merge 5.7 P_S replication instrumentation and tables · 70642871
      Sujatha authored
      Merge 'replication_applier_status_by_coordinator' table.
      
      This table captures SQL_THREAD status in case of both single threaded and
      multi threaded slave configuration. When multi_source replication is enabled
      this table will display each source specific SQL_THREAD status.
      
      Added new columns for:
       - LAST_SEEN_TRANSACTION
       - LAST_TRANS_RETRY_COUNT
      70642871
    • Sujatha's avatar
      MDEV-16437: merge 5.7 P_S replication instrumentation and tables · 2674365c
      Sujatha authored
      Merge 'replication_connection_configuration' table.
      
      Replaced following column:
        - AUTO_POSITION with USING_GTID
      Added new columns for:
        - IGNORE_SERVER_IDS
        - DO_DOMAIN_IDS
        - IGNORE_SERVER_IDS
      Removed following columns as they are not part of mariadb replication
      connection configuration:
        - NETWORK_INTERFACE
        - TLS_VERSION
      
      @sql/mysqld.cc
        Changed "master-retry-count" default value to 100000.
      2674365c
  7. 15 Apr, 2021 6 commits
  8. 14 Apr, 2021 13 commits