1. 21 Feb, 2024 2 commits
  2. 20 Feb, 2024 3 commits
    • Thirunarayanan Balathandayuthapani's avatar
      MDEV-30655 IMPORT TABLESPACE fails with column count or index count mismatch · 903ae300
      Thirunarayanan Balathandayuthapani authored
      Problem:
      ========
      Currently import operation fails with schema mismatch when
      cfg file has hidden fts document id and hidden fts document index.
      
      Fix:
      ====
      To fix this issue, simply add the fts doc id column,
      indexes in table definition and try to import the table.
      In case of success:
      1) update the fts document id in sys columns.
      2) update the number of columns in sys tables.
      3) insert the new fts index entry in sys indexes table
      and sys fields.
      4) Reload the table with new table definition
      903ae300
    • Marko Mäkelä's avatar
      Cleanup: Remove OS_FILE_ON_ERROR_NO_EXIT · 3dd7b0a8
      Marko Mäkelä authored
      Ever since commit 412ee033
      or commit a440d6ed
      InnoDB should generally not abort when failing to open or create files.
      In Datafile::open_or_create() we had failed to set the flag
      to avoid abort() on failure, but everywhere else we were setting it.
      
      We may still call abort() via os_file_handle_error().
      
      Reviewed by: Vladislav Vaintroub
      3dd7b0a8
    • Marko Mäkelä's avatar
      MDEV-33379 innodb_log_file_buffering=OFF causes corruption on bcachefs · 7f7329f0
      Marko Mäkelä authored
      Apparently, invoking fcntl(fd, F_SETFL, O_DIRECT) will lead to
      unexpected behaviour on Linux bcachefs and possibly other file systems,
      depending on the operating system version. So, let us avoid doing that,
      and instead just attempt to pass the O_DIRECT flag to open(). This should
      make us compatible with NetBSD, IBM AIX, as well as Solaris and its
      derivatives.
      
      This fix does not change the fact that we had only implemented
      innodb_log_file_buffering=OFF on systems where we can determine the
      physical block size (typically 512 or 4096 bytes).
      Currently, those operating systems are Linux and Microsoft Windows.
      
      HAVE_FCNTL_DIRECT, os_file_set_nocache(): Remove.
      
      OS_FILE_OVERWRITE, OS_FILE_CREATE_PATH: Remove (never used parameters).
      
      os_file_log_buffered(), os_file_log_maybe_unbuffered(): Helper functions.
      
      os_file_create_simple_func(): When applicable, initially attempt to
      open files in O_DIRECT mode.
      
      os_file_create_func(): When applicable, initially attempt to
      open files in O_DIRECT mode.
      For type==OS_LOG_FILE && create_mode != OS_FILE_CREATE
      we will first invoke stat(2) on the file name to find out if the size
      is compatible with O_DIRECT. If create_mode == OS_FILE_CREATE, we will
      invoke fstat(2) on the created log file afterwards, and may close and
      reopen the file in O_DIRECT mode if applicable.
      
      create_temp_file(): Support O_DIRECT. This is only used if O_TMPFILE is
      available and innodb_disable_sort_file_cache=ON (non-default value).
      Notably, that setting never worked on Microsoft Windows.
      
      row_merge_file_create_mode(): Split from row_merge_file_create_low().
      Create a temporary file in the specified mode.
      
      Reviewed by: Vladislav Vaintroub
      7f7329f0
  3. 19 Feb, 2024 1 commit
  4. 16 Feb, 2024 1 commit
    • mariadb-DebarunBanerjee's avatar
      MDEV-33363 CI failure: innodb.import_corrupted: Assertion failed: oldest_lsn >... · 4039d860
      mariadb-DebarunBanerjee authored
      MDEV-33363 CI failure: innodb.import_corrupted: Assertion failed: oldest_lsn > log_sys.last_checkpoint_lsn
      
      This regression is introduced in MDEV-28708 where the MTR_LOG_NO_REDO
      mtrs are assigned last_checkpoint_lsn as the LSN. It causes a race with
      checkpoint in pending state. The concurrent checkpoint writes a
      checkpoint LSN of larger value after pages with older checkpoint LSN is
      inserted into the flush list. The next checkpoint sees the reversal in
      checkpoint sequence and asserts if the pages are not yet flushed.
      
      There could be several ways to solve this issue. Ideally the unlogged
      mtr should take the latest LSN as opposed to going behind and use the
      previous checkpoint LSN. It has been the older design and seems good.
      Also, other than the critical race, using the old checkpoint LSN adds
      the pages to other end of flush list overriding all existing dirty
      pages and looks counter intuitive.
      4039d860
  5. 15 Feb, 2024 1 commit
  6. 14 Feb, 2024 1 commit
  7. 13 Feb, 2024 11 commits
    • Marko Mäkelä's avatar
      Merge 10.5 into 10.6 · 691f9239
      Marko Mäkelä authored
      691f9239
    • Marko Mäkelä's avatar
      Merge 10.4 into 10.5 · b770633e
      Marko Mäkelä authored
      b770633e
    • Marko Mäkelä's avatar
      MDEV-33332 SIGSEGV in buf_read_ahead_linear() when bpage is in buf_pool.watch · 68d9deb6
      Marko Mäkelä authored
      buf_read_ahead_linear(): If buf_pool.watch_is_sentinel(*bpage),
      do not attempt to read the page frame because the pointer would be null
      for the elements of buf_pool.watch[].
      
      Hitting this bug requires the use of a non-default value of
      innodb_change_buffering.
      68d9deb6
    • Marko Mäkelä's avatar
      Fix GCC 14 -Wcalloc-transposed-args · d86deee3
      Marko Mäkelä authored
      d86deee3
    • Otto Kekäläinen's avatar
      Properly introduce wsrep_sst_backup script in project packaging · d64ade30
      Otto Kekäläinen authored
      The script wsrep_sst_backup was introduced on MariaDB 10.3 in commit
      9b2fa2ae. The new script was automatically included in RPM packages but not
      in Debian packages (which started to fail on warning about stray file).
      
      Include wsrep_sst_backup in the mariadb-server-10.5+ package, and also
      include a stub man page so that packaging of a new script is complete.
      
      Related:
      https://galeracluster.com/documentation/html_docs_20210213-1355-master/documentation/backup-cluster.html
      
      This commit was originally submitted in May 2022 in
      https://github.com/MariaDB/server/pull/2129 but upstream indicated only
      in May 2023 that it might get merged, thus this is for a later release.
      
      All new code of the whole pull request, including one or several files
      that are either new files or modified ones, are contributed under the
      BSD-new license. I am contributing on behalf of my employer Amazon Web
      Services, Inc.
      d64ade30
    • Oleksandr Byelkin's avatar
      fix view protocol in MDEV-29179 · ae709b64
      Oleksandr Byelkin authored
      ae709b64
    • Jan Tojnar's avatar
      MDEV-33439 Fix build with libxml2 2.12 · cae18632
      Jan Tojnar authored
      libxml2 2.12.0 made `xmlGetLastError()` return `const` pointer:
      
      https://gitlab.gnome.org/GNOME/libxml2/-/commit/61034116d0a3c8b295c6137956adc3ae55720711
      
      Clang 16 does not like this:
      
          error: assigning to 'xmlErrorPtr' (aka '_xmlError *') from 'const xmlError *' (aka 'const _xmlError *') discards qualifiers
          error: cannot initialize a variable of type 'xmlErrorPtr' (aka '_xmlError *') with an rvalue of type 'const xmlError *' (aka 'const _xmlError *')
      
      Let’s update the variables to `const`.
      For older versions, it will be automatically converted.
      
      But then `xmlResetError(xmlError*)` will not like the `const` pointer:
      
          error: no matching function for call to 'xmlResetError'
          note: candidate function not viable: 1st argument ('const xmlError *' (aka 'const _xmlError *')) would lose const qualifier
      
      Let’s replace it with `xmlResetLastError()`.
      
      ALso remove `LIBXMLDOC::Xerr` protected member property.
      It was introduced in 65b0e545
      along with the `xmlResetError` calls.
      It does not appear to be used for anything.
      cae18632
    • Sean Adams's avatar
      MDEV-24507: Server Crash using UDF in WHERE clause of VIEW · 3281b6b8
      Sean Adams authored
      These changes are submitted under the BSD 3-clause License.
      
      The original ticket describes a server crash when using a UDF in the WHERE clause of a view.  The crash also happens when using a UDF in the WHERE clause of a SELECT that uses a sub-query in the FROM clause.
      
      When the UDF does not have a _deinit function the server crashes in udf_handler::cleanup (sql/item_func.cc:3467).
      When the UDF has both an _init and a _deinit function but _init does not allocate memory for initid->ptr the server crashes in udf_handler::cleanup (sql/item_func.cc:3467).
      When the UDF has both an _init and a _deinit function and allocates/deallocates  memory for initid->ptr the server crashes in the memory deallocation of the _deinit function.
      
      The sequence of events seen are:
        1. A UDF, U, is created for the query.
        2. The UDF _init function is called using U->initid.
        3. U is cloned for the sub-query using the [default|implicit] copy constructor, resulting in V.
        4. The UDF _init function is called using V->initid.  U->initid and V->initid are the same value.
        5. The UDF function is called.
        6. The UDF _deinit function is called using U->initid.  If any memory was allocated for initid->ptr it is deallocated here.
        7. udf_handler::cleanup deletes the U->buffers String array.
        8. The UDF _deinit function is called using V->initid.  If any memory was allocated for initid->ptr it was previously deallocated and _deinit crashes the server.
        9. udf_handler::cleanup deletes the V->buffers String array. V->buffers was the same values as U->buffers which was already deallocated.  The server crashes.
      
      The solution is to create a[n explicit] copy constructor for udf_handler which sets not_original to true.  Later, not_original is set back to false (0) after udf_handler::fix_fields has set up a new value for initid->ptr.
      3281b6b8
    • Daniel Black's avatar
      MDEV-28419 subsequent runs of debian/autobake-deb.sh are not idempotent · c0f6c4bd
      Daniel Black authored
      While a -f debian/mariadb-plugin-columnstore.install idempotent check
      existed, the tying of the install file to the control file has some
      weaknesses.
      
      Used sed as an alternative to replace the debian/control
      mariadb-plugin-columnstore package defination and replace it with the
      one from the columnstore submodule.
      c0f6c4bd
    • Brandon Nesterenko's avatar
      MDEV-31768: Alias MASTER_DEMOTE_TO_REPLICA for MASTER_DEMOTE_TO_SLAVE · 4fbd2e85
      Brandon Nesterenko authored
      Per MDEV-20601, REPLICA should be an alias for SLAVE in SQL
      statements.
      
      Reviewed By:
      ============
      Kristian Nielsen <knielsen@knielsen-hq.org>
      Andrei Elkin <andrei.elkin@mariadb.com>
      4fbd2e85
    • Trevor Gross's avatar
      Fix a case of `unused-but-set-variable` · b909b525
      Trevor Gross authored
      The `unused-but-set-variable` warning is raised on MacOS from the
      `posix_fadvise` standin macro, since offset is often otherwise unused. Add a
      cast to absorb this warning.
      Signed-off-by: default avatarTrevor Gross <tmgross@umich.edu>
      b909b525
  8. 12 Feb, 2024 14 commits
    • Ian Gilfillan's avatar
      Update my_print_defaults man page with mariadbd option · 7bbc545f
      Ian Gilfillan authored
      The `--mariadbd` option was added in 10.11.3, this commit adds the option
      to the man page as well.
      7bbc545f
    • Brad Smith's avatar
      Fix timeout(1) usage in wsrep_sst_mariabackup on *BSD · 44f5fa2d
      Brad Smith authored
      Also fix the usage of timeout(1) on NetBSD, OpenBSD and DragonFly.
      44f5fa2d
    • Marko Mäkelä's avatar
      MDEV-30528 CREATE FULLTEXT INDEX assertion failure WITH SYSTEM VERSIONING · ca88eac8
      Marko Mäkelä authored
      ha_innobase::check_if_supported_inplace_alter(): Require ALGORITHM=COPY
      when creating a FULLTEXT INDEX on a versioned table.
      
      row_merge_buf_add(), row_merge_read_clustered_index(): Remove the parameter
      or local variable history_fts that had been added in the attempt to fix
      MDEV-25004.
      
      Reviewed by: Thirunarayanan Balathandayuthapani
      Tested by: Matthias Leich
      ca88eac8
    • Yuchen Pei's avatar
      MDEV-33441 Do not deinit plugin variables when retry requested · c37216de
      Yuchen Pei authored
      After MDEV-31400, plugins are allowed to ask for retries when failing
      initialisation. However, such failures also cause plugin system
      variables to be deleted (plugin_variables_deinit()) before retrying
      and are not re-added during retry.
      
      We fix this by checking that if the plugin has requested a retry the
      variables are not deleted. Because plugin_deinitialize() also calls
      plugin_variables_deinit(), if the retry fails, the variables will
      still be deleted.
      
      Alternatives considered:
      
      - remove the plugin_variables_deinit() from plugin_initialize() error
      handling altogether. We decide to take a more conservative approach
      here.
      
      - re-add the system variables during retry. It is more complicated
      than simply iterating over plugin->system_vars and call
      my_hash_insert(). For example we will need to assign values to
      the test_load field and extract more code from test_plugin_options(),
      if that is possible.
      c37216de
    • Marko Mäkelä's avatar
      MDEV-33383: Corrupted red-black tree due to incorrect comparison · 81f3e97b
      Marko Mäkelä authored
      fts_doc_id_cmp(): Replaces several duplicated functions for
      comparing two doc_id_t*. On IA-32, AMD64, ARMv7, ARMv8, RISC-V
      this should make use of some conditional ALU instructions.
      On POWER there will be conditional jumps. Unlike the original
      functions, these will return the correct result even if the
      difference of the two doc_id does not fit in the int data type.
      We use static_assert() and offsetof() to check at compilation time
      that this function is compatible with the rbt_create() calls.
      
      fts_query_compare_rank(): As documented, return -1 and not 1
      when the rank are equal and r1->doc_id < r2->doc_id. This will
      affect the result of ha_innobase::ft_read().
      
      fts_ptr2_cmp(), fts_ptr1_ptr2_cmp(): These replace
      fts_trx_table_cmp(), fts_trx_table_id_cmp().
      The fts_savepoint_t::tables will be sorted by dict_table_t*
      rather than dict_table_t::id. There was no correctness bug in
      the previous comparison predicates. We can avoid one level of
      unnecessary pointer dereferencing in this way.
      Actually, fts_savepoint_t is duplicating trx_t::mod_tables.
      MDEV-33401 was filed about removing it.
      
      The added unit test innodb_rbt-t covers both the previous buggy comparison
      predicate and the revised fts_doc_id_cmp(), using keys which led to
      finding the bug. Thanks to Shaohua Wang from Alibaba for providing the
      example and the revised comparison predicate.
      
      Reviewed by: Thirunarayanan Balathandayuthapani
      81f3e97b
    • Marko Mäkelä's avatar
      Cleanup: Remove changed_pages_bitmap · 92f87f2c
      Marko Mäkelä authored
      The innodb_changed_pages plugin only was part of XtraDB, never InnoDB.
      It would be useful for incremental backups.
      We will remove the code from mariadb-backup for now, because it cannot
      serve any useful purpose until the server part has been implemented.
      92f87f2c
    • Marko Mäkelä's avatar
      MDEV-33383: Replace fts_doc_id_cmp, ib_vector_sort · 47122a61
      Marko Mäkelä authored
      fts_doc_ids_sort(): Sort an array of doc_id_t by C++11 std::sort().
      
      fts_doc_id_cmp(), ib_vector_sort(): Remove. The comparison was
      returning an incorrect result when the difference exceeded the int range.
      
      Reviewed by: Thirunarayanan Balathandayuthapani
      47122a61
    • Monty's avatar
      MDEV-33306 Optimizer choosing incorrect index in 10.6, 10.5 but not in 10.4 · 3907345e
      Monty authored
      In MariaDB up to 10.11, the test_if_cheaper_ordering() code (that tries
      to optimizer how GROUP BY is executed) assumes that if a table scan is used
      then if there is any index usable by GROUP BY it will be used.
      
      The reason MySQL 10.4 provides a better plan is because of two differences:
      - Plans using 'ref' has a cost of 1/10 of what it should be (as a
        protection against table scans). This is why 'ref' is used in 10.4
        and not in 10.5.
      - When 'ref' is used, then GROUP BY will not use an index for GROUP BY.
      
      In MariaDB 10.5 the chosen plan is a table scan (as it calculated to be
      faster) but as 'ref' is not used, the test_if_cheaper_ordering()
      optimizer phase decides (as ref is not usd) to use an index for GROUP BY,
      which has bad performance.
      
      Description of fix:
      - All new code is protected by the "optimizer_adjust_secondary_key_costs"
        variable, which is now a bit map, and is only executed if the option
        "disable_forced_index_in_group_by" set.
      - Corrects GROUP BY handling in test_if_cheaper_ordering() by making
        the choise of using and index with GROUP BY cost based instead of rule
        based.
      - Adds TIME_FOR_COMPARE to all costs, when using group by, to make
        read_time, index_scan_time and range_cost comparable.
      
      Other things:
      - Made optimizer_adjust_secondary_key_costs a bit map (compatible with old
        code).
      
      Notes:
      Current code ignores costs for the algorithm used when doing GROUP
      BY on the first table:
        - Create an in-memory temporary table for handling group by and doing a
          filesort of the result file
      We can probably in 10.6 continue to ignore this cost.
      
      This patch should NOT be merged to 11.0 series (not needed in 11.0).
      3907345e
    • Monty's avatar
      Fixed some compiler warnings · 4106974b
      Monty authored
      4106974b
    • Brandon Nesterenko's avatar
      MDEV-29369: rpl.rpl_semi_sync_shutdown_await_ack fails regularly with Result content mismatch · 03d1346e
      Brandon Nesterenko authored
      This test was prone to failures for a few reasons, summarized below:
      
       1) MDEV-32168 introduced “only_running_threads=1” to
      slave_stop.inc, which allowed the stop logic to bypass an
      attempting-to-reconnect IO thread. That is, the IO thread could
      realize the master shutdown in `read_event()`, and thereby call into
      `try_to_reconnect()`. This would leave the IO thread up when the
      test expected it to be stopped. Fixed by explicitly stopping the
      IO thread and allowing an error state, as the above case would
      lead to errno 2003.
      
       2) On slow systems (or those running profiling tools, e.g. MSAN),
      the waiting-for-ack transaction can complete before the system
      processes the `SHUTDOWN WAIT FOR ALL SLAVES`. There was shutdown
      preparation logic in-between the transaction and shutdown itself,
      which contributes to this problem. This patch also moves this
      preparation logic before the transaction, so there is less to do
      in-between the calls.
      
       3) Changed work-around for MDEV-28141 to use debug_sync instead
      of sleep delay, as it was still possible to hit the bug on very
      slow systems.
      
       4) Masked MTR variable reset with disable/enable query log
      
      Reviewed By:
      ============
      Kristian Nielsen <knielsen@knielsen-hq.org>
      03d1346e
    • Brandon Nesterenko's avatar
      MDEV-14357: rpl.rpl_domain_id_filter_io_crash failed in buildbot with wrong result · ee895583
      Brandon Nesterenko authored
      A race condition with the SQL thread, where depending on if it was
      killed before or after it had executed the fake/generated IGN_GTIDS
      Gtid_list_log_event, may or may not update gtid_slave_pos with the
      position of the ignored events. Then, the slave would be restarted
      while resetting IGNORE_DOMAIN_IDS to be empty, which would result in
      the slave requesting different starting locations, depending on
      whether or not gtid_slave_pos was updated. And, because previously
      ignored events could now be requested and executed (no longer
      ignored), their presence would fail the test.
      
      This patch fixes this in two ways. First, to use GTID positions for
      synchronization rather than binlog file positions. Then second, to
      synchronize the SQL thread’s gtid_slave_pos with the ignored events
      before killing the SQL thread.
      
      To consistently reproduce the test failure, the following patch can
      be applied:
      
      diff --git a/sql/log_event_server.cc b/sql/log_event_server.cc
      index f51f5b7deec..de62233acff 100644
      --- a/sql/log_event_server.cc
      +++ b/sql/log_event_server.cc
      @@ -3686,6 +3686,12 @@ Gtid_list_log_event::do_apply_event(rpl_group_info *rgi)
           void *hton= NULL;
           uint32 i;
      
      +    sleep(1);
      +    if (rli->sql_driver_thd->killed || rli->abort_slave)
      +    {
      +      return 0;
      +    }
      +
      
      Reviewed By:
      ============
      Kristian Nielsen <knielsen@knielsen-hq.org>
      ee895583
    • Oleksandr Byelkin's avatar
    • Marko Mäkelä's avatar
      Merge 10.4 into 10.5 · 8ec12e0d
      Marko Mäkelä authored
      8ec12e0d
    • Aurelien Jarno's avatar
      RISC-V: use RDTIME instead of RDCYCLE · 656f8867
      Aurelien Jarno authored
      Starting with Linux 6.6 [1], RDCYCLE is a privileged instruction on
      RISC-V and can't be used directly from userland. There is a sysctl
      option to change that as a transition period, but it will eventually
      disappear.
      
      Use RDTIME instead, which while less accurate has the advantage of being
      synchronized between CPU (and thus monotonic) and of constant frequency.
      
      [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cc4c07c89aada16229084eeb93895c95b7eabaa3
      656f8867
  9. 11 Feb, 2024 1 commit
  10. 10 Feb, 2024 2 commits
    • Oleg Smirnov's avatar
      c32e59ac
    • Oleg Smirnov's avatar
      MDEV-30660 Aggregation functions fail to leverage uniqueness property · 15623c7f
      Oleg Smirnov authored
      When executing a statement of the form
        SELECT AGGR_FN(DISTINCT c1, c2,..,cn) FROM t1,
      where AGGR_FN is an aggregate function such as COUNT(), AVG() or SUM(),
      and a unique index exists on table t1 covering some or all of the
      columns (c1, c2,..,cn), the retrieved values are inherently unique.
      Consequently, the need for de-duplication imposed by the DISTINCT
      clause can be eliminated, leading to optimization of aggregation
      operations.
      This optimization applies under the following conditions:
        - only one table involved in the join (not counting const tables)
        - some arguments of the aggregate function are fields
              (not functions/subqueries)
      
      This optimization extends to queries of the form
        SELECT AGGR_FN(c1, c2,..,cn) GROUP BY cx,..cy
      when a unique index covers some or all of the columns
      (c1, c2,..cn, cx,..cy)
      15623c7f
  11. 09 Feb, 2024 1 commit
  12. 08 Feb, 2024 2 commits