summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-19950 addendum: galera_ssl_upgrade removed from the list of disabled ↵bb-10.4-MDEV-19950-addendum-galeraJulius Goryavsky2021-09-172-1/+3
| | | | tests and adapted for 10.4+
* MDEV-26053 : TRUNCATE on table with Foreign Key Constraint no longer ↵bb-10.4-truncateJan Lindström2021-09-176-23/+102
| | | | | | | | | | | replicated to other nodes Problem was that there was extra condition !thd->lex->no_write_to_binlog before call to begin TOI. It seems that this variable is not initialized. TRUNCATE does not support [NO_WRITE_TO_BINLOG | LOCAL] keywords, thus we should not check this condition. All this was hidden in a macro, so I decided to remove those macros that were used only a few places with actual function calls.
* MDEV-26621 assertion failue "index->table->persistent_autoinc" in ↵bb-10.4-kevgsEugene Kosov2021-09-163-1/+28
| | | | | | | /storage/innobase/btr/btr0btr.cc during IMPORT dict_index_t::clear_instant_alter(): when searhing for an AUTO_INCREMENT column don't skip the beginning of the list because the field can be at the beginning of the list
* MDEV-23519 Protocol packet - "Original Name" info is showing alias name,Monty2021-09-144-7/+52
| | | | | | | | | instead of original name of the column When doing refactoring of temporary table field creation a mistake was done when copying the column name when creating internal temporary tables. For internal temporary tables we should use the original field name, not the item name (= alias).
* MDEV-26601: mysys - O_TMPFILE ^ O_CREATDaniel Black2021-09-141-1/+1
| | | | | | | | Thanks to Fabian Vogt for noticing the mutual exclusions of these open flags on tmpfs caused by mariadb opening it incorrectly. As such we clear the O_CREAT flag while opening it as O_TMPFILE.
* MDEV-21613 Failed to open table mysql.wsrep_streaming_log for writingbb-10.4-MDEV-21613Daniele Sciascia2021-09-145-8/+73
| | | | | | | | | | | | | | Fix sporadic failure for MTR test galera_sr.GCF-1018B. The test sometimes fails due to an error that is logged to the error log unnecessarily. A deterministic test case (included in this patch) shows that the error is loggen when a transaction is BF aborted right before it opens the streaming log table to perform fragment removal. When that happens, the attempt to open the table fails and consequently an error is logged. There is no need to log this error, as an ER_LOCK_DEADLOCK error is returned to the client. Reviewed-by: Jan Lindström <jan.lindstrom@mariadb.com>
* Merge branch '10.3' into 10.4Vladislav Vaintroub2021-09-113-16/+62
|\
| * Merge branch '10.2' into 10.3Vladislav Vaintroub2021-09-113-16/+62
| |\ | | | | | | | | | | | | | | | # Conflicts: # cmake/os/Windows.cmake # sql/sql_yacc.yy
| | * MDEV-26527 speedup appveyor build - 10.2st-10.2-wlad-appveyorVladislav Vaintroub2021-09-111-15/+24
| | |
| | * Bison 3.7 - fix "conversion from 'ptrdiff_t' to 'ulong', possible loss of data"Vladislav Vaintroub2021-09-112-4/+4
| | |
| | * Define minbuild target for 10.2Vladislav Vaintroub2021-09-111-0/+37
| | |
| | * Fix MYSQL_MAINTAINER_MODE=ERR, on Windows, with Ninja , in 10.2Vladislav Vaintroub2021-09-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | A conversion warning 4267 that we want to disable(prior to 10.3), was suppressed with cmake VS generator for C++ and C, despite being set only for CXX flags. The fix is to disable the warning in C flags, too. In 10.2, this warning is noisy, in 10.3 it is fixed.
* | | Merge 10.3 into 10.4Marko Mäkelä2021-09-116-7/+27
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2021-09-116-7/+27
| |\ \ | | |/
| | * Fix an occasional timeout in innodb.alter_partitionedMarko Mäkelä2021-09-112-0/+8
| | |
| | * MDEV-26537 InnoDB corrupts files due to incorrect st_blksize calculationMarko Mäkelä2021-09-103-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The st_blksize returned by fstat(2) is not documented to be a power of 2, like we assumed in commit 58252fff15acfe7c7b0452a87e202e3f8e454e19 (MDEV-26040). While on Linux, the st_blksize appears to report the file system block size (which hopefully is not smaller than the sector size of the underlying block device), on FreeBSD we observed st_blksize values that might have been something similar to st_size. Also IBM AIX was affected by this. A simple test case would lead to a crash when using the minimum innodb_buffer_pool_size=5m on both FreeBSD and AIX: seq -f 'create table t%g engine=innodb select * from seq_1_to_200000;' \ 1 100|mysql test& seq -f 'create table u%g engine=innodb select * from seq_1_to_200000;' \ 1 100|mysql test& We will fix this by not trusting st_blksize at all, and assuming that the smallest allowed write size (for O_DIRECT) is 4096 bytes. We hope that no storage systems with larger block size exist. Anything larger than 4096 bytes should be unlikely, given that it is the minimum virtual memory page size of many contemporary processors. MariaDB Server on Microsoft Windows was not affected by this. While the 512-byte sector size of the venerable Seagate ST-225 is still in widespread use, the minimum innodb_page_size is 4096 bytes, and innodb_log_file_size can be set in integer multiples of 65536 bytes. The only occasion where InnoDB uses smaller data file block sizes than 4096 bytes is with ROW_FORMAT=COMPRESSED tables with KEY_BLOCK_SIZE=1 or KEY_BLOCK_SIZE=2 (or innodb_page_size=4096). For such tables, we will from now on preallocate space in integer multiples of 4096 bytes and let regular writes extend the file by 1024, 2048, or 3072 bytes. The view INFORMATION_SCHEMA.INNODB_SYS_TABLESPACES.FS_BLOCK_SIZE should report the raw st_blksize. For page_compressed tables, the function fil_space_get_block_size() will map to 512 any st_blksize value that is larger than 4096. os_file_set_size(): Assume that the file system block size is 4096 bytes, and only support extending files to integer multiples of 4096 bytes. fil_space_extend_must_retry(): Round down the preallocation size to an integer multiple of 4096 bytes.
| | * Speedup build of the MSI packageVladislav Vaintroub2021-09-101-1/+1
| | |
* | | MDEV-25951 followup: Add #ifdef around debug codeMarko Mäkelä2021-09-111-1/+3
| | |
* | | MDEV-25951 followupEugene Kosov2021-09-101-4/+9
| | | | | | | | | | | | | | | | | | | | | FTS indexes has a prefix_len=1 or prefix_len=0 as stated by comment in mysql_prepare_create_table(). Thus, a newly added assertion should be relaxed for FTS indexes.
* | | Merge branch '10.3' into 10.4Sergei Golubchik2021-09-094-54/+55
|\ \ \ | |/ /
| * | Merge branch '10.2' into 10.3Sergei Golubchik2021-09-094-54/+55
| |\ \ | | |/
| | * fix main.truncate failures in --embeddedSergei Golubchik2021-09-094-54/+55
| | |
* | | post-merge fixSergei Golubchik2021-09-091-0/+2
| | |
* | | Merge remote-tracking branch 'upstream/10.3' into 10.4Vicențiu Ciorbaru2021-09-09170-2398/+4133
|\ \ \ | |/ /
| * | Merge branch '10.2' into 10.3Sergei Golubchik2021-09-072-11/+68
| |\ \ | | |/
| | * disable bzip2/lz4/lzo in rpm builds, distro dependentSergei Golubchik2021-09-071-0/+10
| | |
| | * disable bzip2/lz4/lzo in bintar builds, as they always have beenSergei Golubchik2021-09-071-0/+6
| | |
| | * MDEV-19227: mysql_plugin doesn't run bootstrap from sourceAnel Husakovic2021-09-071-11/+52
| | | | | | | | | | | | | | | Reviewed by: serg@mariadb.com daniel@mariadb.org
| * | Merge branch '10.2' into 10.3Vicențiu Ciorbaru2021-09-07169-2388/+4054
| |\ \ | | |/
| | * MDEV-25325 built-in documentation for performance_schema tablesHaidong Ji2021-09-07151-2377/+3867
| | | | | | | | | | | | | | | | | | Improve documentation of performance_schema tables by appending COLUMN comments to tables. Additionally improve test coverage and update corresponding tests.
| | * MDEV-23365: Assertion `!is_set() || (m_status == DA_OK_BULK && is_bulk_op())'bb-10.2-MDEV-23365Rucha Deodhar2021-09-063-1/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | failed upon killed TRUNCATE Note: This is a backport of 1cb4caa66d5fd2a9bc095d68988324b7b358d70f from 10.3 Analysis: Assertion failure happens because less session memory is set and so table can't be reopened. So the statement can't be used. This error goes unreported. Fix: Return the error state.
| | * disable cmake feature summary after the first runSergei Golubchik2021-09-061-1/+2
| | | | | | | | | | | | because the summary is incorrect after the first run anyway
| | * MDEV-12055 binlog.binlog_stm_ctype_ucs postfixDaniel Black2021-09-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As highlighted in https://bugs.gentoo.org/807995, people occasionaly run tests in the 20:00->23:59:59 time range. Fixes 265e3253f1e5218c8f85f1c412575069cb15f2c0 binlog.binlog_stm_ctype_ucs 'mix' w1 [ fail ] Test ended at 2021-08-11 22:55:35 CURRENT_TEST: binlog.binlog_stm_ctype_ucs --- /var/tmp/portage/dev-db/mariadb-10.5.11/work/mysql/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result 2021-06-18 18:19:11.000000000 +0800 +++ /var/tmp/portage/dev-db/mariadb-10.5.11/work/mysql/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.reject 2021-08-11 22:55:34.993447479 +0800 @@ -76,21 +76,21 @@ /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/; DELIMITER /*!*/; # at # -#YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX Start: binlog v 4, server v #.##.## created YYMMDD HH:MM:SS +#210811 22:55:34 server id # end_log_pos # CRC32 XXX Start: binlog v 4, server v #.##.## created 210811 22:55:34
| | * MDEV-26529: binlog.binlog_flush_binlogs_delete_domain fails on RISC-Vbb-10.2-danielblack-MDEV-26529-riscv-test-failDaniel Black2021-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per https://bugs.gentoo.org/807995 The test failed with: CURRENT_TEST: binlog.binlog_flush_binlogs_delete_domain — /tmp/mariadb-10.5.11/mysql-test/suite/binlog/r/binlog_flush_binlogs_delete_domain.result 2021-06-18 18:19:11.000000000 +0800 +++ /tmp/mariadb-10.5.11/mysql-test/suite/binlog/r/binlog_flush_binlogs_delete_domain.reject 2021-09-01 22:55:29.406655479 +0800 @@ -85,6 +85,6 @@ ERROR HY000: The value of gtid domain being deleted ('4294967296') exceeds its maximum size of 32 bit unsigned integer FLUSH BINARY LOGS DELETE_DOMAIN_ID = (4294967295); Warnings: -Warning 1076 The gtid domain being deleted ('4294967295') is not in the current binlog state +Warning 1076 The gtid domain being deleted ('18446744073709551615') is not in the current binlog state DROP TABLE t; RESET MASTER; mysqltest: Result length mismatch ptr_domain_id is a uint32* so explicitly cast this when printing it out. Thanks Marek Szuba for the bug report and testing the patch.
| | * MDEV-26518 ; Galera incorrectly handles primary or unique keys with any ↵bb-10.2-MDEV-26517Jan Lindström2021-09-025-1/+110
| | | | | | | | | | | | | | | | | | | | | multi-byte character set We need to set temporary buffer large enough to fit also multi-byte characters.
| | * MDEV-26517 : Galera test failure on galera_fk_cascade_delete_debugJan Lindström2021-09-021-1/+1
| | | | | | | | | | | | | | | Move --error on --reap where it belongs and take a account that there could be different return codes.
| | * MDEV-26521 Remove mdev-504.testVladislav Vaintroub2021-09-013-105/+0
| | | | | | | | | | | | | | | | | | | | | | | | This stress tests fails on not sufficiently tweaked windows boxes,due to rapid succession of connects and disconnects, making Windows run out of ephemeral ports. Approved by author of the test (the author is happy to see it removed)
| | * Fix potential null pointer access after the allocation errorVladislav Vaintroub2021-09-011-0/+2
| | |
| | * Cleanup - remove confusing comment.Vladislav Vaintroub2021-09-011-1/+0
| | |
| | * MDEV-26514 Option to build a separate test zip package on WindowsElena Stepanova2021-09-011-1/+1
| | | | | | | | | | | | echo is needed for the tests
| | * MDEV-26514 Option to build a separate test zip package on WindowsElena Stepanova2021-08-312-0/+12
| | | | | | | | | | | | Add a possibility to run MTR tests on a release zip
| | * disable bzip2, lzma, and lzo explicitly in debian release buildsSergei Golubchik2021-08-311-0/+4
| | | | | | | | | | | | | | | | | | we don't build debian release builds with them anyway, but let's make it explicit, independently on what happens to be installed on the builder.
| * | MDEV-26362: incorrect nest_level value with INTERSECTbb-10.3-MDEV-26362Oleksandr Byelkin2021-09-052-2/+11
| | | | | | | | | | | | | | | Add DBUG_ASSERT (should be kept in merge) Fix nest_level assignment in LEX::add_unit_in_brackets (should be ignored in merge to 10.4)
* | | MDEV-25951 MariaDB crash after ALTER TABLE convert to utf8mb4bb-10.4-MDEV-25951-instant-utfEugene Kosov2021-09-086-3/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug happens when partially indexed CHAR or VARCHAR field in converted from utf8mb3 to utf8mb4. Fixing by relaxing assertions. For some time dict_index_t and dict_table_t are becoming not synchronized. Namely, dict_index_t has a new prefix_len which is a multiple of a user-provided length and charset->mbmaxlen. But the table still have and old mbmaxlen and assertion fails. This happens only during utf8mb3 -> utf8mb4 conversions and the magic number 4 comes from utf8mb_4_. At the end of ALTER TABLE (innobase_rename_or_enlarge_columns_cache()) dict_index_t and dict_table_t became synchronized again and will stay so at all times. For, example, they will be synchronized on table load and newly added assertion proves that.
* | | MDEV-26503 : galera_3nodes.galera_wsrep_schema MTR failed: mysql_shutdown failedbb-10.4-MDEV-26502Jan Lindström2021-09-072-55/+41
| | | | | | | | | | | | Add wait conditions and clean up.
* | | MDEV-26502 : galera.galera_applier_ftwrl_table_alter MTR failed : Result ↵Jan Lindström2021-09-071-2/+7
| | | | | | | | | | | | | | | | | | content mismatch Add wait conditions and remove unnecessary sleep.
* | | Update wsrep-lib submodulebb-10.4-MDEV-25718Jan Lindström2021-09-061-0/+0
| | |
* | | MDEV-25718 Assertion `transaction.is_streaming()' failedDaniele Sciascia2021-09-064-1/+109
| | | | | | | | | | | | | | | | | | | | | * Update wsrep-lib which contains the fix * Add deterministic test case that reproduces the assertion Reviewed-by: Jan Lindström <jan.lindstrom@mariadb.com>
* | | MDEV-26487 cpack rpm failed to build packages with cmake < 3.7.0Sergei Golubchik2021-08-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | buggy regexp in old CPackRPM.cmake: string(REGEX REPLACE "%[A-Za-z0-9\(\),-]* " "" F_PATH ${F}) string(REGEX MATCH "%[A-Za-z0-9\(\),-]*" F_PREFIX ${F}) it treats everything after the first space as a path
* | | Merge 10.3 into 10.4Marko Mäkelä2021-08-3117-49/+80
|\ \ \ | |/ /