summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge branch 10.4 into 10.5"bb-10.4-jan-fixJan Lindström2023-01-155267-506276/+433635
| | | | | This reverts commit 179c2833721292a918280b7d114d94d81020105b, reversing changes made to a44d896f98f2d2a3ebf0f1393bf84fd659ecd225.
* 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.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.
| | * MDEV-30342 Wrong "Truncated incorrect DECIMAL value" warning/errorDaniel Black2023-01-096-8/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | regression from MDEV-29540 / 8c389393695. INSERT SELECT errors needed to be unconditionally ignored. As this touches the CREATE .. SELECT functionality, show the equalivent test there.
| | * MDEV-17093: SOURCE_REVISION in log (postfix - not in help)Daniel Black2023-01-081-2/+3
| | | | | | | | | | | | Don't display the source revision in the mysqld --help output.
| | * MDEV-27624 Wrong result for nested left join using not_exists optimizationIgor Babaev2023-01-064-6/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * MDEV-17093: SOURCE_REVISION in log and handle_fatal_signalHaidong Ji2023-01-062-16/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * fix typoslilinjie2023-01-056-7/+7
| | | | | | | | | | | | Signed-off-by: lilinjie <lilinjie@uniontech.com>
| | * MDEV-30329: mariadb-service-convert resets systemd service to default User=rootAndrew Hutchings2023-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| | * MDEV-29988 group by fixSergei Golubchik2023-01-023-5/+23
| | |
| | * fixes for json.json_table and main.func_json in --psSergei Golubchik2023-01-021-1/+2
| | |
| | * MDEV-29988: (spider fix) Major performance regression with 10.6.11Oleksandr Byelkin2023-01-021-0/+6
| | | | | | | | | | | | Make Item_direct_ref_to_item transparent for Spider
| | * MDEV-29988: Major performance regression with 10.6.11Dmitry Shulga2023-01-026-18/+215
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The idea is to put Item_direct_ref_to_item as a transparent and permanent wrapper before a string which require conversion. So that Item_direct_ref_to_item would be the only place where the pointer to the string item is stored, this pointer can be changed and restored during PS execution as needed. And if any permanent (subquery) optimization would need a pointer to the item, it'll use a pointer to the Item_direct_ref_to_item - which is a permanent item and won't go away.
| | * MDEV-29988: (revert) Major performance regression with 10.6.11Dmitry Shulga2023-01-021-11/+2
| | | | | | | | | | | | | | | | | | Reverted changed in server code introduced by the commit bd9274faa469cc164099c7497c18a0e0a9b1184b. Tests from this commit are retained.
| * | MDEV-17869 AddressSanitizer: use-after-poison in ↵Sergei Golubchik2023-01-098-24/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Item_change_list::rollback_item_tree_changes it's incorrect to use change_item_tree() to replace arguments of top-level AND/OR, because they (arguments) are stored in a List, so a pointer to an argument is in the list_node, and individual list_node's of top-level AND/OR can be deleted in Item_cond::build_equal_items(). In that case rollback_item_tree_changes() will modify the deleted object. Luckily, it's not needed to use change_item_tree() for top-level AND/OR, because the whole top-level item is copied and preserved in prep_where and prep_on, and restored from there. So, just don't. Additionally to the test case in the commit it fixes * ASAN failure of main.opt_tvc --ps * ASAN failure of main.having_cond_pushdown --ps
| * | cleanupSergei Golubchik2023-01-092-12/+10
| | | | | | | | | | | | remove casts. uchar can store 1/0 as good as bool.
| * | don't set default value in temp table if NO_DEFAULT_VALUE_FLAGSergei Golubchik2023-01-094-6/+42
| | | | | | | | | | | | | | | | | | when an internal temporary table field is created from a real field, a new temp field should only copy a default from the source field when the latter has it
| * | MDEV-29890 Update with inner join false row count resultSergei Golubchik2023-01-093-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | when creating a temp table field from an actual table field, these two fields are supposed to be mostly identical (except for BIT field storage), in particular, temp field should have the same default as the orig field, even if the sql_mode has been changed meanwhile (e.g. to include NO_ZERO_DATE)
| * | cleanupSergei Golubchik2023-01-097-20/+15
| | | | | | | | | | | | | | | Helper class to swicth to relaxed checks during field copy. Temporarily.
| * | disable hanging galera testSergei Golubchik2023-01-091-0/+1
| | |
| * | galera.galera_wsrep_new_cluster: fix bad mergeSergei Golubchik2023-01-092-36/+0
| | |
| * | MDEV-19160 JSON_DETAILED output unnecessarily verboseWeijun-H2023-01-058-279/+327
| | |
* | | MDEV-30373 Wrong result with range accessMonty2023-01-116-4/+56
| | | | | | | | | | | | | | | | | | | | | | | | This issue was caused by the bug fix for MDEV-30325 Wrong result upon range query using index condition The bug could happen in the case of several overlapping key ranges with OR
* | | MDEV-30179 mariabackup --backup fails with FATAL ERROR: ... failedThirunarayanan Balathandayuthapani2023-01-105-8/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to copy datafile - Mariabackup fails to copy the undo log tablespace when it undergoes truncation. So Mariabackup should detect the redo log which does undo tablespace truncation and also backup should read the minimum file size of the tablespace and ignore the error while reading. - Throw error when innodb undo tablespace read failed, but backup doesn't find the redo log for undo tablespace truncation
* | | MDEV-30344: Without wsrep needs wsrep{,_on}.h headersDaniel Black2023-01-062-3/+1
| | | | | | | | | | | | | | | In the Develop package because of their use from sql_class.h which is the main file for THD needed by server plugins.
* | | Fix synopses in mysys APIsAlexander Kuleshov2023-01-064-3/+7
| | | | | | | | | | | | | | | | | | Since 7c58e97 the PSI_memory_key was added to some routines in the mysys/. This commit fixes synopses of functions that were updated with the PSI_memory_key parameter.
* | | MDEV-30325 Wrong result upon range query using index condition wrong result ↵Monty2023-01-053-4/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | upon range query using index condition This was caused by a bug in key_or() when SEL_ARG* key1 has been cloned and is overlapping with SEL_ARG *key2 Cloning of SEL_ARG's happens only in very special cases, which is why this bug has remained undetected for years. It happend in the following query: SELECT COUNT(*) FROM lineitem force index (i_l_orderkey_quantity,i_l_shipdate) WHERE l_shipdate < '1994-01-01' AND l_orderkey < 800 OR l_quantity > 3 AND l_orderkey NOT IN ( 157, 1444 ); Because there are two different indexes that can be used and the code for IN causes a 'tree_or', which causes all SEL_ARG's to be cloned. Other things: - While checking the code, I found a bug in SEL_ARG::SEL_ARG(SEL_ARG &arg) - This was incrementing next_key_part->use_count as part of creating a copy of an existing SEL_ARG. This is however not enough as the 'reverse operation' when the copy is not needed is 'key2_cpy.increment_use_count(-1)', which does something completely different. Fixed by calling increment_use_count(1) in SEL_ARG::SEL_ARG.
* | | MDEV-30344 MTR tests fail when built without WSREPRobin Newhouse2023-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building with -DWITH_WSREP=OFF, files required for MTR tests are excluded and several tests fail. This is cause by a recent commit 7b44d0ba which attempted to resolve MDEV-23230. Even when building without WSREP/Galera support some of the MTR include files named *wsrep* are required by other tests. Removing the following from the CMake install macros will avoid excluding the MTR test .inc files: `|include/((w.*)?wsrep.*|.*galera.*)\\.inc` 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.