summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge 10.4 into 10.5st-10.5-mergeMarko Mäkelä2021-10-2732-221/+1092
|\
| * MDEV-22380 Assertion `name.length == strlen(name.str)' failed .. ↵bb-10.4-bar-MDEV-22380Alexander Barkov2021-10-272-0/+44
| | | | | | | | | | | | w/optimizer_trace enabled Adding 10.4 specific tests.
| * Merge remote-tracking branch 'origin/10.3' into 10.4Alexander Barkov2021-10-2715-56/+346
| |\
| | * MDEV-22380: Assertion `name.length == strlen(name.str)' failed ...bb-10.3-bar-MDEV-22380Alexander Barkov2021-10-2715-56/+346
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes: MDEV-25399 Assertion `name.length == strlen(name.str)' failed in Item_func_sp::make_send_field Also fixes a problem that in this scenario: SET NAMES binary; SELECT 'some not well-formed utf8 string'; the auto-generated column name copied the binary string value directly to the Item name, without checking utf8 well-formedness. After this change auto-generated column names work as follows: - Zero bytes 0x00 are copied to the name using HEX notation - In case of "SET NAMES binary", all bytes sequences that do not make well-formed utf8 characters are copied to the name using HEX notation.
| * | MDEV-18543 IMPORT TABLESPACE fails after instant DROP COLUMNbb-10.4-MDEV-18543-instant-import-bugsEugene Kosov2021-10-2615-160/+693
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ALTER TABLE IMPORT doesn't properly handle instant alter metadata. This patch makes IMPORT read, parse and apply instant alter metadata at the very beginning of operation. So, cases when source table has some metadata and destination table doesn't have it now works fine. DISCARD already removes instant metadata so importing normal table into instant table worked fine before this patch. decrypt_decompress(): decrypts and decompresses page if needed handle_instant_metadata(): this should be the first thing to read source table. Basically, it applies instant metadata to a destination dict_table_t object. This is the first thing to read FSP flags so all possible checks of it were moved to this function. PageConverter::update_index_page(): it doesn't now read instant metadata. This logic were moved into handle_instant_metadata() row_import::match_flags(): this is a first part row_import::match_schema(). As a separate function it's used by handle_instant_metadata(). fil_space_t::is_full_crc32_compressed(): added convenient function ha_innobase::discard_or_import_tablespace(): do not reload table definition to read instant metadata because handle_instant_metadata() does it better. The reverted code was originally added in 4e7ee166a9c76eb3546356aabfd2dbc759671cd0 ANONYMOUS_VAR: this is a handy thing to use along with make_scope_exit() full_crc32_import.test shows different results, because no dict_table_close() and dict_table_open_on_id() happens. Thus, SHOW CREATE TABLE shows a little bit older table definition.
* | | MDEV-26732 Assertion `0' failed in Item::val_nativebb-10.5-bar-MDEV-26732Alexander Barkov2021-10-264-0/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes MDEV-24619 Wrong result or Assertion `0' in Item::val_native / Type_handler_inet6::Item_val_native_with_conversion Type_handler_inet6::create_item_copy() created a generic Item_copy_string, which does not implement val_native() - it has a dummy implementation with DBUG_ASSERT(0), which made the server crash. Fix: - Adding a new class Type_handler_inet6 which implements val_native(). - Fixing Type_handler_inet6::create_item_copy() to make Item_copy_inet6 instead of Item_copy_string.
* | | MDEV-22552: mytop packagingbb-10.5-anel-MDEV-22552Anel Husakovic2021-10-254-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `mytop` and `my_print_defaults` for RPM - Add `mytop` to client package - Add man page of `my_print_defaults` to client package - Add dependencies for RPMs - Remove old comment - Remove dead link Reviewed by: serg@mariadb.com
* | | MDEV-22552: mytop packagingBernard Spil2021-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Make `my_print_defaults` a client app (required by `mytop`). Closes #1566 Reviewed by: serg@mariadb.com, anel@mariadb.org
* | | Merge 10.4 into 10.5Marko Mäkelä2021-10-219-50/+50
|\ \ \ | |/ /
| * | Merge 10.3 into 10.4st-10.4-mergeMarko Mäkelä2021-10-219-50/+50
| |\ \ | | |/
| | * Merge 10.2 into 10.3Marko Mäkelä2021-10-219-47/+48
| | |\
| | | * MDEV-19129: Xcode compatibility update: mysql-test-run.pl: rename ↵Sergei Krivonos2021-10-218-45/+46
| | | | | | | | | | | | | | | | $opt_vs_config to $multiconfig to use with other cmake multiconfig generators
| | | * MDEV-19522 fixup: Use correct printf formatMarko Mäkelä2021-10-211-2/+2
| | | |
* | | | Fix GCC 11.2.0 -m32 (IA-32) warningsMarko Mäkelä2021-10-212-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | page_create_low(): Fix -Warray-bounds log_buffer_extend(): Fix -Wstringop-overflow
* | | | Merge 10.4 into 10.5Marko Mäkelä2021-10-2184-593/+2226
|\ \ \ \ | |/ / /
| * | | Merge 10.3 into 10.4Marko Mäkelä2021-10-2176-564/+2020
| |\ \ \ | | |/ /
| | * | Merge 10.2 into 10.3Marko Mäkelä2021-10-211-2/+2
| | |\ \ | | | |/
| | | * MDEV-19522 fixup: Integer type mismatch in unit testMarko Mäkelä2021-10-211-2/+2
| | | |
| | * | Merge 10.2 into 10.3Marko Mäkelä2021-10-2170-524/+1944
| | |\ \ | | | |/
| | | * MDEV-26865: Add test case and instrumentationMarko Mäkelä2021-10-213-0/+298
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on mysql/mysql-server@bc9c46bf2894673d0df17cd0ee872d0d99663121 but without sleeps. The test was verified to hit the debug assertion if the change to fts_add_doc_by_id() in commit 2d98b967e31623d9027c0db55330dde2c9d1d99a was reverted.
| | | * MDEV-26865 fts_optimize_thread cannot keep up with workloadMarko Mäkelä2021-10-215-43/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fts_cache_t::total_size_at_sync: New field, to sample total_size. fts_add_doc_by_id(): Invoke sync if total_size has grown too much since the previous sync request. (Maintain cache->total_size_at_sync.) ib_wqueue_t::length: Caches ib_list_len(*items). ib_wqueue_len(): Removed. We will refer to fts_optimize_wq->length directly. Based on mysql/mysql-server@bc9c46bf2894673d0df17cd0ee872d0d99663121
| | | * MDEV-26864 Race condition between transaction commit and undo log truncationMarko Mäkelä2021-10-211-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | trx_commit_in_memory(): Do not release the rseg reference before trx_undo_commit_cleanup() has been invoked and the current transaction is truly done with the rollback segment. The purpose of the reference count is to prevent data races with trx_purge_truncate_history(). This is based on mysql/mysql-server@ac79aa1522f33e6eb912133a81fa2614db764c9c.
| | | * MDEV-19522 InnoDB commit fails when FTS_DOC_ID value is greater than 4294967295Thirunarayanan Balathandayuthapani2021-10-2118-235/+286
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InnoDB commit fails when consecutive FTS_DOC_ID value is greater than 4294967295. Fix is that InnoDB should remove the delta FTS_DOC_ID value limitations and fts should encode 8 byte value, remove FTS_DOC_ID_MAX_STEP variable. Replaced the fts0vlc.ic file with fts0vlc.h fts_encode_int(): Should be able to encode 10 bytes value fts_get_encoded_len(): Should get the length of the value which has 10 bytes fts_decode_vlc(): Add debug assertion to verify the maximum length allowed is 10. mach_read_uint64_little_endian(): Reads 64 bit stored in little endian format Added a unit test case which check for minimum and maximum value to do the fts encoding
| | | * MDEV-22627 fixup: Add a type cast for 32-bit platformsMarko Mäkelä2021-10-211-1/+1
| | | |
| | | * MDEV-26262 fixup: Remove a bogus assertionMarko Mäkelä2021-10-211-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 1811fd51fbae9e6c1f06ce93faef2bf1279cd3b6 the assertion should have said error_reported instead of !error_reported. But, that revised assertion would still fail in main.defaults where ER_BAD_DATA is reported during CREATE TABLE.
| | | * MDEV-19129: Xcode compatibility update: mysql-test-run.plSergei Krivonos2021-10-211-0/+2
| | | |
| | | * MDEV-22627 fixup: Cover also ALTER TABLE...ALGORITHM=INPLACEMarko Mäkelä2021-10-203-0/+19
| | | |
| | | * Update libmariadbMarko Mäkelä2021-10-201-0/+0
| | | |
| | | * MDEV-22627 Failing assertion: dict_tf2_is_valid(flags, flags2)Marko Mäkelä2021-10-204-9/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | create_table_info_t::innobase_table_flags(): Refuse to create a PAGE_COMPRESSED table with PAGE_COMPRESSION_LEVEL=0 if also innodb_compression_level=0. The parameter value innodb_compression_level=0 was only somewhat meaningful for testing or debugging ROW_FORMAT=COMPRESSED tables. For the page_compressed format, it never made any sense, and the check in dict_tf_is_valid_not_redundant() that was added in 72378a25830184f91005be7e80cfb28381c79f23 (MDEV-12873) would cause the server to crash.
| | | * MDEV-22445 Crash on HANDLER READ NEXT after XA PREPARENikita Malyavin2021-10-203-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The assertion is absolutely correct since no data access is possible after XA PREPARE. The check is added in mysql_ha_read.
| | | * MDEV-26262 frm is corrupted after ER_EXPRESSION_REFERS_TO_UNINIT_FIELDNikita Malyavin2021-10-204-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a duplicate of MDEV-18278 89936f11e965, but I will add an additional assertion Description: The frm corruption should not be reported during CREATE TABLE. Normally it doesn't, and the data to fill TABLE is taken by open_table_from_share call. However, the vcol data is stored as SQL string in table->s->vcol_defs.str and is anyway parsed on each table open. It is impossible [or hard] to avoid, because it's hard to clone the expression tree in general (it's easier to parse). Normally parse_vcol_defs should only fail on semantic errors. If so, error_reported is set to true. Any other failure is not expected during table creation. There is either unhandled/unacknowledged error, or something went really wrong, like memory reject. This all should be asserted anyway. Solution: * Set *error_reported=true for the forward references check; * Assert for every unacknowledged error during table creation.
| | | * restore default.test, default.result after MDEV-23597 c47e4aab62c65 commitNikita Malyavin2021-10-202-3/+3
| | | |
| | | * MDEV-24585 Assertion `je->s.cs == nice_js->charset()' failed in json_nice.bb-10.2-mdev-24585-hfAlexey Botchkov2021-10-193-0/+13
| | | | | | | | | | | | | | | | | | | | We should set the charset in Item_func_json_format::fix_length_and_dec().
| | | * MDEV-14804 innodb.update_time failed in buildbot with wrong resultMarko Mäkelä2021-10-193-15/+4
| | | | | | | | | | | | | | | | | | | | Let us use a minimal-size buffer pool to ensure that page flushing will be slow enough so that LRU eviction cannot be avoided.
| | | * MDEV-26299: Some views force server (and mysqldump) to generate invalid SQL ↵Oleksandr Byelkin2021-10-183-2/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for their definitions Do not print illegal table field names for non-top-level SELECT list, they will not be refered in any case but create problem for parsing of printed result.
| | | * MDEV-25284: Assertion `info->type == READ_CACHE || info->type == ↵bb-10.2-MDEV-25284Brandon Nesterenko2021-10-189-0/+347
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WRITE_CACHE' failed Problem: ======== This patch addresses two issues. First, if a CHANGE MASTER command is issued and an error happens while locating the replica’s relay logs, the logs can be put into an invalid state where future updates fail and future CHANGE MASTER calls crash the server. More specifically, right before a replica purges the relay logs (part of the `CHANGE MASTER TO` logic), the relay log is temporarily closed with state LOG_TO_BE_OPENED. If the server errors in-between the temporary log closure and purge, i.e. during the function find_log_pos, the log should be closed. MDEV-25284 reveals the log is not properly closed. Second, upon issuing a RESET SLAVE ALL command, a slave’s GTID filters are not cleared (DO_DOMAIN_IDS, IGNORE_DOMIAN_IDS, IGNORE_SERVER_IDS). MySQL had a similar bug report, Bug #18816897, which fixed this issue to clear IGNORE_SERVER_IDS after issuing RESET SLAVE ALL in version 5.7. Solution: ========= To fix the first problem, the CHANGE MASTER error handling logic was extended to transition the relay log state to LOG_CLOSED from LOG_TO_BE_OPENED. To fix the second problem, the RESET SLAVE ALL logic is extended to clear the domain_id filter and ignore_server_ids. Reviewed By: ============ Andrei Elkin <andrei.elkin@mariadb.com>
| | | * A clean-up patch for MDEV-23408: fixing test failure on Windowsbb-10.2-bar-MDEV-23408Alexander Barkov2021-10-152-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Schema and table names in a veiw FRM files are: - in upper case on Linux - in lower case on Windows Using the LOWER() function when displaying an FRM file fragment, to avoid the OS-specific difference.
| | | * MDEV-17964: Assertion `status == 0' failed in add_role_user_mapping_actionVicențiu Ciorbaru2021-10-153-189/+479
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happens upon CREATE USER and DROP ROLE. The underlying problem is that our HASH implementation shuffles elements around when performing an update or delete. This means that when doing a scan through the HASH table by index, in search of elements to delete or update one must restart the scan to make sure nothing is missed if at least one delete / update happened. More specifically, what happened in this case: The hash has 131 element, DROP ROLE removes the element [119]. Its [119]->next was element [129], so [129] is moved to [119]. Now we need to compact the hash, removing the last element [130]. It gets one bit off its hash value and becomes element [2]. The existing element [2] is moved to [129], and old [130] is moved to [2]. We cannot simply move [130] to [129] and make [2]->next=130, it won't work if [2] is itself in the collision list and doesn't belong in [2]. The handle_grant_struct code assumed that it is safe to continue by only reexamining the currently modified / deleted element index, but that is not true. Missing to delete an element in the hash triggered the assertion in the test case. DROP ROLE would not clear all necessary role->role or role->user mappings. To fix the problem we ensure that the scan is restarted, only if an element was deleted / updated, similar to how bubble-sort keeps sorting until it finds no more elements to swap.
| | | * MDEV-23408 Wrong result upon query from I_S and further Assertion ↵Alexander Barkov2021-10-1411-3/+257
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `!alias_arg || strlen(alias_arg->str) == alias_arg->length' failed with certain connection charset There were two independent problems which lead to the crash and to the non-relevant records returned in I_S queries: - The code in the I_S implementation was not secure about values with 0x00 bytes. It's fixed by using check_db_name() and check_table_name() inside make_table_name_list(), and by adding the test for 0x00 inside check_table_name(). - The code in Item_string::print() did not convert strings without introducers when restoring the CREATE VIEW statement from an Item tree. This made wrong literals inside the "query" line in the view FRM file in cases when the VIEW parse time character_set_client!=character_set_connection. That's fixed by adding a proper conversion. This change also fixed a similar problem in SHOW PROCEDURE CODE - the literals were displayed in wrong character set in SP instructions in cases when the SP parse time character_set_client!=character_set_connection.
| | | * MDEV-26712 row events never reset thd->mem_rootAndrei Elkin2021-10-131-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | but must do that at the end of the statement. A provide template patch is elaborated also to match to the upstream fixes of the very same bug.
| | | * MDEV-26815 : galera.galera_ftwrl_drain fails with wrong errno 1146bb-10.2-MDEV-26815-galeraJan Lindström2021-10-132-12/+15
| | | | | | | | | | | | | | | | Add wait_conditions to stabilize
| | * | Fix Groonga crash on MIPS: Correctly link to libatomicVicențiu Ciorbaru2021-10-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MIPS (and possibly other) platforms require linking against libatomic to support 64-bit atomic integers. Groonga was failing to do so and all related tests were failing with an atomics relocation error on MIPS. Contributors: James Cowgill <jcowgill@debian.org>
| | * | Fix MIPS build failure: Handle unaligned buffers in connect's TYPBLK classVicențiu Ciorbaru2021-10-192-40/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On MIPS platforms (and probably others) unaligned memory access results in a bus error. In the connect storage engine, block data for some data formats is stored packed in memory and the TYPBLK class is used to read values from it. Since TYPBLK does not have special handling for this packed memory, it can quite easily result in unaligned memory accesses. The simple way to fix this is to perform all accesses to the main buffer through memcpy. With GCC and optimizations turned on, this call to memcpy is completely optimized away on architectures where unaligned accesses are ok (like x86). Contributors: James Cowgill <jcowgill@debian.org>
| | * | Link with libatomic to enable C11 atomics supportVicențiu Ciorbaru2021-10-193-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some architectures (mips) require libatomic to support proper atomic operations. Check first if support is available without linking, otherwise use the library. Contributors: James Cowgill <jcowgill@debian.org> Jessica Clarke <jrtc27@debian.org> Vicențiu Ciorbaru <vicentiu@mariadb.org>
| | * | MDEV-19866 follow-upbb-10.3-mdev-26333Nayuta Yanagisawa2021-10-181-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Cherry-picking the fix for MDEV-19866 changes the behavior of the Spider slightly. So, I modified a existing test to match the new behavior.
| | * | MDEV-19866 With a Spider table, a SELECT with WHERE involving primary key ↵Kentoku SHIBA2021-10-186-30/+310
| | | | | | | | | | | | | | | | | | | | breaks following SELECTs (#1356) Change checking scanning partitions from part_spec to part_info->read_partitions
| * | | MDEV-20131 Assertion `!pk->has_virtual()' failedNikita Malyavin2021-10-204-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assertion `!pk->has_virtual()' failed in dict_index_build_internal_clust while creating PRIMARY key longer than possible to store in the page. This happened because the key was wrongly deduced as Long UNIQUE supported, however PRIMARY KEY cannot be of that type. The main reason is that only 8 bytes are used to store the hash, see HA_HASH_FIELD_LENGTH. This is also why HA_NOSAME flag is removed (and caused the assertion in turn) in open_table_from_share: if (key_info->algorithm == HA_KEY_ALG_LONG_HASH) { key_part_end++; key_info->flags&= ~HA_NOSAME; } To make it unique, the additional check is done by check_duplicate_long_entries call from ha_write_row, and similar one from ha_update_row. PRIMARY key is already forbidden, which is checked by the first test in main.long_unique, however is_hash_field_needed was wrongly deduced to true in mysql_prepare_create_table in this particular case. FIX: * Improve the check for Key::PRIMARY type * Simplify is_hash_field_needed deduction for a more neat reading
| * | | MDEV-26363 Passwords incorrectly expiring after MySQL5.7 -> MariaDB10.3 -> ↵bb-10.4-MDEV-26363-danielblack-zero_last_password_changedDaniel Black2021-10-203-1/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 10.4+ upgrades MySQL-5.7 mysql.user tables have a last_password_changed field. Because before MariaDB-10.4 remained oblivious to this, the act of creating users or otherwise changing a users row left the last_password_field with 0. Running a MariaDB-10.4 instance on this would work correctly, until mysql_upgrade is run, when this 0 value immediately translates to password expired state. MySQL-5.7 relied on the password_expired enum to indicate password expiry so we aren't going to activate password that were expired in MySQL-5.7. Thanks Hans Borresen for the bug report and review of the fix.
| * | | MDEV-26650: Failed ALTER USER/GRANT statement removes the password from the ↵bb-10.4-MDEV-26650-2Oleksandr Byelkin2021-10-183-11/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | cache Starting from 10.4 AUTH is not part of ACL_USER so changes have to be done over a copy, and bring in the cache only in case of success.
* | | | MDEV-19129: Xcode compatibility update: update libmariadb submodulebb-10.5-MDEV-19129Sergei Krivonos2021-10-191-0/+0
| | | |