summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-30370 MDEV-22979 MDEV-29904 MDEV-27912 Spider hang when abortbb-10.8-mdev-30370-compare-testsYuchen Pei2023-01-247-5/+36
| | | | | | | | | This is Kentoku's fix for MDEV-22979 (e6e41f04f4e + 22a0097727f), which also fixes 30370. Adding a test for MDEV-29904 to avoid regression, given MDEV-27233 is a similar problem. Also update restart_spider.inc to allow passing restart_parameters, so that the test of MDEV-29904 works (MDEV-27912).
* Update 10.8 HELP tablesIan Gilfillan2023-01-241-942/+943
|
* Merge branch '10.7' into 10.8Oleksandr Byelkin2023-01-1853-128/+791
|\
| * Merge branch '10.6' into 10.7Oleksandr Byelkin2023-01-1846-112/+738
| |\
| | * Merge branch '10.5' into 10.6Oleksandr Byelkin2023-01-186-3/+29
| | |\
| | | * new PCRE2 10.42Oleksandr Byelkin2023-01-181-2/+2
| | | |
| | | * Merge branch '10.4' into 10.5Oleksandr Byelkin2023-01-182-0/+2
| | | |\
| | | | * v5.5.4-stableOleksandr Byelkin2023-01-172-0/+2
| | | | |
| | | * | MDEV-26392: Crash with json_get_path_next and 10.5.12Rucha Deodhar2023-01-183-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Analysis: When we skip level when path is found, it changes the state of the json engine. This breaks the sequence for json_get_path_next() which is called at the end to ensure json document is valid and leads to crash. Fix: Use json_scan_next() at the end to check if json document has correct syntax (is valid).
| | * | | Merge 10.5 into 10.6Marko Mäkelä2023-01-1741-109/+709
| | |\ \ \ | | | |/ /
| | | * | Merge 10.4 into 10.5Marko Mäkelä2023-01-172-2/+0
| | | |\ \ | | | | |/
| | | | * Merge 10.3 into 10.4Marko Mäkelä2023-01-172-4/+11
| | | | |\
| | | | | * MDEV-30422 Merge new release of InnoDB 5.7.41 to 10.3Marko Mäkelä2023-01-171-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 5b9ee8d8193a8c7a8ebdd35eedcadc3ae78e7fc1 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 b42294bc6409794bdbd2051b32fa079d81cea61d which removed change buffer merges that are not explicitly requested.
| | | | | * New CC 3.1Oleksandr Byelkin2023-01-161-0/+0
| | | | | |
| | | | * | Update sponsorsDaniel Black2023-01-161-2/+0
| | | | | |
| | | * | | fix failures of main.func_json --psSergei Golubchik2023-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in normal execution, the item is wrapped in Item_func_conv_charset. in --ps the whole is wrapped again in Item_direct_ref_to_item
| | | * | | cleanup: const_Item->real_item()Sergei Golubchik2023-01-172-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allow real_item() to be called for const Item*, remove casts in the code
| | | * | | ADD CONSTRAINT IF NOT EXISTS didn't work in SPSergei Golubchik2023-01-175-5/+54
| | | | | | | | | | | | | | | | | | | | | | | | "if not exists" must be stored in a separate read-only property
| | | * | | MDEV-22602 Disable UPDATE CASCADE for SQL constraintsSergei Golubchik2023-01-173-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | fix it for named constraints too
| | | * | | Stabilize testsJan Lindström2023-01-175-37/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | galera_gcache_recover and galera_gcache_recover_manytrx grepping on error log is not always successful as messages might be in different order or contain different values galera_vote_sr We need to make sure required table creation has replicated as we use WSREP_ON=off
| | | * | | MDEV-29171 changing the value of wsrep_gtid_domain_id with full cluster ↵Daniele Sciascia2023-01-174-1/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | restart fails on some nodes Fix `wsrep_init_gtid()` to avoid overwriting the domain id received during state transfer. Reviewed-by: Jan Lindström <jan.lindstrom@mariadb.com>
| | | * | | Merge branch 10.4 into 10.5Jan Lindström2023-01-1412-50/+380
| | | |\ \ \ | | | | |/ /
| | | | * | 10.4-MDEV-29684 Fixes for cluster wide write conflict resolvingsjaakola2023-01-143-22/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If two high priority threads have lock conflict, we look at the order of these transactions and honor the earlier transaction. for_locking parameter in lock_rec_has_to_wait() has become obsolete and it is now removed from the code . Reviewed-by: Jan Lindström <jan.lindstrom@mariadb.com>
| | | | * | 10.4-MDEV-29684 Fixes for cluster wide write conflict resolvingsjaakola2023-01-131-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rather recent thd_need_ordering_with() function does not take high priority transactions' order in consideration. Chaged this funtion to compare also transaction seqnos and favor earlier transaction. Reviewed-by: Jan Lindström <jan.lindstrom@mariadb.com>
| | | | * | MDEV-29512 deadlock between commit monitor and THD::LOCK_thd_data mutexsjaakola2023-01-133-0/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit contains only a mtr test for reproducing the issue in MDEV-29512 The actual fix will be pushed in wsrep-lib repository The hanging in MDEV-29512 happens when binlog purging is attempted, and there is one local BF aborted transaction waiting for commit monitor. The test will launch two node cluster and enable binlogging with expire log days, to force binlog purging to happen. A local transaction is executed so that will become BF abort victim, and has advanced to replication stage waiting for commit monitor for final cleanup (to mark position in innodb) after that, applier is released to complete the BF abort and due to binlog configuration, starting the binlog purging. This is where the hanging would occur, if code is buggy Reviewed-by: Jan Lindström <jan.lindstrom@mariadb.com>
| | | | * | MDEV-30317 Transaction savepoint may cause failure in galera replayingsjaakola2023-01-133-16/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created mtr test for reproducing the crash Developed actual fix for the issue. Setting THD::system_thread_info.rpl_sql_info for replayer thread, same way as it is handled for appliers. Recorded test result, with the fix Reviewed-by: Jan Lindström <jan.lindstrom@mariadb.com>
| | | | * | MDEV-29684 Fixes for cluster wide write conflict resolvingsjaakola2023-01-134-12/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cluster conflict victim's THD is marked with wsrep_aborter. THD::wsrep_aorter holds the thread ID of the hight priority tread, which is currently carrying out BF aborting for this victim. However, the BF abort operation is not always successful, and in such case the wsrep_aborter mark should be removed. In the old code, this wsrep_aborter resetting did not happen, and this could lead to a situation where the sticky wsrep_aborter mark prevents any further attempt to BF abort this transaction. This commit fixes this issue, and resets wsrep_aborter after unsuccesful BF abort attempt. Reviewed-by: Jan Lindström <jan.lindstrom@mariadb.com>
| | | * | | MDEV-30395 Wrong result with semijoin and Federated as outer tableMonty2023-01-136-7/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that federated engine does not support comparable rowids which was not taken into account by semijoin code. Fixed by checking that we don't use semijoin with tables that does not support comparable rowids. Other things: - Fixed some typos in the code comments
| | | * | | MDEV-30080 Wrong result with LEFT JOINs involving constant tablesMonty2023-01-133-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason things fails in 10.5 and above is that test_quick_select() returns -1 (impossible range) for empty tables if there are any conditions attached. This didn't happen in 10.4 as the cost for a range was more than for a table scan with 0 rows and get_key_scan_params() did not create any range plans and thus did not mark the range as impossible. The code that checked the 'impossible range' conditions did not take into account all cases of LEFT JOIN usage. Adding an extra check if the table is used with an ON condition in case of 'impossible range' fixes the issue.
| * | | | | Merge 10.6 into 10.7Jan Lindström2023-01-1710-16/+53
| |\ \ \ \ \ | | |/ / / /
| | * | | | MDEV-26391 BF abortable mariabackup executionsjaakola2023-01-1710-15/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit changes backup execution (namely the block ddl phase), so that node is not paused from cluster. Instead, the following backup execution is declared as vulnerable for possible cluster level conflicts, especially with DDL statement applying. With this, the mariabackup execution may be aborted, if DDL statements happen during backup execution. This abortable backup execution is optional feature and may be enabled/disabled by wsrep_mode: BF_ABORT_MARIABACKUP. Note that old style node desync and pause, despite of WSREP_MODE_BF_MARIABACKUP is needed if node is operating as SST donor. Reviewed-by: Jan Lindström <jan.lindstrom@mariadb.com>
* | | | | | Merge 10.7 into 10.8Marko Mäkelä2023-01-1386-656/+1859
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.6 into 10.7Marko Mäkelä2023-01-1385-634/+1854
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge 10.5 into 10.6Marko Mäkelä2023-01-1384-634/+1850
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge 10.4 into 10.5Marko Mäkelä2023-01-1381-602/+1810
| | | |\ \ \ | | | | |/ /
| | | | * | Merge 10.3 into 10.4Marko Mäkelä2023-01-1320-80/+688
| | | | |\ \ | | | | | |/
| | | | | * MDEV-30378 Versioned REPLACE succeeds with ON DELETE RESTRICT constraintNikita Malyavin2023-01-124-1/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | node->is_delete was incorrectly set to NO_DELETE for a set of operations. In general we shouldn't rely on sql_command and look for more abstract ways to control the behavior. trg_event_map seems to be a suitable way. To mind replica nodes, it is ORed with slave_fk_event_map, which stores trg_event_map when replica has triggers disabled.
| | | | | * fix typoslilinjie2023-01-125-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: lilinjie <lilinjie@uniontech.com>
| | | | | * MDEV-25277: mysqlbinlog --verbose cannot read row events with compressed ↵Brandon Nesterenko2023-01-113-5/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | | | | * MDEV-30220: rsync SST completely ignores aria-log-dir-pathJulius Goryavsky2023-01-113-8/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | | | * MDEV-30157: Galera SST doesn't properly handle undo* files from innodbJulius Goryavsky2023-01-111-5/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | | | * pre-MDEV-30157 & pre-MDEV-28669: fixes before the main correctionsJulius Goryavsky2023-01-113-51/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | | | * MDEV-28602 Wrong result with outer join, merged derived table and viewSergei Petrunia2023-01-114-0/+263
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (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.
| | | | | * Remove an unused parameterMarko Mäkelä2023-01-111-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lock_rec_has_to_wait(): Remove the unused parameter for_locking that had been originally added in commit df4dd593f29aec8e2116aec1775ad4b8833d8c93
| | | | * | MDEV-19160 json_pretty() alias for json_detailed()Weijun-H2023-01-123-0/+33
| | | | | |
| | | | * | fixup for MDEV-19160Rucha Deodhar2023-01-122-8/+7
| | | | | |
| | | | * | Fixed failing test main.func_jsonMonty2023-01-122-0/+2
| | | | | |
| | | | * | MDEV-30345 DML does not find rows it is supposed toMonty2023-01-113-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This only happens with 'timestamp_column IN (select ...) The reason was a missing assignment in Item_cache_timestamp::cache_value()
| | | | * | Merge branch '10.3' into 10.4Sergei Golubchik2023-01-1038-116/+524
| | | | |\ \ | | | | | |/
| | | | | * clang15 warnings - unused vars and old prototypesDaniel Black2023-01-109-41/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.