1. 19 Aug, 2021 8 commits
    • Marko Mäkelä's avatar
      MDEV-20931 fixup: innodb.import_corrtupted test cleanup · d12b5e21
      Marko Mäkelä authored
      In MariaDB 10.6, ALTER TABLE t2 IMPORT TABLESPACE
      will not remove the file t2.ibd on failure.
      
      This fixes a failure of
      ./mtr --no-reorder innodb.import_corrupted innodb.innodb-agregate
      d12b5e21
    • Marko Mäkelä's avatar
      Merge 10.5 to 10.6 · f3fcf5f4
      Marko Mäkelä authored
      f3fcf5f4
    • Marko Mäkelä's avatar
      MDEV-26439 Typo in Foreign Key error message · 17980e35
      Marko Mäkelä authored
      foreign_push_index_error(): Fix a typo of 'match' that was introduced
      in commit 5130f520 (MDEV-20480).
      
      Thanks to Oli Sennhauser for reporting this.
      17980e35
    • Marko Mäkelä's avatar
      Merge 10.4 into 10.5 · 06079a4c
      Marko Mäkelä authored
      06079a4c
    • Vlad Lesin's avatar
      MDEV-26206 gap lock is not set if implicit lock exists · a2a0ac7c
      Vlad Lesin authored
      Post-push fix for 10.5+.
      
      The fix influence MDEV-14479. Before the fix
      lock_rec_convert_impl_to_expl() did not create explicit lock if caller's
      transaction owns found implicit lock(see MDEV-14479 for details). After the fix
      lock_rec_convert_impl_to_expl() can create explicit lock under the above
      conditions if the requested lock mode is not LOCK_REC_NOT_GAP. And that
      is why we need to check if the table is X-locked before
      lock_rec_convert_impl_to_expl() call.
      a2a0ac7c
    • Marko Mäkelä's avatar
      MDEV-20931 fixup · 7d2d9f04
      Marko Mäkelä authored
      The merge commit 4a259572
      caused a test failure on Windows. The suppression regexp
      needs to accept the backslash.
      
      fil_invalid_page_access_msg(): Simplify the implementation
      and invoke sql_print_error() directly.
      
      fil_space_t::io(): Invoke fil_invalid_page_access_msg() only from
      one location.
      7d2d9f04
    • Thirunarayanan Balathandayuthapani's avatar
      89723ce1
    • Sujatha's avatar
      MDEV-25958: rpl_semi_sync_fail_over.test fails in buildbot · 475f69b9
      Sujatha authored
      Analysis:
      ========
      In case multi binlog truncation scenario debug sync points are in the
      following order.
      
      Two inserts are done on master as shown below.
      
      INSERT INTO t1 VALUES (4, REPEAT("x", 4100)
      commit_after_release_LOCK_after_binlog_sync
      
      INSERT INTO t1 VALUES (5, REPEAT("x", 4100)
      commit_after_release_LOCK_log
      
      First insert debug sync ensures that transaction is synced to binlog and
      not committed but it reached slave through semi sync.
      
      Second insert debug sync ensures that transaction is synced to binlog and
      not committed. It doesn't ensure that 'INSERT 5' reached slave.
      
      Most of the times INSERT 5 reaches slave, hence when it is promoted as
      master it sends 4,5 to slave. But occasionally 5 may not reach slave in
      those cases post recovery master will have only 4. When row 6 is inserted
      Master has 4-6 and Slave has 4,5,6.
      
      This results in test failure.
      
      Fix:
      ===
      For the first insert use 'commit_before_get_LOCK_commit_ordered' debug sync
      point, it will ensure that binlog was sent to slave and slave has
      acknowledged the receipt. Now enable debug code such that when the next
      transaction is written to binary log, dump thread will read and send it
      across the network and notify the server to be get killed. Insert row 5
      and wait for notification from dump thread. Kill the server. This ensures
      that both 4 and 5 have reached the semi-sync slave.
      
      Added a new test case:
      Insert two rows on master such that first is present in master's binlog and
      reached semi sync slave. Second insert should be flushed to binlog but not
      sent to slave. Now crash and fail over to slave. The promoted master will send
      the extra transaction to slave.
      475f69b9
  2. 18 Aug, 2021 13 commits
  3. 17 Aug, 2021 3 commits
    • Eugene Kosov's avatar
      MDEV-20931 ALTER...IMPORT can crash the server · 890f2ad7
      Eugene Kosov authored
      Main idea: don't log-and-crash but propogate error to the upper layers of stack
      to handle it and show to a user.
      890f2ad7
    • Vlad Lesin's avatar
      MDEV-26206 gap lock is not set if implicit lock exists · 2d259187
      Vlad Lesin authored
      If lock type is LOCK_GAP or LOCK_ORDINARY, and the transaction holds
      implicit lock for the record, then explicit gap-lock will not be set for
      the record, as lock_rec_convert_impl_to_expl() returns true and
      lock_rec_convert_impl_to_expl() bypasses lock_rec_lock() call.
      
      The fix converts explicit lock to implicit one if requested lock type is
      not LOCK_REC_NOT_GAP.
      
      innodb_information_schema test result is also changed as after the fix
      the following statements execution:
      
      SET autocommit=0;
      INSERT INTO t1 VALUES (5,10);
      SELECT * FROM t1 FOR UPDATE;
      
      leads to additional gap lock requests.
      2d259187
    • Marko Mäkelä's avatar
      MDEV-16264 fixup: Add missing 'static' · cce33787
      Marko Mäkelä authored
      cce33787
  4. 16 Aug, 2021 6 commits
    • Marko Mäkelä's avatar
      MDEV-26372 enforce-storage-engine=InnoDB has no usability as an option to mysqld-install-db · dc58303c
      Marko Mäkelä authored
      Creation of tables by the three names mysql.user, mysql.host, mysql.db
      was being blocked in the function row_mysql_is_system_table().
      
      Since commit 4abb8216 (MDEV-17658),
      mysql.user is a view, not a table. Since commit
      ead9a34a (MDEV-15851), mysql.host
      is not being created at all.
      
      Let us remove the special handling of table names in InnoDB,
      and allow mysql.db to be created in InnoDB. The special handling
      was originally added in commit e84ef2b7
      without any explanation.
      
      Reviewed by: Sergei Golubchik
      dc58303c
    • Thirunarayanan Balathandayuthapani's avatar
      MDEV-26273 InnoDB FTS DDL fails when innodb_force_recovery is set to 2 · 25531304
      Thirunarayanan Balathandayuthapani authored
      InnoDB DDL fails when it tries to sync the table
      when innodb_force_recovery is set to 2. Problem
      is that fts_optimize_wq is not initialized when
      there are no background threads. fts_sync_during_ddl()
      should check whether fts_optimize_wq is initialized.
      25531304
    • Thirunarayanan Balathandayuthapani's avatar
      MDEV-26131 SEGV in ha_innobase::discard_or_import_tablespace · 89445b64
      Thirunarayanan Balathandayuthapani authored
      Import operation without .cfg file fails when there is mismatch of index
      between metadata table and .ibd file. Moreover, MDEV-19022 shows
      that InnoDB can end up with index tree where non-leaf page has only
      one child page. So it is unsafe to find the secondary index root page.
      
      This patch does the following when importing the table without .cfg file:
      
      1) If the metadata contains more than one index then InnoDB stops
      the import operation and report the user to drop all secondary
      indexes before doing import operation.
      
      2) When the metadata contain only clustered index then InnoDB finds the
      index id by reading page 0 & page 3 instead of traversing the
      whole tablespace.
      89445b64
    • Marko Mäkelä's avatar
      MDEV-26376 pars_info_bind_id() unnecessarily copies strings · 4cd063b9
      Marko Mäkelä authored
      pars_info_bind_id(): Remove the parameter copy_name. It was always
      being passed as constant TRUE or true. It turns out that copying
      the string is completely unnecessary. In all calls except the one
      in fts_get_select_columns_str() and fts_doc_fetch_by_doc_id(),
      the parameter is being passed as a compile-time constant, and therefore
      the pointer cannot become stale. In that special call, the string
      that is being passed is allocated from the same memory heap that
      pars_info_bind_id() would have been using.
      
      pars_info_add_id(): Remove (unused declaration).
      4cd063b9
    • Daniel Black's avatar
      deb: columnstore not 32bit (fix) · 3d16e0e1
      Daniel Black authored
      Fix for previous commit, shell logic for repeat configure
      stages corrected to use subshell.
      3d16e0e1
    • Julius Goryavsky's avatar
      MDEV-26101: Galera WSREP SST broken on 10.6 under FreeBSD · 50428b39
      Julius Goryavsky authored
      This commit fixes a call to the sockstat utility for FreeBSD,
      where this utility requires an extra "-s" parameter to display
      the connection status and prints one extra column.
      50428b39
  5. 15 Aug, 2021 2 commits
    • Julius Goryavsky's avatar
      MDEV-26340: rsync uses `--whole-file` only in wan mode · 094e0391
      Julius Goryavsky authored
      This commit fixes a mistake where the --whole-file option
      is used by rsync SST in WAN mode instead of LAN.
      094e0391
    • Julius Goryavsky's avatar
      MDEV-26211: Cluster joiner node is failed to start when using TLS · d1a948cf
      Julius Goryavsky authored
      This commit adds support for reading new SSL configuration
      options (ssl-ca, ssl-cert and ssl-key) if the [sst] section
      with old options (tca, tcert and tkey) is missing in the config
      file, even if not specified authentication mode via the ssl-mode
      option. Before this change, new parameters were read only if the
      ssl-mode option was present in the configuration file and it was
      not equal to the 'DISABLED' value.
      
      Also added diagnostics (information level) which warns the user
      that due to the presence of the tca, tcert and/or tkey parameters
      in the [sst] section, new SSL configuration options will be ignored
      (if their values do not match the old ones).
      d1a948cf
  6. 14 Aug, 2021 1 commit
    • Daniel Black's avatar
      mysql_client_test: test_bug40365 gcc-11.2.1 indentation complaint · 3b29315f
      Daniel Black authored
      Observed in 10.4 however same code in 10.2
      
      mariadb-server-10.4/tests/mysql_client_test.c:18209:5: error: this ‘if’ clause does not guard... [-Werror=misleading-indentation]
      18209 |     if (!opt_silent)
            |     ^~
      In file included from mariadb-server-10.4/tests/mysql_client_test.c:38:
      mariadb-server-10.4/tests/mysql_client_fw.c:133:9: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the ‘if’
        133 |         ((void) ((expr) ? 0 : (die(__FILE__, __LINE__, #expr), 0)))
            |         ^
      mariadb-server-10.4/tests/mysql_client_test.c:18212:7: note: in expansion of macro ‘DIE_UNLESS’
      18212 |       DIE_UNLESS(tm[i].year == 0);
            |       ^~~~~~~~~~
      
      $ /usr/bin/cc --version
      cc (GCC) 11.2.1 20210728 (Red Hat 11.2.1-1)
      3b29315f
  7. 13 Aug, 2021 2 commits
    • Brandon Nesterenko's avatar
      MDEV-20215: binlog.show_concurrent_rotate failed in buildbot with wrong result · 46c3e7e3
      Brandon Nesterenko authored
      Problem:
      =======
      There are two issues that are addressed in this patch:
       1) SHOW BINARY LOGS uses caching to store the binary logs that exist
      in the log directory; however, if new events are written to the logs,
      the caching strategy is unaware. This is okay for users, as it is
      okay for SHOW to return slightly old data. The test, however, can
      result in inconsistent data. It runs two connections concurrently,
      where one shows the logs, and the other adds a new file. The output
      of SHOW BINARY LOGS then depends on when the cache is built, with
      respect to the time that the second connection rotates the logs.
       2) There is a race condition between RESET MASTER and SHOW BINARY
      LOGS. More specifically, where they both need the binary log lock to
      begin, SHOW BINARY LOGS only needs the lock to build its cache. If
      RESET MASTER is issued after SHOW BINARY LOGS has built its cache and
      before it has returned the results, the presented data may be
      incorrect.
      
      Solution:
      ========
       1) As it is okay for users to see stale data, to make the test
      consistent, use DEBUG_SYNC to force the race condition (problem 2) to
      make SHOW BINARY LOGS build a cache before RESET MASTER is called.
      Then, use additional logic from the next part of the solution to
      rebuild the cache.
       2) Use an Atomic_counter to keep track of the number of times RESET
      MASTER has been called. If the value of the counter changes after
      building the cache, the cache should be rebuilt and the analysis
      should be restarted.
      
      Reviewed By:
      ============
      Andrei Elkin: <andrei.elkin@mariadb.com>
      46c3e7e3
    • Sujatha's avatar
      MDEV-25962: binlog.binlog_truncate_multi_log_unsafe test fails in buildbot · 583516bb
      Sujatha authored
      1. sync_binlog=1 is needed to ensure that on flush binlog is available on
         disk.
      2. Insert on 'connection master2' should wait for 'master1_ready' from
         'connection master1'.
      
      Added sync_binlog=1 to all tests that got added as part of MDEV-21117 fix
      
      @mysql-test/suite/binlog/t/binlog_truncate_multi_log_unsafe.test
      @mysql-test/suite/binlog/t/binlog_truncate_multi_engine.test
      @mysql-test/suite/binlog/t/binlog_truncate_active_log.test
      @mysql-test/suite/binlog/t/binlog_truncate_multi_log.test
      583516bb
  8. 12 Aug, 2021 3 commits
  9. 11 Aug, 2021 2 commits