1. 24 Oct, 2020 5 commits
  2. 23 Oct, 2020 2 commits
  3. 22 Oct, 2020 9 commits
    • Aleksey Midenkov's avatar
      Fix memory leak on Alter_drop allocation · 0d581562
      Aleksey Midenkov authored
      Fixes 7f613ebd (MDEV-7284 INDEX: CREATE OR REPLACE).
      0d581562
    • Marko Mäkelä's avatar
      Merge 10.4 to 10.5 · 1657b7a5
      Marko Mäkelä authored
      1657b7a5
    • Stepan Patryshev's avatar
      cca75c95
    • Marko Mäkelä's avatar
      9868253b
    • Marko Mäkelä's avatar
      After-merge fix to wsrep.variables · 45e10d46
      Marko Mäkelä authored
      We must make the test depend on a debug version of Galera.
      45e10d46
    • Marko Mäkelä's avatar
      Merge 10.3 into 10.4 · 46957a6a
      Marko Mäkelä authored
      46957a6a
    • Marko Mäkelä's avatar
      MDEV-23672: Partly revert an incorrect fix · 1619ae89
      Marko Mäkelä authored
      In commit 7eda5561 we removed a
      valid debug assertion.
      
      AddressSanitizer would trip when writing undo log for an INSERT
      operation that follows the problematic ALTER TABLE because the
      v_indexes would refer to an index object that was freed during
      the execution of ALTER TABLE.
      
      The operation to remove NOT NULL attribute from a column should
      lead into any affected indexes to be dropped and re-created.
      But, the SQL layer set the ha_alter_info->handler_flags to
      HA_INPLACE_ADD_UNIQUE_INDEX_NO_WRITE|ALTER_COLUMN_NULLABLE
      (that is, InnoDB was asked to add an index and change the column,
      but not to drop the index that depended on the column).
      
      Let us restore the debug assertion that catches this problem
      outside AddressSanitizer, and 'defuse' the offending ALTER TABLE
      statement in the test until something has been fixed in the SQL layer.
      1619ae89
    • Marko Mäkelä's avatar
      Merge 10.2 into 10.3 · e3d692aa
      Marko Mäkelä authored
      e3d692aa
    • Dmitry Shulga's avatar
      MDEV-23935: Fix warnings generated during compilation of... · 77c00799
      Dmitry Shulga authored
      MDEV-23935: Fix warnings generated during compilation of plugin/auth_pam/testing/pam_mariadb_mtr.c on MacOS
      
      During build server 10.4 on MacOS warnings like the following one
      are generated on compiling the file plugin/auth_pam/testing/pam_mariadb_mtr.c
      
      server-10.4/plugin/auth_pam/testing/pam_mariadb_mtr.c:25:22: error:
      initializing 'char *' with an expression of type 'const char [23]'
      discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers]
      { PAM_TEXT_INFO, "Challenge input first." }
      
      The reason of the warnings is that the data member pam_message::msg is declared
      as 'char *' on MacOS but initializer of the data member is 'const char *'.
      
      To eliminate warnings the compiler option
        -Wno-incompatible-pointer-types-discards-qualifiers
      has been added to the compiler flags used for compiling the file
      pam_mariadb_mtr.c.
      77c00799
  4. 21 Oct, 2020 20 commits
    • Rinat Ibragimov's avatar
      MDEV-20945: BACKUP UNLOCK + FTWRL assertion failure · 709ba7dc
      Rinat Ibragimov authored
      MDEV-20945: BACKUP UNLOCK + FTWRL assertion failure | SIGSEGV in I_P_List
      from MDL_context::release_lock on INSERT w/ BACKUP LOCK (on optimized
      builds) | Assertion `ticket->m_duration == MDL_EXPLICIT' failed
      
      BACKUP LOCK behavior is modified so it won't be used wrong:
      - BACKUP LOCK should commit any active transactions.
      - BACKUP LOCK should not be allowed in stored procedures.
      - When BACKUP LOCK is active, don't allow any DDL's for that connection.
      - FTWRL is forbidden on the same connection while BACKUP LOCK is active.
      
      Reviewed-by: monty@mariadb.com
      709ba7dc
    • Kentoku SHIBA's avatar
      MDEV-20100 MariaDB 13.3.9 Crash "[ERROR] mysqld got signal 11 ;" · b30ad01d
      Kentoku SHIBA authored
      Some functions on ha_partition call functions on all partitions, but handler->reset() is only called that pruned by m_partitions_to_reset. So Spider didn't clear pointer on unpruned partitions, if the unpruned partitions are used by next query, Spider reference the pointer that is already freed.
      b30ad01d
    • Kentoku SHIBA's avatar
      MDEV-20100 MariaDB 13.3.9 Crash "[ERROR] mysqld got signal 11 ;" · ac8d2057
      Kentoku SHIBA authored
      Some functions on ha_partition call functions on all partitions, but handler->reset() is only called that pruned by m_partitions_to_reset. So Spider didn't clear pointer on unpruned partitions, if the unpruned partitions are used by next query, Spider reference the pointer that is already freed.
      ac8d2057
    • Daniele Sciascia's avatar
      MDEV-23081 Stray XA transactions at startup, with wsrep_on=OFF · fdf87973
      Daniele Sciascia authored
      Change xarecover_handlerton so that transaction with WSREP prefixed
      xids are rolled back when Galera is disabled.
      Reviewd-by: default avatarJan Lindström <jan.lindstrom@mariadb.com>
      fdf87973
    • Marko Mäkelä's avatar
      Merge 10.1 into 10.2 · 620ea816
      Marko Mäkelä authored
      620ea816
    • Dmitry Shulga's avatar
      MDEV-23925: Fixed warnings generated during compilation of mysys_ssl/openssl.c on MacOS · a1b6691f
      Dmitry Shulga authored
      Compiler warnings like one listed below are generated during server build on MacOS:
      In file included from server-10.2-MDEV-23564/mysys_ssl/openssl.c:33:
      In file included from /usr/local/include/openssl/evp.h:16:
      In file included from /usr/local/include/openssl/bio.h:20:
      /usr/local/include/openssl/crypto.h:206:10: warning: 'CRYPTO_cleanup_all_ex_data' macro redefined [-Wmacro-redefined]
                 ^
        /mariadb/server-10.2-MDEV-23564/include/ssl_compat.h:46:9: note: previous definition is here
                ^
      
      In case MariaDB serer is build with -DCMAKE_BUILD_TYPE=Debug it results in
      build error.
      
      The reason of compiler warnings is that header file <ssl_compat.h>
      included before the openssl system header files. File ssl_compat.h
      contains some macros with the same names as SSL API functions declared
      in the openssl system header files. It resulted in duplicate
      symbols that produces compiler warnings.
      
      To fix the issue the header file ssl_compat.h should be included
      after a line where openssl system header is included.
      a1b6691f
    • Daniel Black's avatar
      MDEV-23887: check_linker_flags correct for old cmake compatibility · b4c225ac
      Daniel Black authored
      It was only from CMake-3.14.0 that CMAKE_REQUIRED_LINK_OPTIONS
      was used in CHECK_CXX_SOURCE_COMPILES. Without this, it could be
      the case (as was on OSX) that a flag was never checked in
      CHECK_CXX_SOURCE_COMPILES, the CHECK successfully passed, but
      failed at link time.
      
      As such we use CMAKE_REQUIRED_LIBRARIES to include the flags to check
      as its compatible enough with the cmake versions for non-Windows
      compilers/linkers.
      
      Tested on x86_64 with:
      * 3.11.4
      * 3.17.4
      
      Corrects: 7473e184
      
      In the future:
      * cmake >=3.14.0 can use CMAKE_REQUIRED_LINK_OPTIONS
      * cmake >=3.18.0 can use CHECK_LINKER_FLAG (with policy CMP0057 NEW)
      (e.g: commit c7ac2deff9a2c965887dcc67cbf2a3a7c3e0123d)
      
      CMAKE_REQUIRED_LIBRARIES suggested by serg@mariadb.com
      
      Reviewed-by: anel@mariadb.org
      b4c225ac
    • Marko Mäkelä's avatar
      MDEV-23998 Race between buf_page_optimistic_get() and buf_page_t::init() · 1668465f
      Marko Mäkelä authored
      MDEV-22871 tried to optimize the buf_page_t initialization in
      buf_page_init_for_read() by initializing everything while the block
      is in freed state, and only afterwards attaching the block to
      buf_pool.page_hash.
      
      In an rr replay trace, we have multiple threads executing in
      buf_page_optimistic_get() on the same buf_block_t while the block is
      being freed and reallocated several times in buf_page_init_for_read().
      Because also the buf_page_t::id() is changing, the buf_pool.page_hash
      is being protected by a different rw-lock than the one that
      buf_page_optimistic_get() are successfully read-locking.
      
      buf_page_optimistic_get(): Validate also buf_page_t::id() after
      acquiring the buf_pool.page_hash latch.
      
      Reviewed by: Thirunarayanan Balathandayuthapani
      1668465f
    • Marko Mäkelä's avatar
      MDEV-23986: fil_page_type_validate() fails on crash recovery · 05cd5acb
      Marko Mäkelä authored
      In MDEV-12353, we changed the redo log format so that whenever
      any data field is changed, the unchanged prefix of the bytes
      will by default be omitted from the redo log record.
      
      However, in order for the MDEV-23199 logic to work, changes of
      FSP_SPACE_FLAGS must always be written in full (mtr_t::FORCED),
      so that crash recovery can parse them. We must know the flags
      in advance, because we might be applying log to other pages than
      page 0 first.
      
      recv_scan_log_recs(): Correct a misleading message about starting
      crash recovery. Display both the checkpoint LSN and the start
      of the records that end in the FILE_CHECKPOINT marker.
      
      Reviewed by: Thirunarayanan Balathandayuthapani
      05cd5acb
    • Marko Mäkelä's avatar
      InnoDB 5.6.50 · 65b7f72b
      Marko Mäkelä authored
      The only applicable InnoDB change to MariaDB that was made
      between MySQL 5.6.49 and MySQL 5.6.50 is MDEV-23999.
      65b7f72b
    • Marko Mäkelä's avatar
      MDEV-23999 Potential stack overflow in InnoDB fulltext search · c7552969
      Marko Mäkelä authored
      fts_query_t::nested_sub_exp: Keep track of nested
      fts_ast_visit_sub_exp() calls.
      
      fts_ast_visit_sub_exp(): Return DB_OUT_OF_MEMORY if the
      maximum recursion depth is exceeded.
      
      This is motivated by a change in MySQL 5.6.50:
      mysql/mysql-server@e2a46b4834a0030e5380d45789772cb6beab6e92
      Bug #29929684 USING MANY NESTED ARGUMENTS WITH BOOLEAN FTS CAN LEAD
      TO TERMINATE SERVER
      c7552969
    • Monty's avatar
      MDEV-23648 s3.partition_move 'innodb' test failure - object deleted before copy attempted · 8c074df6
      Monty authored
      Updated submodule libmarias3 which fixes the problem
      Enabled disable S3 tests.
      8c074df6
    • Monty's avatar
      Fixed compiler warning in connect/filemazip.cpp · 21c15cc2
      Monty authored
      21c15cc2
    • Monty's avatar
      Fixed typo in mtr_cases.pm · 2912f1f8
      Monty authored
      2912f1f8
    • Monty's avatar
      Trivial fixups, no code changes · 3c4b8440
      Monty authored
      - Indentation changes
      - Fixed wrong name for used in DBUG_ENTER
      - Added some code comments
      3c4b8440
    • Monty's avatar
      Update S3 engine to maturity Gamma · dd757ee0
      Monty authored
      dd757ee0
    • Monty's avatar
      MDEV-23730 s3.replication_partition 'innodb,mix' segv · 2c8c1548
      Monty authored
      This failure was caused because of several bugs:
      - Someone had removed s3-slave-ignore-updates=1 from slave.cnf, which
        caused the slave to remove files that the master was working on.
      - Bug in ha_partition::change_partitions() that didn't reset m_new_file
        in case of errors. This caused crashes in ha_maria::extra() as the
        maria handler was called on files that was already closed.
      - In ma_pagecache there was a bug that when one got a read error one a
        big block (s3 block), it left the flag PCBLOCK_BIG_READ on for the page
        which cased an assert when the page where flushed.
      - Flush all cached tables in case of ignored ALTER TABLE
      
      Note that when merging code from 10.3, that fixes the partition bug, use
      the code from this patch instead.
      
      Changes to ma_pagecache.cc written or reviewed by Sanja
      2c8c1548
    • Monty's avatar
      MDEV-23691 S3 storage engine: delayed slave can drop the table · 71d263a1
      Monty authored
      This commit fixed the problems with S3 after the "DROP TABLE FORCE" changes.
      It also fixes all failing replication S3 tests.
      
      A slave is delayed if it is trying to execute replicated queries on a
      table that is already converted to S3 by the master later in the binlog.
      
      Fixes for replication events on S3 tables for delayed slaves:
      - INSERT and INSERT ... SELECT and CREATE TABLE are ignored but written
        to the binary log.   UPDATE & DELETE will be fixed in a future commit.
      
      Other things:
      - On slaves with --s3-slave-ignore-updates set, allow S3 tables to be
        opened in read-write mode. This was done to be able to
        ignore-but-replicate queries like insert.  Without this change any
        open of an S3 table failed with 'Table is read only' which is too
        early to be able to replicate the original query.
      - Errors are now printed if handler::extra() call fails in
        wait_while_tables_are_used().
      - Error message for row changes are changed from HA_ERR_WRONG_COMMAND
        to HA_ERR_TABLE_READONLY.
      - Disable some maria_extra() calls for S3 tables. This could cause
        S3 tables to fail in some cases.
      - Added missing thr_lock_delete() to ma_open() in case of failure.
      - Removed from mysql_prepare_insert() the not needed argument 'table'.
      71d263a1
    • Monty's avatar
      Added wait-for-pos-timeout=NUM argument to mtr · 5902d5e0
      Monty authored
      Other things:
      - Updated help text for --gdb
      5902d5e0
    • Monty's avatar
  5. 20 Oct, 2020 4 commits
    • Marko Mäkelä's avatar
      Revert MDEV-23484 Rollback unnecessarily acquires dict_operation_lock · 0049d5b5
      Marko Mäkelä authored
      In row_undo_ins_remove_clust_rec() and similar places,
      an assertion !node->trx->dict_operation_lock_mode could fail,
      because an online ALTER is not allowed to run at the same time
      while DDL operations on the table are being rolled back.
      
      This race condition would be fixed by always acquiring an InnoDB
      table lock in ha_innobase::prepare_inplace_alter_table() or
      prepare_inplace_alter_table_dict(), or by ensuring that recovered
      transactions are protected by MDL that would block concurrent DDL
      until the rollback has been completed.
      
      This reverts commit 15093639
      and commit 22c4a751.
      0049d5b5
    • Marko Mäkelä's avatar
      MDEV-23996 Race conditions in SHOW ENGINE INNODB MUTEX · 832a6acb
      Marko Mäkelä authored
      The function innodb_show_mutex_status() is the only ultimate caller of
      LatchCounter::iterate() via MutexMonitor::iterate(). Because the call
      is not protected by LatchCounter::m_mutex, any mutex_create() or
      mutex_free() that is invoked concurrently during the execution, bad
      things such as a crash could happen.
      
      The most likely way for this to happen is buffer pool resizing,
      which could cause buf_block_t::mutex (which existed before MDEV-15053)
      to be created or freed. We could also register InnoDB mutexes in
      TrxFactory::init() if trx_pools needs to grow.
      
      The view INFORMATION_SCHEMA.INNODB_MUTEXES is not affected, because it
      only displays information about rw-locks, not mutexes.
      
      This commit intentionally touches also MutexMonitor::iterate()
      and the only code that interfaces with LatchCounter::iterate()
      to make it clearer for future readers that the scattered code
      that is obfuscated by templates belongs together.
      
      This is based on
      mysql/mysql-server@273a93396f49c7e0a8b07b260128d9a990c2b154
      832a6acb
    • Anel Husakovic's avatar
      Update mtr help · d1af93a5
      Anel Husakovic authored
      - Based on patch: d6a983351c5a454bd0cb113852f
      - Update combination example for 10.2 (commit 2a3fe45d added change
      for 10.3+)
      ```
      ==============================================================================
      
      TEST                                      RESULT   TIME (ms) or COMMENT
      --------------------------------------------------------------------------
      
      worker[1] Using MTR_BUILD_THREAD 300, with reserved ports 16000..16019
      rpl.rpl_invoked_features 'innodb,mix'    [ pass ]   1677
      rpl.rpl_invoked_features 'innodb,row'    [ pass ]   3516
      rpl.rpl_invoked_features 'innodb,stmt'   [ pass ]   1609
      --------------------------------------------------------------------------
      ```
      - `gdb` option will be added during the merge
      d1af93a5
    • Anel Husakovic's avatar
      Updated mtr help · 0627c4ae
      Anel Husakovic authored
      - Updated combination example to use `innodb_plugin`
      ```
      $ ./mysql-test/mtr rpl.rpl_invoked_features # no rpl.rpl_invoked_features,mix,xtradb_plugin
      
      worker[1] Using MTR_BUILD_THREAD 300, with reserved ports 16000..16019
      rpl.rpl_invoked_features 'innodb_plugin,mix' [ pass ]    904
      rpl.rpl_invoked_features 'mix,xtradb'    [ pass ]   1707
      rpl.rpl_invoked_features 'innodb_plugin,row' [ pass ]    927
      rpl.rpl_invoked_features 'row,xtradb'    [ pass ]    828
      rpl.rpl_invoked_features 'innodb_plugin,stmt' [ pass ]    855
      rpl.rpl_invoked_features 'stmt,xtradb'   [ pass ]    952
      --------------------------------------------------------------------------
      ```
      - `gdb` option can take optional gdb arguments (good documentation in
      KB)
      0627c4ae