1. 18 Aug, 2021 8 commits
  2. 17 Aug, 2021 2 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
  3. 16 Aug, 2021 3 commits
    • 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
    • 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
  4. 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
  5. 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
  6. 09 Aug, 2021 1 commit
    • Vladislav Vaintroub's avatar
      Fix cmake warning caused by 751ebe44 · f725020f
      Vladislav Vaintroub authored
      CMake Warning (dev) at cmake/plugin.cmake:288 (GET_TARGET_PROPERTY):
        Policy CMP0045 is not set: Error on non-existent target...
      
      Also, fix condition argument in ADD_FEATURE_INFO. It is not a string
      but boolean
      f725020f
  7. 05 Aug, 2021 4 commits
    • Aleksey Midenkov's avatar
      MDEV-18734 ASAN heap-use-after-free upon sorting by blob column from partitioned table · 160d97a4
      Aleksey Midenkov authored
      ha_partition stores records in array of m_ordered_rec_buffer and uses
      it for prio queue in ordered index scan. When the records are restored
      from the array the blob buffers may be already freed or rewritten.
      
      The solution is to take temporary ownership of cached blob buffers via
      String::swap(). When the record is restored from m_ordered_rec_buffer
      the ownership is returned to table fields.
      
      Cleanups:
      
      init_record_priority_queue(): removed needless !m_ordered_rec_buffer
      check as there is same assertion few lines before.
      
      dbug_print_row() for arbitrary row pointer
      160d97a4
    • Daniel Bartholomew's avatar
      bump the VERSION · d9526ae6
      Daniel Bartholomew authored
      d9526ae6
    • Daniel Bartholomew's avatar
      bump the VERSION · b8deb028
      Daniel Bartholomew authored
      b8deb028
    • Yongxin Xu's avatar
      MDEV-24523 Execution of JSON_REPLACE failed on Spider · fa6eaead
      Yongxin Xu authored
      JSON_REPLACE() function executed with an error on Spider SE.
      This patch fixes the problem, and it also fixes the MDEV-24541.
      
      The problem is that Item_func_json_insert::func_name() returns
      the wrong function name "json_update". 
      The Spider SE reconstructs a query based on the return value
      in some cases. Thus, if the return value is wrong, the Spider SE
      may generate a wrong query.
      fa6eaead
  8. 03 Aug, 2021 1 commit
    • Sergei Golubchik's avatar
      cleanup: specifying plugin dependencies in CMakeLists.txt · 175c9fe1
      Sergei Golubchik authored
      1. rename option DEPENDENCIES in MYSQL_ADD_PLUGIN() to DEPENDS
         to be consistent with other cmake commands and macros
      
      2. use this DEPENDS option in plugins
      
      3. add dependencies to the plugin embedded target too
      
      4. plugins don't need to add GenError dependency explicitly,
         all plugins depend on it automatically
      175c9fe1
  9. 02 Aug, 2021 3 commits
  10. 31 Jul, 2021 1 commit
    • Sergei Golubchik's avatar
      MDEV-23752 SHOW EXPLAIN FOR thd waits for sleep · 2cdf8a93
      Sergei Golubchik authored
      fix main.processlist_notembedded test
      
      * before EXPLAINing `select sleep` wait for select to start
        (fixes "Target is not running an EXPLAINable command")
      * after killing sleep, wait for it to die
        (fixes test failures on --repeat when old sleep shows on a test rerun)
      
      * unify with 10.3, copy minor changes from there
        (`--echo End of 5.5` vs `--echo # End of 5.5`, etc)
      2cdf8a93
  11. 29 Jul, 2021 4 commits
    • Oleksandr Byelkin's avatar
    • Oleksandr Byelkin's avatar
      Merge branch '10.2' into 10.3 · 83d7e4fa
      Oleksandr Byelkin authored
      83d7e4fa
    • Nikita Malyavin's avatar
      MDEV-20154 Assertion `len <= col->len | ...` failed in row_merge_buf_add · 22709897
      Nikita Malyavin authored
      len was containing garbage, since vctempl->mysql_col_offset was
      containing old value while calling row_mysql_store_col_in_innobase_format
      from innobase_get_computed_value().
      
      It was not updated after the first ALTER TABLE call, because it's INPLACE
      logic considered there's nothing to update, and exited immediately from
      ha_innobase::inplace_alter_table().
      
      However, vcol metadata needs an update, since vcols structure is changed
      in mysql record.
      
      The regression was introduced by 12614af1. There, refcount==1 condition
      was removed, which turned out to be crucial, though racy. The idea was to
      update vc_templ after each (sequencing) ALTER TABLE.
      
      We should do the same another way, and there may be a plenty of solutions,
      but the simplest one is to add a following condition:
        if vcol structure is changed, drop vc_templ; it will be recreated on next
        ha_innobase::open() call.
      
      in prepare_inplace_alter_table. It is safe, since innodb inplace changes
      require at least HA_ALTER_INPLACE_SHARED_LOCK_AFTER_PREPARE, which
      guarantee MDL_EXCLUSIVE on this stage.
      
      alter_templ_needs_rebuild() also has to track the columns not indexed, to
      keep vc_templ correct.
      
      Note that vc_templ is always kept constructed and available after
      ha_innobase::open() call, even on INSERT, though no virtual columns are
      evaluated during that statement
      inside innodb.
      
      In the test case suplied, it will be recreated on the second ALTER TABLE.
      22709897
    • Marko Mäkelä's avatar
      Cleanup: Remove redundant conditions · 0e8981ef
      Marko Mäkelä authored
      ha_innobase::prepare_inplace_alter_table(): Remove always-true conditions.
      Near the start of the function, we would already have returned if
      no ALTER TABLE operation flags were set that would require special
      action from InnoDB.
      
      It turns out that the conditions were redundant already when they were
      introduced in mysql/mysql-server@241387a2b6b61fb8a4f78dc4ad0aaa289400c694
      and in commit 068c6197.
      
      Thanks to Nikita Malyavin for noticing this.
      0e8981ef
  12. 28 Jul, 2021 6 commits
  13. 27 Jul, 2021 4 commits