summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fix goto issuebb-10.6-nikita-MDEV-26229Nikita Malyavin2021-07-281-1/+1
|
* MDEV-20154 Assertion `len <= col->len | ...` failed in row_merge_buf_addNikita Malyavin2021-07-283-36/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 10.6 version 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 12614af1fe. 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.
* This commit is a fixup for MDEV-22189.Rucha Deodhar2021-07-269-24/+24
| | | | | Changes: changed mysqld -> mariadbd for some more error messages that were left.
* Cleanup: Remove a test hackMarko Mäkelä2021-07-263-8/+0
| | | | | | | | | | | Merge commit 2b6f8044903dc974c32e071bc6a7c4099481ae80 introduced the debug injection point dict_sys_mutex_avoid to make the test innodb.instant_alter_crash work even after the MDEV-23991 fix (commit afc9d00c66db946c8240fe1fa6b345a3a8b6fec1). Thanks to DDL being atomic and crash-safe in MariaDB 10.6 (mainly thanks to commit 7762ee5dbec5c336628c06bbe950837257276e57) we do not actually need this hack anymore.
* MDEV-26138 innodb_flush_log_at_trx_commit=3 doesn't flushMarko Mäkelä2021-07-231-2/+2
| | | | | | | | | | | | trx_flush_log_if_needed_low(): Do flush for both innodb_flush_log_at_trx_commit=1 and innodb_flush_log_at_trx_commit=3. This is the 10.6 version of 10.2 commit 5f8651ac238d8d6cd3e4a7e3090b4b529f990331 which fixed a regression that had been introduced in 2e814d4702d71a04388386a9f591d14a35980bfe (breaking 288eeb3a31e4bfb52180f3906a4d354ac9cc457e).
* Update libmariadbMarko Mäkelä2021-07-221-0/+0
|
* Merge 10.5 into 10.6Marko Mäkelä2021-07-222-1/+1
|\
| * mtr: aix test fix innodb.temporary_tableDaniel Black2021-07-221-0/+1
| | | | | | | | | | | | | | | | | | AIX error message didn't include the filename like: 2021-07-22 9:43:04 0 [ERROR] mariadbd: Can't create/write to file '' (Errcode: 20 "Not a directory") 2021-07-22 9:43:04 0 [ERROR] mariadbd: Can't create/write to file '' (Errcode: 20 "Not a directory") Reviewer: Marko
| * MDEV-26110 fixup: GCC 4.8.5 -Wtype-limitsMarko Mäkelä2021-07-221-1/+0
| | | | | | | | | | | | row_ins_index_entry_set_vals(): Remove an assertion that trivially holds because the 16-bit dict_col_t::len cannot represent the value UNIV_PAGE_SIZE_MAX.
* | MDEV-26210: Disable mariabackup.log_page_corruptionMarko Mäkelä2021-07-221-0/+1
| | | | | | | | | | | | | | | | MDEV-26193 exposed a race condition in the test mariabackup.log_page_corruption by no longer waking up purge tasks on every transaction commit. (Note that there never was a guarantee that the purge tasks would actually run as quickly as the test expected it to happen; that would depend on the CPU load.)
* | MDEV-26193: Wake up purge less oftenMarko Mäkelä2021-07-223-84/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with commit 6e12ebd4a748eba738e08ad1d7f5dec782ff63ee (MDEV-25062), srv_wake_purge_thread_if_not_active() became more expensive operation, especially on NUMA systems, because instead of reading an atomic global variable trx_sys.rseg_history_len we are traversing up to 128 cache lines in trx_sys.history_exists(). trx_t::commit_cleanup(): Do not wake up purge at all. We will wake up purge about once per second in srv_master_callback(). srv_master_do_active_tasks(), srv_master_do_idle_tasks(): Move some duplicated code to srv_master_callback(). srv_master_callback(): Invoke purge_coordinator_timer_callback() to ensure that purge will be periodically woken up, even if the latest execution of trx_t::commit_cleanup() allowed the purge view to advance but did not wake up purge. Do not call log_free_check(), because every thread that is going to generate redo log is supposed to call that function anyway, before acquiring any page latches. Additional calls to the function every few seconds should not make any difference. srv_shutdown_threads(): Ensure that srv_shutdown_state can be at most SRV_SHUTDOWN_INITIATED in srv_master_callback(), by first invoking srv_master_timer.reset() before changing srv_shutdown_state. (Note: We first terminate the srv_master_callback and only then terminate the purge tasks. Thus, the purge subsystem should exist when srv_master_callback() invokes purge_coordinator_timer_callback() if it was initiated in the first place.
* | Merge 10.5 into 10.6Marko Mäkelä2021-07-2237-96/+123
|\ \ | |/
| * MDEV-26110: Do not rely on alignment on static allocationMarko Mäkelä2021-07-229-42/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is implementation-defined whether alignment requirements that are larger than std::max_align_t (typically 8 or 16 bytes) will be honored by the compiler and linker. It turns out that on IBM AIX, both alignas() and MY_ALIGNED() only guarantees alignment up to 16 bytes. For some data structures, specifying alignment to the CPU cache line size (typically 64 or 128 bytes) is a mere performance optimization, and we do not really care whether the requested alignment is guaranteed. But, for the correct operation of direct I/O, we do require that the buffers be aligned at a block size boundary. field_ref_zero: Define as a pointer, not an array. For innochecksum, we can make this point to unaligned memory; for anything else, we will allocate an aligned buffer from the heap. This buffer will be used for overwriting freed data pages when innodb_immediate_scrub_data_uncompressed=ON. And exactly that code hit an assertion failure on AIX, in the test innodb.innodb_scrub. log_sys.checkpoint_buf: Define as a pointer to aligned memory that is allocated from heap. log_t::file::write_header_durable(): Reuse log_sys.checkpoint_buf instead of trying to allocate an aligned buffer from the stack.
| * MDEV-26200 buf_pool.flush_list corrupted by buffer pool resizing or ↵Marko Mäkelä2021-07-223-26/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ROW_FORMAT=COMPRESSED The lazy deletion of clean blocks from buf_pool.flush_list that was introduced in commit 6441bc614a99f5cd6357c8a23b9f583c56d0a90c (MDEV-25113) introduced a race condition around the function buf_flush_relocate_on_flush_list(). The test innodb_zip.wl5522_debug_zip as well as the buffer pool resizing tests would occasionally fail in debug builds due to buf_pool.flush_list.count disagreeing with the actual length of the doubly-linked list. The safe procedure for relocating a block in buf_pool.flush_list should be as follows, now that we implement lazy deletion from buf_pool.flush_list: 1. Acquire buf_pool.mutex. 2. Acquire the exclusive buf_pool.page_hash.latch. 3. Acquire buf_pool.flush_list_mutex. 4. Copy the block descriptor. 5. Invoke buf_flush_relocate_on_flush_list(). 6. Release buf_pool.flush_list_mutex. buf_flush_relocate_on_flush_list(): Assert that buf_pool.flush_list_mutex is being held. Invoke buf_page_t::oldest_modification() only once, using std::memory_order_relaxed, now that the mutex protects us. buf_LRU_free_page(), buf_LRU_block_remove_hashed(): Avoid an unlock-lock cycle on hash_lock. (We must not acquire hash_lock while already holding buf_pool.flush_list_mutex, because that could lead to a deadlock due to latching order violation.)
| * Fix building crc32_arm64 on NetBSD/aarch64nia2021-07-221-4/+2
| | | | | | | | | | | | pmull_supported is not necessarily defined before crc32c_aarch64 Signed-off-by: Nia Alarie <nia@NetBSD.org>
| * mtr: aix - stack-trace is optionalDaniel Black2021-07-2224-24/+24
| |
| * debian/salsa: Show complete auth and plugin situtationDaniel Black2021-07-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | SHOW PLUGINS has a more complete view of the installed plugins into the server. The mysql.user is a compatibility view that doesn't show the complete authentication picture. Use global_priv. Add `show create user` for default users to more clearly represent its contents.
* | MDEV-26150: follow-up patch to add missing fill opt_trace,ps.rdiffDmitry Shulga2021-07-211-0/+92
| |
* | MDEV-26192: Sparse files are being created on thinly provisioned storageMarko Mäkelä2021-07-202-16/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In MDEV-26029 the intention was that page_compressed tables would be written as regular (non-sparse) files if the file is stored on a thinly provisioned block device. We were incorrectly requesting os_file_set_size() to create sparse files even on thinly provisioned storage. fil_space_extend_must_retry(): Extend the file in the correct fashion. fil_ibd_create(), recv_sys_t::recover_deferred(): Only create a sparse file for page_compressed tables if thin provisioning is not detected.
* | MDEV-24626 fixup: Remove useless codeMarko Mäkelä2021-07-206-138/+1
| | | | | | | | | | | | | | | | | | | | fil_ibd_create(): Remove code that should have been removed in commit 86dc7b4d4cfe15a2d37f8b5f60c4fce5dba9491d already. We no longer wrote an initialized page to the file, but we would still allocate a page image in memory and write it. xb_space_create_file(): Remove an unnecessary page write. (This is a functional change for Mariabackup.)
* | Update libmariadbMarko Mäkelä2021-07-201-0/+0
| |
* | MDEV-26166: non-functional changesMarko Mäkelä2021-07-202-7/+3
| |
* | Merge 10.5 into 10.6Marko Mäkelä2021-07-2013-17/+127
|\ \ | |/
| * Merge 10.4 into 10.5Marko Mäkelä2021-07-2011-10/+123
| |\
| | * MDEV-25236 fixup: instant_alter_debug,dynamic resultMarko Mäkelä2021-07-201-0/+6
| | | | | | | | | | | | | | | We only support the instantaneous removal of the NOT NULL attribute for ROW_FORMAT=REDUNDANT tables.
| | * MDEV-22221: MariaDB with WolfSSL doesn't support AES-GCM cipher for SSLSergei Golubchik2021-07-161-0/+3
| | | | | | | | | | | | | | | | | | commit the forgotten result file followup for b81803f0657
| | * fix perfschema.sizing_* tests to runSergei Golubchik2021-07-1614-93/+158
| | | | | | | | | | | | | | | still cannot be enabled permanently, but at least they could be run manually, if needed
| | * MDEV-26139 Spider crashes with segmentation fault (signal 11) on CREATE ↵Nayuta Yanagisawa2021-07-143-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TABLE when COMMENT does not contain embedded double quotes The root cause of the bug MDEV-26139 is the lack of NULL checking on the variable `dq`. Comments on if (dq && (!sq || sq > dq)) {...} else {...}: * The if block corresponds to the case where parameters are quoted by double quotes. In that case, a single quote doesn't appear at all or only appears in the middle of double quotes. * The else block corresponds to the case where parameters are quoted by single quotes. In that case, a double quote doesn't appear at all or only appears in the middle of single quotes. * If the program reaches the if-else statement, `sq || dq` holds. Thus, the negation of `dq && (!sq || sq > dq)` is equivalent to `sq && (!dq || sq <= dq)`.
| | * MDEV-26108 Crash with query referencing twice CTE that uses embedded ↵Igor Babaev2021-07-084-4/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recursive CTE This bug could affect queries that had at least two references to a CTE that used an embedded recursive CTE. Starting from version 10.4 some code in With_element::clone_parsed_spec() that assumed a certain order of selects after parsing the specification of a CTE became not valid anymore. It could lead to global select lists where some selects were missing. If a missing CTE happened to belong to the recursive part of a recursive CTE some recursive table references were not set as references to materialized derived tables and this caused a crash of the server. Approved by Oleksandr Byelkin <sanja@mariadb.com>
| | * MDEV-25978: minor post-merge fix for .result fileJulius Goryavsky2021-07-061-1/+0
| | |
| * | fix clang buildEugene Kosov2021-07-191-2/+1
| | |
| * | MDEV-26043: Fix performance_schema instrument "threadpool/group_mutex"zwang282021-07-191-4/+3
| | | | | | | | | | | | | | | The performance_schema data related to instrument "wait/synch/mutex/threadpool/group_mutex" was incorrect. The root cause is the group_mutex was initialized in thread_group_init before registerd in PSI_register(mutex). The fix is to put PSI_register before thread_group_init, which ensures the right order.
* | | MDEV-26181: The test compat/oracle.sp-row fails in case it is run in PS mode.Dmitry Shulga2021-07-192-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were several places where a statement delimiter missed so such statements were interpreted as multi-statements and expectedly failed in PS mode. An appropriate statement delimiters have been added to fix the issues. Addinitinally, the operators --enable_prepare_warnings/--disable_prepare_warnings have been added around statements that use depricated syntax SELECT INTO to don't miss warnings.
* | | MDEV-26149: The test main.fetch_first fails in case it is run in PS modeDmitry Shulga2021-07-193-16/+36
| | | | | | | | | | | | | | | | | | The root cause of test failure is that on optimization of the statement clause 'order by (select 1)' in outer select is done incorrect in case the statement run in PS mode.
* | | MDEV-19237 - Fix assertion in should_send_column_infoVladislav Vaintroub2021-07-161-1/+2
| | | | | | | | | | | | | | | | | | COM_STMT_BULK_EXECUTE, just like COM_STMT_EXECUTE can also skip result set metadata, if bulk is used with statement that returns result set, i.e INSERT/DELETE RETURNING.
* | | merge 10.5 to 10.6Vladislav Vaintroub2021-07-1635-49/+442
|\ \ \ | |/ /
| * | MDEV-26166 replace log_write_up_to(LSN_MAX,...) with log_buffer_flush_to_disk()Vladislav Vaintroub2021-07-168-17/+8
| | | | | | | | | | | | | | | Also, remove comparison lsn > flush/write lsn, prior to calling log_write_up_to. The checks and early returns are part of this function.
| * | MDEV-21916: COM_STMT_BULK_EXECUTE with RETURNING insert wrong valuesOleksandr Byelkin2021-07-1510-27/+282
| | | | | | | | | | | | | | | | | | | | | | | | The problem is that array binding uses net buffer to read parameters for each execution while each execiting with RETURNING write in the same buffer. Solution is to allocate new net buffer to avoid changing buffer we are reading from.
| * | Revert "MDEV-24248: my_print_defaults is not taking all the values when ↵Rucha Deodhar2021-07-153-49/+2
| | | | | | | | | | | | | | | | | | using -e" This reverts commit f88d130e710338607adf2517bef436de624c76b9.
| * | MDEV-24248: my_print_defaults is not taking all the values when using -eRucha Deodhar2021-07-123-2/+49
| | | | | | | | | | | | | | | | | | option which is called from mysql.server (extra_args). Fix: change mysql.server script to use --defaults-extra-file instead of -e
| * | MDEV-26106: [ERROR] InnoDB: Unlock row could not find a 2 mode lock on the ↵Sergei Petrunia2021-07-073-4/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | record Port the following patch from MySQL: commit 1b2e8ea269c80cb93cc79d8be934c40b1c58e947 Author: Kailasnath Nagarkar <kailasnath.nagarkar@oracle.com> Date: Fri Nov 30 16:43:13 2018 +0530 Bug #20939184: INNODB: UNLOCK ROW COULD NOT FIND A 2 MODE LOCK ON THE RECORD Issue: ------ Consdier tables t1 and t2 such that t1 has multiple rows and join condition for t1 left join t2 results in only single row from t2. In this case, access to table t2 is const since there is a single row that qualifies the join condition. However, while executing the query, attempt is made to unlock t2's row multiple times. The current algorithm to fetch rows approximates to: 1) Retrieve the row for t1. 2) Retrieve the row for t2. 3) Apply the join conditions. a) If condition evaluates to true: Project the row to the result. b) If condition evaluates to false: i) If t2's qep_tab->not_null_complement is true, unlock t2's row. ii) Null-complement the row by calling "evaluate_null_complemented_join_record()". In this function qep_tab->not_null_complement is set to false. The t2's only one row, that qualifies join condition, is unlocked in Step i) when t1's row is evaluated to false. When t1's next row is also evaluated to false, another attempt is made to unlock t2's already unlocked row. This results in following error being logged in error.log: "[ERROR] InnoDB: Unlock row could not find a 3 mode lock on the record. Current statement: select * from t1 left join t2 ......" Solution: --------- When a table's access method is "const", set record unlock method for this table to do no operation.
| * | mtr: aix disable mysqld--defaults-fileDaniel Black2021-07-061-0/+1
| | | | | | | | | | | | | | | AIX grep doesn't support the grep -A syntax used in the test case.
| * | mtr: aix fix mysqld--help - no thread-poolDaniel Black2021-07-061-0/+76
| | |
| * | mtr: aix has no thread_poolDaniel Black2021-07-0610-1/+11
| | |
| * | mtr: aix - no pool of threadsDaniel Black2021-07-061-0/+1
| | |
| * | mtr: fix innodb_bug53756 on aixDaniel Black2021-07-061-1/+1
| | | | | | | | | | | | --skip-stack-trace isn't there on AIX.
| * | MDEV-25978: minor post-merge fix for .result fileJulius Goryavsky2021-07-061-1/+0
| | |
* | | MDEV-26150: The test main.opt_trace fails in case it is run in PS modeDmitry Shulga2021-07-161-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case the test main.opt_trace is run with the option --ps-protocol it fails since querying from the table INFORMATION_SCHEMA.OPTIMIZER_TRACE produces an output that differed from the expected one in the following way: @@ -2829,14 +2829,6 @@ } }, { - "transformation": { - "select_id": 2, - "from": "IN (SELECT)", - "to": "semijoin", - "chosen": true - } - }, - { "expanded_query": "/* select#2 */ select t10.pk from t10" } The table INFORMATION_SCHEMA.OPTIMIZER_TRACE is filled when optimizer_trace is on. The reason of missing above mentioned pieces in query result set is that the C++ macros OPT_TRACE_TRANSFORM(thd, trace_wrapper, trace_transform, select_lex->select_number, "IN (SELECT)", "semijoin"); located in the standalone function check_and_do_in_subquery_rewrites() is executed twice in case the statement explain extended select * from t1 where a in (select pk from t10); is run in PS mode. The first time it is executed on PREPARE phase and the second time on EXECUTE phase. The output produced by this macros on EXECUTE phase rewrites the output produced on PREPARE phase. In result test failed in case it was run in PS mode. To make test output uniform regardless the test is run in PS or normal mode the operator '--source include/protocol.inc' has been added to the file opt_trace.test and extra opt_trace,ps.rdiff file has been added. Additionally, added operators --enable_prepared_warnings/--disable_prepared_warnings in order to store warnings in result file that received on PREPARE phase during running the statemement 'SELECT INTO'.
* | | MDEV-26142: Fix failures of the tests main.features and ↵Dmitry Shulga2021-07-158-9/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sys_vars.stored_program_cache_func when they are run in PS mode These tests produced different results in case they were run with the option --ps-protocol. These tests produced different result sets since a value of Feature_subquery and handler_read_key status system variables are updated one time more for ps-protocol (the first time it is updated on Prepare phase and the second time on Execute phase of PS protocol) So different result sets are expected for both tests. To make tests successfully runnable both for case it is run with and without the option --ps-protocol the new protocol combination [ps, nm] and protocol specific result files have been added. Moreover, the perl script mysql-test/mariadb-test-run.pl has been updated to make the variable opt_ps_protocol visible outside perl file containing this variable.
* | | MDEV-26146: The test main.limit_rows_examined fails in case it is run in PS ↵Dmitry Shulga2021-07-142-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mode. Test failed by firing assert in append_warnings() when it is called from run_query_stmt() and there are more results from server. Obviously, append_warnings() should be called after the last packet received from server. So, to fix the assertion failure the function mysql_more_results() has to be called to check that now more results does exist and invokes append_warnings() in case the condition satisfied.