summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | MDEV-22953 main.flush_read_lock failed in buildbot with XAER_NOTA: Unknown XIDsachin2021-04-222-8/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue:- Since there is no waiting for the actual disconnection of the con_tmp (which does XA prepare of test1), We can have a issue when test1 is not prepared and we are calling rollback on test1 , giving XAER_NOTA: Unknown XID error Solution:- Wait for the complete disconnection of con_tmp
* | | | Merge 10.4 into 10.5Marko Mäkelä2021-04-2210-22/+327
|\ \ \ \ | |/ / /
| * | | Merge 10.3 into 10.4st-10.4Marko Mäkelä2021-04-229-19/+324
| |\ \ \ | | |/ /
| | * | Merge 10.2 into 10.3Marko Mäkelä2021-04-229-19/+325
| | |\ \ | | | |/
| | | * MDEV-25474 Background thread returns uninitialized statisticsbb-10.2-MDEV-25474Thirunarayanan Balathandayuthapani2021-04-211-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to mysql interpreter InnoDB returns uninitialized statistics to mysql interpreter when background thread is opening the table. So it leads to assertion failure. In that case, InnoDB avoid sending innodb statistics information to mysql interpreter.
| | | * MDEV-25457 Server crashes in row_undo_mod_clust_low upon rollback of ↵Eugene Kosov2021-04-213-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | read-only transaction node->index was NULL. But it's possible to get dict_table_t* from another source.
| | | * MDEV-24526 binlog rotate via FLUSH LOGS may obsolate binlog file for ↵Andrei Elkin2021-04-213-0/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery too eary There was race between a committing transaction and the following in binlog order FLUSH LOGS that could create a 2nd Binlog checkpoint (BCP) event in the new file *before* the first logged-in-old-binlog transaction gets committed in Innodb. That would cause the transaction loss at recovery, should the server stop right after the BCP. The race is tackled by enforcing the necessary set of mutexes to be acquired by FLUSH-LOGS handler in the correct order (of the group commit leader pattern). Note, there remain two cases where a similar race is still possible: - the above race as it is when the server is run with ("unlikely") non-default `--binlog-optimize-thread-scheduling=0` (MDEV-24530), and - at unlikely event of bin-logging of Incident event (MDEV-24531) that also triggers binlog rotation, in both cases though with lesser chances after the current fixes.
| | | * Fixup: Event_queue_element_for_exec initializer list not supported on gcc-4.1Vicențiu Ciorbaru2021-04-211-1/+5
| | | |
| | | * fixed some korean error messagesbb-10.2-danielblack-pr1811-korean-translationLee Keun Won2021-04-211-14/+17
| | | | | | | | | | | | | | | | Closes #1811
| | | * Smoke test collection should not be executableElena Stepanova2021-04-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since it ended up being a plain text file rather than a script (post-fix for MDEV-25288) Also removed main-test_sql_discovery.create from the list, as a workaround for MDEV-25384. The bug only affects 10.3+, but it will be simpler if 10.2 part of the tests is the same in all branches
| | | * MDEV-25288 Create a list of tests for distributionsElena Stepanova2021-04-211-0/+139
| | | | | | | | | | | | | | | | ... to run upon building/packaging of MariaDB server
| | | * MDEV-24807:A possibility for double free in dtor of ↵Vicențiu Ciorbaru2021-04-203-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Event_queue_element_for_exec in the case of OOM Eliminate a memory leak when init can fail by forgetting to delete the Event_queue_element_for_exec object.
| * | | MDEV-25362 after-merge fix: Remove unnecessary codeMarko Mäkelä2021-04-221-3/+1
| | | |
* | | | MDEV-25483: Shutdown crash during innodb.innodb_buffer_pool_resize_temporaryMarko Mäkelä2021-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buf_resize_callback(): Correct an invalid assertion, and enable the assertion in debug builds only. Between buf_resize_start() and buf_resize_shutdown(), srv_shutdown_state must be less than SRV_SHUTDOWN_CLEANUP. The incorrect assertion had been introduced in commit 5e62b6a5e06eb02cbde1e34e95e26f42d87fce02 (MDEV-16264). As a result, the server could crash if shutdown was initiated concurrently with initiating a change of innodb_buffer_pool_size.
* | | | Cleanup: constexpr PFS_table_context::m_word_sizeMarko Mäkelä2021-04-212-5/+3
| | | |
* | | | WITH_UBSAN: shift is too large for 32-bit intMarko Mäkelä2021-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | As suggested by Vladislav Vaintroub, we must shift a constant of unsigned long, not int.
* | | | Merge 10.4 into 10.5st-10.5Marko Mäkelä2021-04-211-2/+1
|\ \ \ \ | |/ / /
| * | | MDEV-25362 after-merge fix: GCC -Og -Wmaybe-uninitializedMarko Mäkelä2021-04-211-2/+1
| | | |
* | | | Merge 10.4 into 10.5Marko Mäkelä2021-04-21163-3346/+8185
|\ \ \ \ | |/ / /
| * | | Merge 10.3 into 10.4Marko Mäkelä2021-04-2133-126/+674
| |\ \ \ | | |/ /
| | * | Merge 10.2 into 10.3Marko Mäkelä2021-04-2130-123/+621
| | |\ \ | | | |/
| | | * MDEV-25466 Merge new release of InnoDB 5.7.34 to 10.2Marko Mäkelä2021-04-202-6/+2
| | | |\
| | | | * Bug #32032897 DEADLOCKING WAIT GRAPH ON BUSY SERVERAditya A2021-04-201-5/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PROBLEM ------- 1. The customer had presented a stack which had many threads waiting on multiple mutexes like LOCK_Status, srv_innodb_monitor_mutex, ibuf_mutex etc. 2. The root cause was that the AHI latch was held in S (shared) mode by the a thread which was doing a truncate of a large table . 3. There was another thread which was trying to acquire the AHI latch in X (exclusive) mode 4. With our lock implementation any thread requesting a X lock ,blocks rest of the threads requesting S(shared) locks,this caused many threads to wait for this shared lock. 5. The main reason why we hold the latches in truncate is to avoid disabling of AHI during truncate FIX
| | | * MDEV-25362 Incorrect name resolution for subqueries in ON expressionsprot-10.2Igor Babaev2021-04-175-1/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch sets the proper name resolution context for outer references used in a subquery from an ON clause. Usually this context is more narrow than the name resolution context of the parent select that were used before this fix. This fix revealed another problem that concerned ON expressions used in from clauses of specifications of derived tables / views / CTEs. The name resolution outer context for such ON expression must be set to NULL to prevent name resolution beyond the derived table where it is used. The solution to resolve this problem applied in sql_derived.cc was provided by Sergei Petrunia <sergey@mariadb.com>. The change in sql_parse.cc is not good for 10.4+. A corresponding diff for 10.4+ will be provided in JIRA entry for this bug. Approved by Oleksandr Byelkin <sanja@mariadb.com>
| | | * MDEV-15064: IO_CACHE mysys read_pos, not libmaria rc_posbb-10.2-danielblack-MDEV-15064-IO_CACHE-read_posRainer Orth2021-04-172-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems some overly tolerant compilers (gcc) allow the structure of IO_CACHE that is defined differently in libmaria to have members equalivance to the iocache in mysys. More strict Solaris compilers recognise that rc_pos really isn't a structure member and won't compile.
| | | * MDEV-25407: EXISTS subquery with correlation in ON expression crashesbb-10.2-mdev25407Sergei Petrunia2021-04-163-1/+70
| | | | | | | | | | | | | | | | Make Item_subselect::walk() walk the ON expressions, too.
| | | * MDEV-22255 SIGABRT: Assertion `id' failed in trx_write_trx_id on INSERT | ↵Eugene Kosov2021-04-1510-12/+212
| | | | | | | | | | | | | | | | Assertion `id > 0' failed in trx_write_trx_id | Assertion `val > 0' failed in row_upd_index_entry_sys_field | Assertion `thr_get_trx(thr)->id || index->table->no_rollback()' failed.
| | | * MDEV-23026 purge fails with assert !rw_lock_own_flagged(lock, ↵st-10.2-MDEV-23026Thirunarayanan Balathandayuthapani2021-04-151-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RW_LOCK_FLAG_X | RW_LOCK_FLAG_S) InnoDB purge thread locks the root page of clustered index while accessing the undo log records and later same thread tries to open the table, initialize statistics and tries to lock the clustered index root page while doing virtual column computation. Solution: ========= InnoDB should prevent statistics initialization when the table is being opened by purge thread
| | | * update C/CSergei Golubchik2021-04-151-0/+0
| | | |
| | | * MDEV-25403 ALTER TABLE wrongly checks for field's default value if AFTER is usedSergei Golubchik2021-04-153-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a column is added to an non-empty table, existing rows will have a column's default value for existing rows. Or a "zero value" if the column has no default. But this check should be skipped when an existing column is altered.
| | | * signal handler, display coredump file pattern similarly to MDEV-25294 but ↵David Carlier2021-04-151-3/+3
| | | | | | | | | | | | | | | | for FreeBSD, thankfully the sysctl OID is the same.
| | | * Update mysqlbinlog man page with --table optionIan Gilfillan2021-04-141-2/+19
| | | |
| | | * MDEV-25363 binlog_stm_datetime_ranges_mdev15289 failed in bbAlice Sherepa2021-04-142-0/+2
| | | |
| | | * MDEV-25354: Fix my_print_defaults wordingIan Gilfillan2021-04-141-1/+1
| | | |
| | * | MDEV-25327 Unexpected ER_DUP_ENTRY upon dropping PK column from ↵Aleksey Midenkov2021-04-193-2/+49
| | | | | | | | | | | | | | | | | | | | | | | | system-versioned table When dropped all user key-parts we also drop key-parts of implicit system fields.
| | * | Fix riscv64 build failure by linking correctly with pthreadbb-10.3-ottok-MDEV-23892-pthreadOtto Kekäläinen2021-04-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link with -pthread instead of -lpthread, and do that for all architectures. Contributors: Aurelien Jarno <aurelien@aurel32.net> Closes: #1717
| * | | Fix all warnings given by UBSANMonty2021-04-2073-291/+528
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The easiest way to compile and test the server with UBSAN is to run: ./BUILD/compile-pentium64-ubsan and then run mysql-test-run. After this commit, one should be able to run this without any UBSAN warnings. There is still a few compiler warnings that should be fixed at some point, but these do not expose any real bugs. The 'special' cases where we disable, suppress or circumvent UBSAN are: - ref10 source (as here we intentionally do some shifts that UBSAN complains about. - x86 version of optimized int#korr() methods. UBSAN do not like unaligned memory access of integers. Fixed by using byte_order_generic.h when compiling with UBSAN - We use smaller thread stack with ASAN and UBSAN, which forced me to disable a few tests that prints the thread stack size. - Verifying class types does not work for shared libraries. I added suppression in mysql-test-run.pl for this case. - Added '#ifdef WITH_UBSAN' when using integer arithmetic where it is safe to have overflows (two cases, in item_func.cc). Things fixed: - Don't left shift signed values (byte_order_generic.h, mysqltest.c, item_sum.cc and many more) - Don't assign not non existing values to enum variables. - Ensure that bool and enum values are properly initialized in constructors. This was needed as UBSAN checks that these types has correct values when one copies an object. (gcalc_tools.h, ha_partition.cc, item_sum.cc, partition_element.h ...) - Ensure we do not called handler functions on unallocated objects or deleted objects. (events.cc, sql_acl.cc). - Fixed bugs in Item_sp::Item_sp() where we did not call constructor on Query_arena object. - Fixed several cast of objects to an incompatible class! (Item.cc, Item_buff.cc, item_timefunc.cc, opt_subselect.cc, sql_acl.cc, sql_select.cc ...) - Ensure we do not do integer arithmetic that causes over or underflows. This includes also ++ and -- of integers. (Item_func.cc, Item_strfunc.cc, item_timefunc.cc, sql_base.cc ...) - Added JSON_VALUE_UNITIALIZED to json_value_types and ensure that value_type is initialized to this instead of to -1, which is not a valid enum value for json_value_types. - Ensure we do not call memcpy() when second argument could be null. - Fixed that Item_func_str::make_empty_result() creates an empty string instead of a null string (safer as it ensures we do not do arithmetic on null strings). Other things: - Changed struct st_position to an OBJECT and added an initialization function to it to ensure that we do not copy or use uninitialized members. The change to a class was also motived that we used "struct st_position" and POSITION randomly trough the code which was confusing. - Notably big rewrite in sql_acl.cc to avoid using deleted objects. - Changed in sql_partition to use '^' instead of '-'. This is safe as the operator is either 0 or 0x8000000000000000ULL. - Added check for select_nr < INT_MAX in JOIN::build_explain() to avoid bug when get_select() could return NULL. - Reordered elements in POSITION for better alignment. - Changed sql_test.cc::print_plan() to use pointers instead of objects. - Fixed bug in find_set() where could could execute '1 << -1'. - Added variable have_sanitizer, used by mtr. (This variable was before only in 10.5 and up). It can now have one of two values: ASAN or UBSAN. - Moved ~Archive_share() from ha_archive.cc to ha_archive.h and marked it virtual. This was an effort to get UBSAN to work with loaded storage engines. I kept the change as the new place is better. - Added in CONNECT engine COLBLK::SetName(), to get around a wrong cast in tabutil.cpp. - Added HAVE_REPLICATION around usage of rgi_slave, to get embedded server to compile with UBSAN. (Patch from Marko). - Added #ifdef for powerpc64 to avoid a bug in old gcc versions related to integer arithmetic. Changes that should not be needed but had to be done to suppress warnings from UBSAN: - Added static_cast<<uint16_t>> around shift to get rid of a LOT of compiler warnings when using UBSAN. - Had to change some '/' of 2 base integers to shift to get rid of some compile time warnings. Reviewed by: - Json changes: Alexey Botchkov - Charset changes in ctype-uca.c: Alexander Barkov - InnoDB changes & Embedded server: Marko Mäkelä - sql_acl.cc changes: Vicențiu Ciorbaru - build_explain() changes: Sergey Petrunia
| * | | More fixes to variable wsrep_onDaniele Sciascia2021-04-2011-16/+237
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Disallow setting wsrep_on = 1 if wsrep_provider is unset. Also, move wsrep_on_basic from sys_vars to wsrep suite: this test now requires to run with wsrep_provider set * Disallow setting @@session.wsrep_on = 1 when @@global.wsrep_on = 0 * Handle the case where a new connection turns @@global.wsrep_on from off to on. In this case we would miss a call to wsrep_open, causing unexpected states in wsrep::client_state (causing assertions). * Disable wsrep.MDEV-22443 because it is no longer possible to enable wsrep_on, if server is started with wsrep_provider='none' Reviewed-by: Jan Lindström <jan.lindstrom@mariadb.com>
| * | | MDEV-25423 : Donor node fails to shutdown after mysqldump SSTbb-10.4-MDEV-25423Jan Lindström2021-04-1931-2901/+6401
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Table should have primary key * Enable wsrep_sync_wait before final selects * Enable autocommit before final selects. * Fix joiner monitoring in case of mysqldump. * Add wait_conditions to stabilize
| * | | MDEV-22668: "Flush SSL" command doesn't reload wsrep certbb-10.4-MDEV-22668mkaruza2021-04-1516-0/+352
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Trigger `socket.ssl_reload` when FLUSH SSL is issued. To triger reloading of certificate, key and CA, files needs to be physically changed. Reviewed-by: Jan Lindström <jan.lindstrom@mariadb.com>
* | | | MDEV-22757 Assertion !binlog || exist_hton_without_prepare' failed in ↵Andrei Elkin2021-04-193-22/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MYSQL_BIN_LOG::unlog_xa_prepare The assert fired falsely having not captured two more not apparent possiblities in its condition. They are masked out hton error out of REPLACE execution (so at later xa-prepare that engine is still present as read-write) and a prepare-capable engine which also may not be an actual participant in the xa transation. That engine, such as SEQUENCE, though does create its own event block.
* | | | Fixed failing test spider/bugfix.mdev_22246Monty2021-04-192-2/+2
| | | | | | | | | | | | | | | | | | | | This was caused by MDEV-23634, which disabled index optimization for index != constant.
* | | | Revert "Deb: Use build flag to enforce default charset as utf8mb4"bb-10.5-danielblack-pr-1722-revertDaniel Black2021-04-162-35/+0
| | | | | | | | | | | | | | | | This reverts commit f26e3259a15cc26dac0a0a77e2488abb87892cf4.
* | | | MDEV-25425 Useless message "If the mysqld execution user is authorized page ↵Marko Mäkelä2021-04-151-22/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cleaner thread priority can be changed." On startup, InnoDB tried to increase the priority of the page cleaner thread. This would usually fail, resulting in a server log message. When the page cleaner code was refactored in MDEV-23855, the throughput and latency were greatly improved even when the buf_flush_page_cleaner thread always ran the same priority with other threads in our benchmarks. So, this code should have no benefit in MariaDB Server 10.5.7 or later. Besides, starting with MariaDB Server 10.5, the executable is called mariadbd, not mysqld.
* | | | Fix riscv64 build failure by linking correctly with pthreadbb-10.5-ottok-pr1722-conc-utf8Otto Kekäläinen2021-04-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link with -pthread instead of -lpthread, and do that for all architectures. Contributors: Aurelien Jarno <aurelien@aurel32.net> Closes: #1717
* | | | Deb: Use build flag to enforce default charset as utf8mb4Otto Kekäläinen2021-04-152-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Possible now since https://github.com/mariadb-corporation/mariadb-connector-c/commit/29720950eeae75f1ea7ef1376a6149cabeb79d13 Upstreamed from https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/ca5e93c754209f9c1a729bb057332ab3b0b76363 Closes: #1722
* | | | Fix cross-compile to consider CMAKE_CROSSCOMPILING_EMULATORbb-10.5-danielblack-pr1805-cross-compileJustin Jagieniak2021-04-157-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When CMAKE_CROSSCOMPILING_EMULATOR is defined, a cross-compile can be made, however with native (emulated) execution possible. This commit takes those points in the build system that execute built targets natively and allow these to be executed in a crosscompile if CMAKE_CROSSCOMPILING_EMULATOR is defined. Closes #1805
* | | | fixup 6c3e860cbf36831c118f6ea183acbbeb3c889bedMarko Mäkelä2021-04-141-1/+1
| | | |
* | | | Merge 10.4 into 10.5Marko Mäkelä2021-04-141-2/+2
|\ \ \ \ | |/ / /
| * | | After-merge fix: Make GCC 4.8.5 happyMarko Mäkelä2021-04-141-2/+2
| | | |