summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-22761: innodb row_search_idx_cond_check handle CHECK_ABORTED_BY_USERbb-10.4-danielblack-MDEV-22761Daniel Black2020-10-141-3/+8
| | | | | | Part #3: Two more cases within row_search_mvcc need to handle the CHECK_ABORTED_BY_USER and process this as a DB_INTERRUPTED.
* MDEV-22761: innodb row_search_idx_cond_check handle CHECK_ABORTED_BY_USERSergei Petrunia2020-10-1414-8/+359
| | | | | | | | | | | Part #2: - row_search_mvcc() should return DB_INTERRUPTED when it got - Move the sync point from innodb internals to handler_rowid_filter_check() where other storage engines can use it too - Add a similar syncpoint for the ICP check. - Add a bigger test and test coverage for Rowid Filter with MyISAM - Add test coverage for killed-during-ICP-check scenario
* MDEV-22761: innodb row_search_idx_cond_check handle CHECK_ABORTED_BY_USERDaniel Black2020-10-144-2/+77
| | | | | | | | | | | | handler_rowid_filter_check can return CHECK_ABORTED_BY_USER. All the functions that call row_search_idx_cond_check handle the CHECK_ABORTED_BY_USER return value. So return it rather than generating an error. This incorrect handling was introduced in MDEV-21794 (8d85715d507d). Reviewer: Marko Mäkelä
* MDEV-19130 Assertion failed in handler::update_auto_incrementNikita Malyavin2020-10-146-1/+75
| | | | add store/restore_auto_increment in period portion insert/update functions
* Merge tag 'mariadb-10.4.15' into 10.4Sergei Golubchik2020-10-071-0/+42
|\
| * Merge branch '10.3' into 10.4mariadb-10.4.15Sergei Golubchik2020-10-052-1/+43
| |\
| | * Merge branch '10.2' into 10.3mariadb-10.3.25Sergei Golubchik2020-10-052-6/+47
| | |\
| | | * Merge branch '10.1' into 10.2mariadb-10.2.34Sergei Golubchik2020-10-052-6/+47
| | | |\
| | | | * bump VERSIONmariadb-10.1.47Sergei Golubchik2020-10-051-1/+1
| | | | |
| | | | * MDEV-23884 donor uses invalid SST methodsSergei Golubchik2020-10-051-5/+46
| | | | |
* | | | | bump the VERSIONDaniel Bartholomew2020-10-071-1/+1
| | | | |
* | | | | Better German Error message.Oleksandr Byelkin2020-10-071-1/+1
| | | | |
* | | | | MDEV-22148 : Assertion `state_ == s_exec || state_ == s_quitting' failed in ↵Jan Lindström2020-10-072-0/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | optimized builds | SIGABRT in wsrep::client_state::disable_streaming Actual bug seems to be already fixed, just adding a test case.
* | | | | MDEV-23518 Syntax error in ond SP results in misleading message on SHOW ↵Oleksandr Byelkin2020-10-039-17/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CREATE PROCEDURE Add info to the error message how to get details about error which happened.
* | | | | Cleanup: Remove unnecessary trx_i_s_cache_t::last_read_mutexMarko Mäkelä2020-10-016-31/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can simply use C++11 std::atomic for avoiding undefined behaviour related to concurrent stores to a shared variable. On most if not all ISAs, std::memory_order_relaxed loads and stores will not really differ from non-atomic loads or stores.
* | | | | Merge 10.3 into 10.4Marko Mäkelä2020-10-0116-62/+51
|\ \ \ \ \
| * \ \ \ \ Merge 10.2 into 10.3Marko Mäkelä2020-10-011-3/+7
| |\ \ \ \ \
| | * | | | | MDEV-23856 fts_optimize_wq accessed after shutdown of FTS Optimize threadThirunarayanan Balathandayuthapani2020-09-301-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In fts_optimize_remove_table(), InnoDB tries to access the fts_optimize_wq after shutting down the fts optimize thread. This issue caused by the commit a41d429765c7ddb528b9b438c68b25ff55d3bd55. Fix should check for fts optimize thread shutdown state before checking fts_optimize_wq.
| * | | | | | Merge 10.2 into 10.3Marko Mäkelä2020-09-3015-60/+45
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Cleanup: Remove unused fts_cache_t::optimize_lockMarko Mäkelä2020-09-307-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has been unused from the very beginning (mysql/mysql-server@d5e512ae7e37cd1f70c44a3f12205d70b13118ab).
| | * | | | | Cleanup: Remove constant parameters async=false, index_name=NULLMarko Mäkelä2020-09-294-41/+6
| | | | | | |
| | * | | | | MDEV-23839 innodb_fast_shutdown=0 hang on change buffer mergeMarko Mäkelä2020-09-291-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ibuf_merge_or_delete_for_page(): Do not attempt to invoke ibuf_delete_recs() on a page of the change buffer itself. The caller could already be holding ibuf->index->lock, and an attempt to acquire it in S mode would hang the release server or cause an assertion failure in rw_lock_s_lock_func() in a debug server. This problem was reproducible on 1 out of 2 runs of the following: ./mtr --no-reorder \ innodb.innodb-page_compression_default \ innodb.innodb-page_compression_snappy \ innodb.innodb-page_compression_zip \ innodb.innodb_wl6326_big innodb.xa_recovery
| | * | | | | Merge 10.1 into 10.2Marko Mäkelä2020-09-296-14/+42
| | |\ \ \ \ \
| | | * | | | | Cleanup: Remove unused rw_lock_t::writer_is_wait_exMarko Mäkelä2020-09-292-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was missed in commit 2c252ba96b8f124f81371ec86843a45dc3977d54 (MySQL 5.5.42, MariaDB 5.5.42).
| | | * | | | | MDEV-22277 LeakSanitizer: detected memory leaks in ↵Thirunarayanan Balathandayuthapani2020-09-284-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mem_heap_create_block_func after attempt to create foreign key - During online DDL, prepare phase error handler fails to remove the memory allocated for newly created foreign keys.
* | | | | | | | MDEV-23778 Derived table handler looses data on conversion from HEAP to AriaIgor Babaev2020-09-283-3/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug happened when the HEAP temporary table used for the derived table created for a derived handler of a remote engine of the federated type became full and was converted to an Area table. For this conversion the tmp_table_param parameter must be always taken from the select_unit object created for the result of the derived table.
* | | | | | | | Merge branch '10.3' into 10.4Sujatha2020-09-2830-46/+202
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch '10.2' into 10.3Sujatha2020-09-2829-49/+178
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | MDEV-23659 : Update Galera disabled.def fileJan Lindström2020-09-281-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo.
| | * | | | | | Merge branch '10.1' into 10.2Sujatha2020-09-2819-24/+103
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | MDEV-22330: mysqlbinlog stops with an error Don't know how to handle column ↵Sujatha2020-09-283-7/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | type: 255 meta: 4 (0004) Analysis: ======== "mysqlbinlog -v" option will reconstruct row events and display them as commented SQL statements. If this option is given twice, the output includes comments to indicate column data types and some metadata. `log_event_print_value` is the function reponsible for printing values and their types. This function doesn't handle GEOMETRY type. Hence the above error gets printed. Fix: === Add support for GEOMETRY datatype.
| | | * | | | | Reverted wrong patch for mysql_upgradebb-10.1-danielblack-mysqlupgrade-revertMonty2020-09-262-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original code was correct. mysql_upgrade calls the mysql client to talk with MariaDB. It doesn't call itself!
| | | * | | | | Revert "[MDEV-7978] add show create user"Daniel Black2020-09-2416-701/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Appoligies, had a dirty branch before pushing: This reverts commit 053653a23cac6f3f2e5288979438de27c9d0100a. This reverts commit 0ff897807fc2f4a32e1ba1ae148005930ea604b5. This reverts commit 85b085972b729f6c049050f851692c9a5b86f3d5. This reverts commit f3f45e46b614bddcef0a37f4352c5909ca565d1d. This reverts commit a470b3570a7ce2534c9021f3b84d7457a3ba08e1. This reverts commit f8b8d202bc83d3de46c89ef86333fe602e711265. This reverts commit 6b6f066fdd9f5f64813ded550e7dbda176ee3c82. This reverts commit a701e9e6c390c3cbac69872e95b1aec565341d30. This reverts commit c169838611e13c9f0559b2f49ba8c36aec11a78b.
| | | * | | | | MDEV-23697: /usr/bin/perl for debian scriptsDaniel Black2020-09-241-1/+1
| | | | | | | |
| | | * | | | | MDEV-23697: perl -w -> perlDaniel Black2020-09-2413-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Leave debian/additions/mysqlreport as #!/usr/bin/perl Acknowledge that `env perl` is a hack, a complete fix needs to consider which path perl is at and insert into these scripts. The usefulness of these scripts is questionable.
| | | * | | | | Merge branch '10.1' of https://github.com/MariaDB/server into 10.1Daniel Black2020-09-241-0/+5
| | | |\ \ \ \ \
| | | * | | | | | [MDEV-7978] Update test cases for sysvars_server_embedded.Vicențiu Ciorbaru2020-09-201-2/+2
| | | | | | | | |
| | | * | | | | | [MDEV-7978] Make show_create_user testcase not run on embedded buildVicențiu Ciorbaru2020-09-201-0/+2
| | | | | | | | |
| | | * | | | | | [MDEV-7978] Post review fixes and cleanups.Vicențiu Ciorbaru2020-09-204-12/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Maintain coding style in sql_yacc.yy in regards to optional clauses. * Remove unused variable from sql_acl.cc. * Update test case
| | | * | | | | | [MDEV-7978] Added show create user implementation.Vicențiu Ciorbaru2020-09-204-93/+233
| | | | | | | | |
| | | * | | | | | [MDEV-7978] Update test casesVicențiu Ciorbaru2020-09-202-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update test to account for the new SHOW CREATE USER command.
| | | * | | | | | [MDEV-7978] Updated syntax for SHOW CREATE USERVicențiu Ciorbaru2020-09-207-1/+36
| | | | | | | | |
| | | * | | | | | [MDEV-7978] Update test casesVicențiu Ciorbaru2020-09-202-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding an extra statement requires test cases update.
| | | * | | | | | [MDEV-7978] Implement alter user and tested create userVicențiu Ciorbaru2020-09-206-3/+331
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented the alter user syntax. Also tested that create user creates users accordingly.
| | | * | | | | | [MDEV-7978] Update grammar for new syntaxVicențiu Ciorbaru2020-09-207-20/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the syntax accepted by the grammar to account for the new create user and alter user syntax.
| | * | | | | | | MDEV-23659 : Update Galera disabled.def fileJan Lindström2020-09-281-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will update galera_3nodes/disabled.def.
| | * | | | | | | MDEV-22387: Do not violate __attribute__((nonnull))Marko Mäkelä2020-09-233-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing a null pointer to a nonnull argument is not only undefined behaviour, but it also grants the compiler the permission to optimize away further checks whether the pointer is null. GCC -O2 at least starting with version 8 may do that, potentially causing SIGSEGV.
| | * | | | | | | UBSAN: Fix a bit shift overflowMarko Mäkelä2020-09-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shifting a 16-bit type by 16 bits is undefined behaviour. The result is at least 32 bits, so let us cast the shift operand to a wider type before shifting.
| | * | | | | | | Fix GCC 10.2.0 -Og -fsanitize=undefined -Wmaybe-uninitializedMarko Mäkelä2020-09-233-21/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason, adding -fsanitize=undefined (cmake -DWITH_UBSAN=ON) to the compilation flags will cause even more warnings to be emitted. The warnings do look bogus, but the code can be simplified.
| | * | | | | | | Fix GCC 10.2.0 -Og -fsanitize=undefined -Wformat-overflowMarko Mäkelä2020-09-231-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason, adding -fsanitize=undefined (cmake -DWITH_UBSAN=ON) to the compilation flags will cause even more warnings to be emitted. The warning was a bogus one: tests/mysql_client_test.c:8632:22: error: '%d' directive writing between 1 and 11 bytes into a region of size 9 [-Werror=format-overflow=] 8632 | sprintf(field, "c%d int", i); | ^~ tests/mysql_client_test.c:8632:20: note: directive argument in the range [-2147483648, 999] The warning does not take into account that the lower bound of the variable actually is 0. But, we can help the compiler and use an unsigned variable.