1. 20 Jan, 2023 4 commits
    • Vicențiu Ciorbaru's avatar
      Fix connect bson.cpp warning · 00150ff8
      Vicențiu Ciorbaru authored
      The ptyp variable is unused.
      00150ff8
    • Vicențiu Ciorbaru's avatar
      Fix mroonga warning of use-after-free · 244bf37c
      Vicențiu Ciorbaru authored
      244bf37c
    • Mikhail Chalov's avatar
      Minimize unsafe C functions usage - replace strcat() and strcpy() (and... · 567b6812
      Mikhail Chalov authored
      Minimize unsafe C functions usage - replace strcat() and strcpy() (and strncat() and strncpy()) with custom safe_strcat() and safe_strcpy() functions
      
      The MariaDB code base uses strcat() and strcpy() in several
      places. These are known to have memory safety issues and their usage is
      discouraged. Common security scanners like Flawfinder flags them. In MariaDB we
      should start using modern and safer variants on these functions.
      
      This is similar to memory issues fixes in 19af1890
      and 9de9f105 but now replace use of strcat()
      and strcpy() with safer options strncat() and strncpy().
      
      However, add '\0' forcefully to make sure the result string is correct since
      for these two functions it is not guaranteed what new string will be null-terminated.
      
      Example:
      
          size_t dest_len = sizeof(g->Message);
          strncpy(g->Message, "Null json tree", dest_len); strncat(g->Message, ":",
          sizeof(g->Message) - strlen(g->Message)); size_t wrote_sz = strlen(g->Message);
          size_t cur_len = wrote_sz >= dest_len ? dest_len - 1 : wrote_sz;
          g->Message[cur_len] = '\0';
      
      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
      
      -- Reviewer and co-author Vicențiu Ciorbaru <vicentiu@mariadb.org>
      -- Reviewer additions:
      * The initial function implementation was flawed. Replaced with a simpler
        and also correct version.
      * Simplified code by making use of snprintf instead of chaining strcat.
      * Simplified code by removing dynamic string construction in the first
        place and using static strings if possible. See connect storage engine
        changes.
      567b6812
    • Igor Babaev's avatar
      MDEV-30052 Crash with a query containing nested WINDOW clauses · ea270178
      Igor Babaev authored
      Use SELECT_LEX to save lists for ORDER BY and GROUP BY before parsing
      WINDOW clauses / specifications. This is needed for proper parsing
      of a nested WINDOW clause when a WINDOW clause is used in a subquery
      contained in another WINDOW clause.
      
      Fix assignment of empty SQL_I_List to another one (in case of empty list
      next shoud point on first).
      ea270178
  2. 19 Jan, 2023 2 commits
  3. 17 Jan, 2023 1 commit
    • Marko Mäkelä's avatar
      MDEV-30422 Merge new release of InnoDB 5.7.41 to 10.3 · 489b5569
      Marko Mäkelä authored
      MySQL 5.7.41 includes one InnoDB change
      mysql/mysql-server@d2d6b2dd00f709bc528386009150d4bc726e25a0
      that seems to be applicable to MariaDB Server 10.3 and 10.4.
      Even though commit 5b9ee8d8
      seems to have fixed sporadic failures on our CI systems, it is
      theoretically possible that another race condition remained.
      
      buf_flush_page_cleaner_coordinator(): In the final loop,
      wait also for buf_get_n_pending_read_ios() to reach 0.
      In this way, if a secondary index leaf page was read into the
      buffer pool and ibuf_merge_or_delete_for_page() modified that
      page or some change buffer pages, the flush loop would execute
      until the buffer pool really is in a clean state.
      
      This potential data corruption bug does not affect MariaDB Server 10.5
      or later, thanks to commit b42294bc
      which removed change buffer merges that are not explicitly requested.
      489b5569
  4. 16 Jan, 2023 1 commit
  5. 12 Jan, 2023 2 commits
  6. 11 Jan, 2023 6 commits
    • Brandon Nesterenko's avatar
      MDEV-25277: mysqlbinlog --verbose cannot read row events with compressed... · b194c83b
      Brandon Nesterenko authored
      MDEV-25277: mysqlbinlog --verbose cannot read row events with compressed columns: Don't know how to handle column type: 140
      
      Problem:
      =======
      Mysqlbinlog cannot show the type of a compressed
      column when two levels of verbosity is provided.
      
      Solution:
      ========
      Extend the log event printing logic to handle and
      tag compressed types.
      
      Behavioral Changes:
      ==================
        Old: When mysqlbinlog is called in verbose mode and
      the database uses compressed columns, an error is
      returned to the user.
      
        New: The output will append “ COMPRESSED” on the
      type of compressed columns
      
      Reviewed By
      ===========
      Andrei Elkin <andrei.elkin@mariadb.com>
      b194c83b
    • Julius Goryavsky's avatar
      MDEV-30220: rsync SST completely ignores aria-log-dir-path · 53c4be7b
      Julius Goryavsky authored
      This commit adds support for the --aria-log-dir-path
      option on the command line and for the aria-log-dir-path
      option in the configuration file to the SST scripts, since
      before this change these parameters were completely ignored
      during SST - SST scripts assumed that aria logs files are
      always located in the same directory as logs for innodb.
      
      Tests for this change will be added as a separate commit,
      along with tests for MDEV-30157 and MDEV-28669.
      53c4be7b
    • Julius Goryavsky's avatar
      MDEV-30157: Galera SST doesn't properly handle undo* files from innodb · b84f3fa7
      Julius Goryavsky authored
      This fix adds separate handling for "undo*" files that contain undo
      logs as part of innodb files and adds a filter for undo* to the main
      filter used when initially transferring files with rsync.
      b84f3fa7
    • Julius Goryavsky's avatar
      pre-MDEV-30157 & pre-MDEV-28669: fixes before the main corrections · e4a4aad7
      Julius Goryavsky authored
      This commit adds even more correct handling of parameters
      with paths when they contain leading or trailing spaces and/or
      slashes. Also it fixes problems that occur when the user specified
      explicit paths to additional directories, but these paths match
      the specified path of the data directory - in this case, additional
      subdirectories should be treated (in relation to the data directory)
      in the same way as if these paths were not specified or as if they
      are implicitly specified as "." or "./". But prior to this fix,
      existing code treated any values as if they were completely
      separate directories, whether or not they actually point to the
      same location to which datadir points to - and this sometimes
      resulted in incorrect file transfers.
      
      This fix does not contain separate tests, as tests will be
      part of the main commit(s). This fix has been made as a separate
      commit to facilitate review for major substantive fixes related
      to MDEV-30157 and MDEV-28669.
      e4a4aad7
    • Sergei Petrunia's avatar
      MDEV-28602 Wrong result with outer join, merged derived table and view · b928c849
      Sergei Petrunia authored
      (Variant 3, initial variant was by Rex Jonston)
      
      A LEFT JOIN with a constant as a column of the inner table produced wrong
      query result if the optimizer had to write the inner table column into a
      temp table. Query pattern:
      
        SELECT ...
        FROM (SELECT /*non-mergeable select*/
              FROM t1 LEFT JOIN (SELECT 'Y' as Val) t2 ON ...) as tbl
      
      Fixed this by adding Item_direct_view_ref::save_in_field() which follows
      the pattern of Item_direct_view_ref's save_org_in_field(),
      save_in_result_field() and val_XXX() functions:
      * call check_null_ref() and handle NULL value
      * if we didn't get a NULL-complemented row, call Item_direct_ref's function.
      b928c849
    • Marko Mäkelä's avatar
      Remove an unused parameter · b218dfea
      Marko Mäkelä authored
      lock_rec_has_to_wait(): Remove the unused parameter for_locking
      that had been originally added
      in commit df4dd593
      b218dfea
  7. 10 Jan, 2023 1 commit
    • Daniel Black's avatar
      clang15 warnings - unused vars and old prototypes · 56948ee5
      Daniel Black authored
      clang15 finally errors on old prototype definations.
      
      Its also a lot fussier about variables that aren't used
      as is the case a number of time with loop counters that
      aren't examined.
      
      RocksDB was complaining that its get_range function was
      declared without the array length in ha_rocksdb.h. While
      a constant is used rather than trying to import the
      Rdb_key_def::INDEX_NUMBER_SIZE header (was causing a lot of
      errors on the defination of other orders). If the constant
      does change can be assured that the same compile warnings will
      tell us of the error.
      
      The ha_rocksdb::index_read_map_impl DBUG_EXECUTE_IF was similar
      to the existing endless functions used in replication tests.
      Its rather moot point as the rocksdb.force_shutdown test that
      uses myrocks_busy_loop_on_row_read is currently disabled.
      56948ee5
  8. 09 Jan, 2023 1 commit
  9. 07 Jan, 2023 1 commit
  10. 06 Jan, 2023 2 commits
    • Igor Babaev's avatar
      MDEV-27624 Wrong result for nested left join using not_exists optimization · b21832ef
      Igor Babaev authored
      This bug affected queries with nested left joins having the same last inner
      table such that not_exists optimization could be applied to the most inner
      outer join when optimizer chose to use join buffers. The bug could lead to
      producing wrong a result set.
      If the WHERE condition a query contains a conjunctive IS NULL predicate
      over a non-nullable column of an inner table of a not nested outer join
      then not_exists optimization can be applied to tho the outer join. With
      this optimization when looking for matches for a certain record from the
      outer table of the join the records of the inner table can be ignored
      right after the first match satisfying the ON condition is found.
      In the case of nested outer joins having the same last inner table this
      optimization still can be applied but only if all ON conditions of the
      embedding outer joins are satisfied. Such check was missing in the code
      that tried to apply not_exists optimization when join buffers were used
      for outer join operations.
      This problem has been already fixed in the patch for bug MDEV-7992. Yet
      there it was resolved only for the cases when join buffers were not used
      for outer joins.
      
      Approved by Oleksandr Byelkin <sanja@mariadb.com>
      b21832ef
    • Haidong Ji's avatar
      MDEV-17093: SOURCE_REVISION in log and handle_fatal_signal · af0ff8b4
      Haidong Ji authored
      MariaDB MDEV-12583 added `SOURCE_REVISION` variable that exposes the
      SHA1 of source code commit that the current running engine was built
      from. This info is useful for troubleshooting and debugging.
      
      This commit does the following:
      - addes the `SOURCE_REVISION` value into engine error log.
      - when a crash triggers handle_fatal_signal, the `SOURCE_REVISION` will
        be included in crash report.
      - resolves MDEV-20344: startup messages belong in stderr/error-log not
        stdout
      
      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.
      af0ff8b4
  11. 04 Jan, 2023 1 commit
  12. 03 Jan, 2023 1 commit
    • Andrew Hutchings's avatar
      MDEV-30329: mariadb-service-convert resets systemd service to default User=root · e51a1d6f
      Andrew Hutchings authored
      If mariadb-service-convert is run and the user variable is unset then
      this sets `User=` in `[Service]`, which then tries to run mariadb as
      root, which in-turn fails. This only happens when mysqld_safe is missing
      which is all the time now. So don't set `User=` if there is no user variable.
      
      Reviewer: Sergei Golubchik <serg@mariadb.org> (in PR #2382)
      e51a1d6f
  13. 01 Jan, 2023 10 commits
  14. 27 Dec, 2022 1 commit
  15. 26 Dec, 2022 4 commits
    • Marko Mäkelä's avatar
      MDEV-25004 Refactorings · 72e2d1d2
      Marko Mäkelä authored
        * Avoid some pessimization
        * Slightly smaller upgrade dataset
        * Simplify vers_row_same_trx() and its caller
      72e2d1d2
    • Aleksey Midenkov's avatar
      MDEV-25004 Missing row in FTS_DOC_ID_INDEX during DELETE HISTORY · e056efdd
      Aleksey Midenkov authored
      1. In case of system-versioned table add row_end into FTS_DOC_ID index
         in fts_create_common_tables() and innobase_create_key_defs().
         fts_n_uniq() returns 1 or 2 depending on whether the table is
         system-versioned.
      
         After this patch recreate of FTS_DOC_ID index is required for
         existing system-versioned tables. If you see this message in error
         log or server warnings: "InnoDB: Table db/t1 contains 2 indexes
         inside InnoDB, which is different from the number of indexes 1
         defined in the MariaDB" use this command to fix the table:
      
            ALTER TABLE db.t1 FORCE;
      
      2. Fix duplicate history for secondary unique index like it was done
         in MDEV-23644 for clustered index (932ec586). In case of
         existing history row which conflicts with currently inseted row we
         check in row_ins_scan_sec_index_for_duplicate() whether that row
         was inserted as part of current transaction. In that case we
         indicate with DB_FOREIGN_DUPLICATE_KEY that new history row is not
         needed and should be silently skipped.
      
      3. Some parts of MDEV-21138 (7410ff43) reverted. Skipping of
         FTS_DOC_ID index for history rows made problems with purge
         system. Now this is fixed differently by p.2.
      
      4. wait_all_purged.inc checks that we didn't affect non-history rows
         so they are deleted and purged correctly.
      
      Additional FTS fixes
      
        fts_init_get_doc_id(): exclude history rows from max_doc_id
        calculation. fts_init_get_doc_id() callback is used only for crash
        recovery.
      
        fts_add_doc_by_id(): set max value for row_end field.
      
        fts_read_stopword(): stopwords table can be system-versioned too. We
        now read stopwords only for current data.
      
        row_insert_for_mysql(): exclude history rows from doc_id validation.
      
        row_merge_read_clustered_index(): exclude history_rows from doc_id
        processing.
      
        fts_load_user_stopword(): for versioned table retrieve row_end field
        and skip history rows. For non-versioned table we retrieve 'value'
        field twice (just for uniformity).
      
      FTS tests for System Versioning now include maybe_versioning.inc which
      adds 3 combinations:
      
      'vers'     for debug build sets sysvers_force and
      	   sysvers_hide. sysvers_force makes every created table
      	   system-versioned, sysvers_hide hides WITH SYSTEM VERSIONING
      	   for SHOW CREATE.
      
      	   Note: basic.test, stopword.test and versioning.test do not
      	   require debug for 'vers' combination. This is controlled by
      	   $modify_create_table in maybe_versioning.inc and these
      	   tests run WITH SYSTEM VERSIONING explicitly which allows to
      	   test 'vers' combination on non-debug builds.
      
      'vers_trx' like 'vers' sets sysvers_force_trx and sysvers_hide. That
      	   tests FTS with trx_id-based System Versioning.
      
      'orig' 	   works like before: no System Versioning is added, no debug is
      	   required.
      
      Upgrade/downgrade test for System Versioning is done by
      innodb_fts.versioning. It has 2 combinations:
      
      'prepare' makes binaries in std_data (requires old server and OLD_BINDIR).
      	  It tests upgrade/downgrade against old server as well.
      
      'upgrade' tests upgrade against binaries in std_data.
      
      Cleanups:
      
      Removed innodb-fts-stopword.test as it duplicates stopword.test
      e056efdd
    • Aleksey Midenkov's avatar
      MDEV-25004 restart_bindir option to restart server from different location · 68c437ba
      Aleksey Midenkov authored
      Adds new parameter $restart_bindir for restart_mysqld.inc.
      
      Example:
      
      let $restart_bindir= /home/midenok/src/mariadb/10.3b/build;
      --source include/restart_mysqld.inc
      
      It is good to return back original server before check_mysqld will be
      run at the test end:
      
      let $restart_bindir=;
      --source include/restart_mysqld.inc
      68c437ba
    • Aleksey Midenkov's avatar
      MDEV-25004 vers_force_trx option to force transactional System Versioning · 5d506ac2
      Aleksey Midenkov authored
      Works like vers_force but forces trx_id-based system-versioned tables
      if the storage supports it (currently InnoDB-only). Otherwise creates
      timestamp-based system-versioned table.
      5d506ac2
  16. 21 Dec, 2022 1 commit
  17. 20 Dec, 2022 1 commit
    • Vlad Lesin's avatar
      MDEV-30225 RR isolation violation with locking unique search · 3ddc00dc
      Vlad Lesin authored
      Before the fix next-key lock was requested only if a record was
      delete-marked for locking unique search in RR isolation level.
      There can be several delete-marked records for the same unique key,
      that's why InnoDB scans the records until eighter non-delete-marked record
      is reached or all delete-marked records with the same unique key are
      scanned.
      
      For range scan next-key locks are used for RR to protect scanned range from
      inserting new records by other transactions. And this is the reason of why
      next-key locks are used for delete-marked records for unique searches.
      
      If a record is not delete-marked, the requested lock type was "not-gap".
      When a record is not delete-marked during lock request by trx 1, and
      some other transaction holds conflicting lock, trx 1 creates waiting
      not-gap lock on the record and suspends. During trx 1 suspending the
      record can be delete-marked. And when the lock is granted on conflicting
      transaction commit or rollback, its type is still "not-gap". So we have
      "not-gap" lock on delete-marked record for RR. And this let some other
      transaction to insert some record with the same unique key when trx 1 is
      not committed, what can cause isolation level violation.
      
      The fix is to set next-key locks for both delete-marked and
      non-delete-marked records for unique search in RR.
      3ddc00dc