summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-25114 Crash: WSREP: invalid state ROLLED_BACK (FATAL)bb-10.3-MDEV-25114sjaakola2021-09-1718-156/+771
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is the plan D variant for fixing potetial mutex locking order exercised by BF aborting and KILL command execution. In this approach, KILL command is replicated as TOI operation. This guarantees total isolation for the KILL command execution in the first node: there is no concurrent replication applying and no concurrent DDL executing. Therefore there is no risk of BF aborting to happen in parallel with KILL command execution either. Potential mutex deadlocks between the different mutex access paths with KILL command execution and BF aborting cannot therefore happen. TOI replication is used, in this approach, purely as means to provide isolated KILL command execution in the first node. KILL command should not (and must not) be applied in secondary nodes. In this patch, we make this sure by skipping KILL execution in secondary nodes, in applying phase, where we bail out if applier thread is trying to execute KILL command. This is effective, but skipping the applying of KILL command could happen much earlier as well. This patch also fixes mutex locking order and unprotected THD member accesses on bf aborting case. We try to hold THD::LOCK_thd_data during bf aborting. Only case where it is not possible is at wsrep_abort_transaction before call wsrep_innobase_kill_one_trx where we take InnoDB mutexes first and then THD::LOCK_thd_data. This will also fix possible race condition during close_connection and while wsrep is disconnecting connections. Added wsrep_bf_kill_debug test case Reviewed-by: Jan Lindström <jan.lindstrom@mariadb.com>
* Revert "MDEV-23328 Server hang due to Galera lock conflict resolution"Jan Lindström2021-09-162-111/+75
| | | | This reverts commit 29bbcac0ee841faaa68eeb09c86ff825eabbe6b6.
* Fix Connect build with MSVC+NinjaVladislav Vaintroub2021-09-111-0/+1
|
* 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.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
| |
* | Merge branch '10.2' into 10.3Sergei Golubchik2021-09-094-54/+55
|\ \ | |/
| * fix main.truncate failures in --embeddedSergei Golubchik2021-09-094-54/+55
| |
* | 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)
* | Merge 10.2 into 10.3Marko Mäkelä2021-08-3111-35/+40
|\ \ | |/
| * MDEV-26504 THD::copy_db_to() fails to return true if THD::db is nullMarko Mäkelä2021-08-301-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | THD::copy_db_to(): Always return true if the output parameter was left uninitialized. This fixes a regression that was caused by commit 7d0d934ca642e485b2c008727dc20c83e26cce10 (MDEV-16473). MariaDB Server 10.3 and later were unaffected by this bug thanks to commit a7e352b54ddfaf91c92951d605cb02a4ffd2676b. Possibly this bug only affects mysql_list_fields() in the Embedded Server (libmysqld). This bug was found by GCC 11.2.0 in CMAKE_BUILD_TYPE=RelWithDebInfo.
| * Fix GCC 11 -Wmaybe-uninitialized for PLUGIN_PERFSCHEMAMarko Mäkelä2021-08-304-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | init_mutex_v1_t: Stop lying that the mutex parameter is const. GCC 11.2.0 assumes that it is and could complain about any mysql_mutex_t being uninitialized even after mysql_mutex_init() as long as PLUGIN_PERFSCHEMA is enabled. init_rwlock_v1_t, init_cond_v1_t: Remove untruthful const qualifiers. Note: init_socket_v1_t is expecting that the socket fd has already been created before PSI_SOCKET_CALL(init_socket), and therefore that parameter really is being treated as a pointer to const.
| * Update libmariadbMarko Mäkelä2021-08-301-0/+0
| |
| * mtr: fix the check where a combination is pre-selectedSergei Golubchik2021-08-292-17/+11
| | | | | | | | | | | | | | | | | | if all options from a combination from the combinations file are already present in the server's list of options, then don't try to run tests in other combinations from this file. old behavior was: if at least one option from a combination is already present in the list...
| * typo fixedSergei Golubchik2021-08-261-1/+1
| |
| * rocksdb: disable on arm64 except for LinuxDaniel Black2021-08-261-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Theodore Brockman on Zulip for noticing on an OSX ARM64 and testing this patch. Per https://github.com/google/cpu_features/pull/150/files CMAKE_SYSTEM_PROCESSOR is arm64 on Apple. Without this, compulation error: [ 80%] Building CXX object storage/rocksdb/CMakeFiles/rocksdblib.dir/rocksdb/util/crc32c.cc.o /mariadb/storage/rocksdb/rocksdb/util/crc32c.cc:500:18: error: use of undeclared identifier 'isSSE42' has_fast_crc = isSSE42(); ^ /mariadb/storage/rocksdb/rocksdb/util/crc32c.cc:1230:7: error: use of undeclared identifier 'isSSE42' if (isSSE42()) { ^ /mariadb/storage/rocksdb/rocksdb/util/crc32c.cc:1231:9: error: use of undeclared identifier 'isPCLMULQDQ' if (isPCLMULQDQ()) { ^ This can be reverted when the RocksDB submodule is updated. https://github.com/facebook/rocksdb/commit/ee4bd4780b321ddb5f92a0f4eb956f2a2ebd60dc
| * Remove FLUSH PRIVILEGES from mysql_setpermissionMarek Kulik2021-08-251-1/+0
| | | | | | | | FLUSH PRIVILEGES hasn't been needed for very many years.
| * Fix mysql_setpermission hostname logicMarek Kulik2021-08-251-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | Changes: - Don't include port in connection parameters with 'localhost' hostname More info: The hostname, if not specified or specified as '' or 'localhost', will default to a MySQL server running on the local machine using the default for the UNIX socket. To connect to a MySQL server on the local machine via TCP, you must specify the loopback IP address (127.0.0.1) as the host. Reported issue: https://bugzilla.redhat.com/show_bug.cgi?id=1976224
* | MDEV 22785 Crash with prepared statements and NEXTVAL()Michael Widenius2021-08-264-6/+38
| | | | | | | | | | | | | | | | The problem was that a PREARE followed by a non prepared statement using DEFAULT NEXT_VALUE() could change table->next_local to point to a not persitent memory aria. The next EXECUTE would then try to use the wrong pointer, which could cause a crash. Fixed by reseting the pointer to it's old value when doing EXECUTE.
* | Fixed failing maria.repair testMichael Widenius2021-08-262-7/+2
| | | | | | | | | | | | | | Backported patch from MariaDB 10.6 The issue was that the using session_mem_used to break a test does not guarantee where the test breaks, which gives different results depending on the environment or how MariaDB is compield.
* | Merge 10.2 into 10.3Marko Mäkelä2021-08-251-1/+5
|\ \ | |/
| * MDEV-26109: s390x detected as 32bit in mtr testsDaniel Black2021-08-251-1/+5
| | | | | | | | | | | | | | | | | | | | Currently @@version_compile_machine is used by mtr to determine if the compiled executable is 32 or 64 bits. We extend that logic by ensuring that if the DEFAUT_MACHINE name doesn't have "64" in its string, "-64bits" is appended to ensure these test pass.
* | Fixed compile errors when compiling with HAVE_valgrindMichael Widenius2021-08-243-6/+6
| |
* | MDEV-26465 Race condition in trx_purge_rseg_get_next_history_log()st-10.3-markoMarko Mäkelä2021-08-231-2/+3
| | | | | | | | | | | | | | | | | | | | trx_purge_rseg_get_next_history_log(): Fix a race condition that was introduced in commit e46f76c9749d7758765ba274a212cfc2dcf3eeb8 (MDEV-15912). The buffer pool page contents must not be accessed while not holding a page latch. The page latch was released by mtr_t::commit(). This race resulted in an ASAN heap-use-after-poison during a stress test.
* | Merge 10.2 into 10.3Marko Mäkelä2021-08-233-6/+2
|\ \ | |/
| * Disable 2 commonly failing innodb_gis testsMarko Mäkelä2021-08-231-0/+2
| |