1. 17 Jun, 2024 2 commits
    • Sergei Petrunia's avatar
      MDEV-30651: Assertion `sel->quick' in make_range_rowid_filters · ef9e3e73
      Sergei Petrunia authored
      (Variant for 10.6: return error code from SQL_SELECT::test_quick_select)
      The optimizer deals with Rowid Filters this way:
      
      1. First, range optimizer is invoked. It saves information
         about all potential range accesses.
      2. A query plan is chosen. Suppose, it uses a Rowid Filter on
         index $IDX.
      3. JOIN::make_range_rowid_filters() calls the range optimizer
      again to create a quick select on index $IDX which will be used
      to populate the rowid filter.
      
      The problem: KILL command catches the query in step #3. Quick
      Select is not created which causes a crash.
      
      Fixed by checking if query was killed.
      ef9e3e73
    • Marko Mäkelä's avatar
      Merge 10.5 into 10.6 · e60acae6
      Marko Mäkelä authored
      e60acae6
  2. 16 Jun, 2024 2 commits
    • Monty's avatar
      Change mysqldump to use DO instead of 'SELECT' for storing sequences. · 956bcf8f
      Monty authored
      This avoids a lot of SETVAL() results when applying a mysqldump with
      sequences.
      956bcf8f
    • Monty's avatar
      MDEV-34406 Enhance mariadb_upgrade to print failing query in case of error · fef32fd9
      Monty authored
      To make this possible, it was also necessary to enhance the mariadb
      client with the option --print-query-on-error.
      This option can also be very useful when running a batch of queries
      through the mariadb client and one wants to find out where things goes
      wrong.
      
      TODO: It would be good to enhance mariadb_upgrade to not call the mariadb
      client for executing queries but instead do this internally.  This
      would have made this patch much easier!
      
      Reviewed by: Sergei Golubchik <serg@mariadb.com>
      fef32fd9
  3. 14 Jun, 2024 2 commits
  4. 13 Jun, 2024 3 commits
  5. 12 Jun, 2024 2 commits
    • Brandon Nesterenko's avatar
      MDEV-34365: UBSAN runtime error: call to function io_callback(tpool::aiocb*) · d3a7e46b
      Brandon Nesterenko authored
      On an UBSAN clang-15 build, if running with UBSAN option
      halt_on_error=1 (the issue doesn't show up without it),
      MTR fails during mysqld --bootstrap with UBSAN error:
      
      call to function io_callback(tpool::aiocb*) through pointer to incorrect function type 'void (*)(void *)'
      
      This patch corrects the parameter type of io_callback
      to match its expected type defined by callback_func,
      i.e. (void*).
      
      Reviewed By:
      ============
      <TODO>
      d3a7e46b
    • Marko Mäkelä's avatar
      Merge 10.5 into 10.6 · fc9005ad
      Marko Mäkelä authored
      fc9005ad
  6. 11 Jun, 2024 1 commit
    • Vladislav Vaintroub's avatar
      MDEV-33616 workaround libmariadb bug : mysql_errno = 0 on failed connection · f2eda615
      Vladislav Vaintroub authored
      The bug can happens on macOS, if server closes the socket without sending
      error packet to client. Closing the socket on server side is legitimate,
      and happen e.g when write timeout occurs, perhaps also other situations.
      
      However mysqltest is not prepared to handle mysql_errno 0, and erroneously
      thinks connection was successfully established.
      
      The fix/workaround in mysqltest is to treat client failure with
      mysql_errno 0 the same as CR_SERVER_LOST (generic client-side
      communication error)
      
      The real fix in client library would ensure that mysql_errno is set
      on errors.
      f2eda615
  7. 10 Jun, 2024 9 commits
    • Yuchen Pei's avatar
      MDEV-34002 Initialise fields in spider_db_handler · d524cb5b
      Yuchen Pei authored
      Otherwise it may result in nonsensical values like 190 for a boolean.
      d524cb5b
    • Sergei Golubchik's avatar
      fix the test for --view · 40dd5b86
      Sergei Golubchik authored
      40dd5b86
    • Dave Gosselin's avatar
      MDEV-34129 mariadb-install-db appears to hang on macOS · 90d376e0
      Dave Gosselin authored
      Immediately close down the signal handler loop when we decide to
      break connections as it's the start of process termination
      anyway, and there's no need to wait once we've invoked break_connections.
      90d376e0
    • Brandon Nesterenko's avatar
      MDEV-34355: rpl.rpl_semi_sync_no_missed_ack_after_add_slave ‘server_3 should have sent…’ · fcd21d3e
      Brandon Nesterenko authored
      The problem is that the test could query the status variable
      Rpl_semi_sync_slave_send_ack before the slave actually updated it.
      This would result in an immediate --die assertion killing the rest
      of the test. The bottom of this commit message has a small patch
      that can be applied to reproduce the test failure.
      
      This patch fixes the test failure by waiting for the variable to be
      updated before querying its value.
      
      diff --git a/sql/semisync_slave.cc b/sql/semisync_slave.cc
      index 9ddd4c5c8d7..60538079fce 100644
      --- a/sql/semisync_slave.cc
      +++ b/sql/semisync_slave.cc
      @@ -303,7 +303,10 @@ int Repl_semi_sync_slave::slave_reply(Master_info *mi)
           reply_res= DBUG_EVALUATE_IF("semislave_failed_net_flush", 1,
                                       net_flush(net));
           if (!reply_res)
      +    {
      +      sleep(1);
             rpl_semi_sync_slave_send_ack++;
      +    }
         }
         DBUG_RETURN(reply_res);
       }
      fcd21d3e
    • Alexander Barkov's avatar
      mtr --skip-not-found did not skip suites · 3b80d23d
      Alexander Barkov authored
      --skip-not-found switch tells mtr to skip not found tests instead of aborting.
      But it failed to skip the test if the suite name was not found.
      
      This problem also made the *last-N-failed builbot builders fail
      to run `mtr --skip-not-found` if the last commit removed a file in
      the mysql-test/include/ directory.
      
      This commit fixes it, now the not found test is properly skipped,
      no matter what component of the test name was not found:
      
      $ ./mtr main.foo --skip-not-found foo.main
      ...
      ==============================================================================
      TEST                                  WORKER RESULT   TIME (ms) or COMMENT
      --------------------------------------------------------------------------
      foo.main                                 [ skipped ]  not found
      main.foo                                 [ skipped ]  not found
      --------------------------------------------------------------------------
      3b80d23d
    • Marko Mäkelä's avatar
      Merge 10.5 into 10.6 · 27834ebc
      Marko Mäkelä authored
      27834ebc
    • Marko Mäkelä's avatar
      MDEV-33161 Function pointer signature mismatch in LF_HASH · a2bd936c
      Marko Mäkelä authored
      In cmake -DWITH_UBSAN=ON builds with clang but not with GCC,
      -fsanitize=undefined will flag several runtime errors on
      function pointer mismatch related to the lock-free hash table LF_HASH.
      
      Let us use matching function signatures and remove function pointer
      casts in order to avoid potential bugs due to undefined behaviour.
      
      These errors could be caught at compilation time by
      -Wcast-function-type-strict, which is available starting with clang-16,
      but not available in any version of GCC as of now. The old GCC flag
      -Wcast-function-type is enabled as part of -Wextra, but it specifically
      does not catch these errors.
      
      Reviewed by: Vladislav Vaintroub
      a2bd936c
    • Alexander Barkov's avatar
      MDEV-34227 On startup: UBSAN: runtime error: applying non-zero offset in... · 246c0b3a
      Alexander Barkov authored
      MDEV-34227 On startup: UBSAN: runtime error: applying non-zero offset in JOIN::make_aggr_tables_info in sql/sql_select.cc
      
      Avoid undefined behaviour (applying offset to nullptr).
      The reported scenario is covered in mysql-test/connect-no-db.test
      No new tests needed.
      246c0b3a
    • Alexander Barkov's avatar
      MDEV-32376 SHOW CREATE DATABASE statement crashes the server when db name... · 21f56583
      Alexander Barkov authored
      MDEV-32376 SHOW CREATE DATABASE statement crashes the server when db name contains some unicode characters, ASAN stack-buffer-overflow
      
      Adding the test for the length of lex->name into show_create_db().
      
      Without this test writes beyond the end of db_name_buff were possible
      upon a too long database name.
      21f56583
  8. 09 Jun, 2024 1 commit
    • Brandon Nesterenko's avatar
      MDEV-34237: On Startup: UBSAN: runtime error: call to function... · bf0aa99a
      Brandon Nesterenko authored
      MDEV-34237: On Startup: UBSAN: runtime error: call to function MDL_lock::lf_hash_initializer lf_hash_insert through pointer to incorrect function type 'void (*)(st_lf_hash *, void *, const void *)'
      
      A few different incorrect function type UBSAN issues have been
      grouped into this patch.
      
      The only real potentially undefined behavior is an error about
      show_func_mutex_instances_lost, which when invoked in
      sql_show.cc::show_status_array(), puts 5 arguments onto the stack;
      however, the implementing function only actually has 3 parameters (so
      only 3 would be popped). This was fixed by adding in the remaining
      parameters to satisfy the type mysql_show_var_func.
      
      The rest of the findings are pointer type mismatches that wouldn't
      lead to actual undefined behavior. The lf_hash_initializer function
      type definition is
      
      typedef void (*lf_hash_initializer)(LF_HASH *hash, void *dst, const void *src);
      
      but the MDL_lock and table cache's implementations of this function
      do not have that signature. The MDL_lock has specific MDL object
      parameters:
      
      static void lf_hash_initializer(LF_HASH *hash __attribute__((unused)),
                                      MDL_lock *lock, MDL_key *key_arg)
      
      and the table cache has specific TDC parameters:
      
      static void tdc_hash_initializer(LF_HASH *,
                                       TDC_element *element, LEX_STRING *key)
      
      leading to UBSAN runtime errors when invoking these functions.
      
      This patch fixes these type mis-matches by changing the
      implementing functions to use void * and const void * for their
      respective parameters, and later casting them to their expected
      type in the function body.
      
      Note too the functions tdc_hash_key and tc_purge_callback had
      a similar problem to tdc_hash_initializer and was fixed
      similarly.
      
      Reviewed By:
      ============
      Sergei Golubchik <serg@mariadb.com>
      bf0aa99a
  9. 07 Jun, 2024 8 commits
  10. 06 Jun, 2024 10 commits
    • Julius Goryavsky's avatar
      MDEV-32158: wsrep_sst_mariabackup use /tmp dir during SST rather then user defined tmpdir · 238798d9
      Julius Goryavsky authored
      wsrep_sst_mariabackup should use the tmpdir defined by
      the user under the '[mysqld]' section of the configuration
      file rather than the default '/tmp' directory.
      238798d9
    • Julius Goryavsky's avatar
      galera: wsrep-lib submodule update · 654f6ece
      Julius Goryavsky authored
      654f6ece
    • Julius Goryavsky's avatar
      mtr: сhange the default setting for the port group size parameter · c2d97620
      Julius Goryavsky authored
      Some galera tests starts 6 galera nodes. Each galera node requires
      three ports: 6*3 = 18. Plus 6 ports are needed for 6 mariadbd servers.
      Since the number of ports is rounded up to 10 everywhere in mtr, we
      will take 30 as the default value for the port group size parameter.
      c2d97620
    • Daniele Sciascia's avatar
      MDEV-33523 Spurious deadlock error when wsrep_on=OFF · c1dc0397
      Daniele Sciascia authored
      Avoid starting transactions in wsrep-lib side when wsrep is
      disabled. It is unnecessary, and causes spurious deadlock errors on
      transaction clean up.
      Signed-off-by: default avatarJulius Goryavsky <julius.goryavsky@mariadb.com>
      c1dc0397
    • Jan Lindström's avatar
      MDEV-34170 : table gtid_slave_pos entries never been deleted with wsrep_gtid_mode = 0 · d328705a
      Jan Lindström authored
      Problem was that updates to mysql.gtid_slave_pos table were
      replicated even when they were newer used and because that
      newer deleted. Avoid replication of mysql.gtid_slave_pos
      table if wsrep_gtid_mode=OFF.
      Signed-off-by: default avatarJulius Goryavsky <julius.goryavsky@mariadb.com>
      d328705a
    • Thirunarayanan Balathandayuthapani's avatar
      MDEV-34057 Inconsistent FTS state in concurrent scenarios · a02773f7
      Thirunarayanan Balathandayuthapani authored
      Problem:
      =======
      - This commit is a merge of mysql commit 129ee47ef994652081a11ee9040c0488e5275b14.
      InnoDB FTS can be in inconsistent state when sync operation
      terminates the server before committing the operation. This
      could lead to incorrect synced doc id and incorrect query results.
      
      Solution:
      ========
      - During sync commit operation, InnoDB should pass
      the sync transaction to update the max doc id
      in the config table.
      
      fts_read_synced_doc_id() : This function is used
      to read only synced doc id from the config table.
      a02773f7
    • Marko Mäkelä's avatar
      MDEV-34296 extern thread_local is a CPU waste · 699d38d9
      Marko Mäkelä authored
      In commit 99bd2260 (MDEV-31558)
      we wrongly thought that there would be minimal overhead for accessing
      a thread-local variable mariadb_stats.
      
      It turns out that in C++11, each access to an extern thread_local
      variable requires conditionally invoking an initialization function.
      In fact, the initializer expression of mariadb_stats is dynamic, and
      those calls were actually unavoidable.
      
      In C++20, one could declare constinit thread_local variables, but
      the address of a thread_local variable (&mariadb_dummy_stats) is not
      a compile-time constant. We did not want to declare mariadb_dummy_stats
      without thread_local, because then the dummy accesses could lead to
      cache line contention between threads.
      
      mariadb_stats: Declare as __thread or __declspec(thread) so that
      there will be no dynamic initialization, but zero-initialization.
      
      mariadb_dummy_stats: Remove. It is a lesser evil to let
      the environment perform zero-initialization and check if
      !mariadb_stats.
      
      Reviewed by: Sergei Petrunia
      699d38d9
    • Marko Mäkelä's avatar
      MDEV-34283 A misplaced btr_cur_need_opposite_intention() check may fail to prevent hangs · 9fac857f
      Marko Mäkelä authored
      btr_cur_t::search_leaf(): Invoke btr_cur_need_opposite_intention() after
      positioning page_cur.rec so that the record will be in the intended page.
      This is something that was broken in
      commit f2096478 or
      commit de4030e4 or related changes.
      
      btr_cur_need_opposite_intention(): Add a debug assertion that would
      catch the misuse.
      
      The "next line of defence" that should have caught this bug in debug builds
      are assertions that mtr_t::m_memo contains MTR_MEMO_X_LOCK for the
      dict_index_t::lock. When btr_cur_need_opposite_intention() holds,
      we should escalate to acquiring an exclusive index->lock in
      btr_cur_t::pessimistic_search_leaf().
      
      Reviewed by: Debarun Banerjee
      9fac857f
    • Marko Mäkelä's avatar
      MDEV-34307 On startup, [FATAL] InnoDB: Page ... still fixed or dirty · bc366092
      Marko Mäkelä authored
      buf_pool_invalidate(): Properly wait for
      os_aio_wait_until_no_pending_writes() to ensure so that there
      are no pending buf_page_t::write_complete() or buf_page_write_complete()
      operations. This will avoid a failure of buf_pool.assert_all_freed().
      
      This bug should affect debug builds only. At this point, the
      buf_pool.flush_list should be clear and all changes should have
      been written out. The loop around buf_LRU_scan_and_free_block() should
      have eventually completed and freed all pages as soon as
      buf_page_t::write_complete() had a chance to release the page latches.
      
      It is worth noting that buf_flush_wait() is working as intended.
      As soon as buf_flush_page_cleaner() invokes
      buf_pool.get_oldest_modification() it will observe that
      buf_page_t::write_complete() had assigned oldest_modification_ to 1,
      and remove such blocks from buf_pool.flush_list. Upon reaching
      buf_pool.flush_list.count=0 the buf_flush_page_cleaner() will mark
      itself idle and wake buf_flush_wait() by broadcasting
      buf_pool.done_flush_list.
      
      This regression was introduced in
      commit a55b951e (MDEV-26827).
      
      Reviewed by: Debarun Banerjee
      bc366092
    • Rucha Deodhar's avatar
      MDEV-34143: Server crashes when executing JSON_EXTRACT after setting · 0406b2a4
      Rucha Deodhar authored
      non-default collation_connection
      
      Analysis:
      Due to different collation, the string has nothing to chop off.
      
      Fix:
      Got rid of chop(), only append " ," only when we have more elements to
      add to the result.
      0406b2a4