summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | MDEV-22775: Merge 10.4 into 10.5Marko Mäkelä2021-04-0815-123/+340
|\ \ \ \ | |/ / /
| * | | MDEV-22775 [HY000][1553] Changing name of primary key column with foreign ↵Alexander Barkov2021-04-0712-118/+338
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | key constraint fails. Problem: The problem happened because of a conceptual flaw in the server code: a. The table level CHARSET/COLLATE clause affected all data types, including numeric and temporal ones: CREATE TABLE t1 (a INT) CHARACTER SET utf8 [COLLATE utf8_general_ci]; In the above example, the Column_definition_attributes (and then the FRM record) for the column "a" erroneously inherited "utf8" as its character set. b. The "ALTER TABLE t1 CONVERT TO CHARACTER SET csname" statement also erroneously affected Column_definition_attributes::charset for numeric and temporal data types and wrote "csname" as their character set into FRM files. So now we have arbitrary non-relevant charset ID values for numeric and temporal data types in all FRM files in the world :) The code in the server and the other engines did not seem to be affected by this flaw. Only InnoDB inplace ALTER was affected. Solution: Fixing the code in the way that only character string data types (CHAR,VARCHAR,TEXT,ENUM,SET): - inherit the table level CHARSET/COLLATE clause - get the charset value according to "CONVERT TO CHARACTER SET csname". Numeric and temporal data types now always get &my_charset_numeric in Column_definition_attributes::charset and always write its ID into FRM files: - no matter what the table level CHARSET/COLLATE clause is, and - no matter what "CONVERT TO CHARACTER SET" says. Details: 1. Adding helper classes to pass small parts of HA_CREATE_INFO into Type_handler methods: - Column_derived_attributes - to pass table level CHARSET/COLLATE, so columns that do not have explicit CHARSET/COLLATE clauses can derive them from the table level, e.g. CREATE TABLE t1 (a VARCHAR(1), b CHAR(1)) CHARACTER SET utf8; - Column_bulk_alter_attributes - to pass bulk attribute changes generated by the ALTER related code. These bulk changes affect multiple columns at the same time: ALTER TABLE ... CONVERT TO CHARACTER SET csname; Note, passing the whole HA_CREATE_INFO directly to Type_handler would not be good: HA_CREATE_INFO is huge and would need not desired dependencies in sql_type.h and sql_type.cc. The Type_handler API should use smallest possible data types! 2. Type_handler::Column_definition_prepare_stage1() is now responsible to set Column_definition::charset properly, according to the data type, for example: - For string data types, Column_definition_attributes::charset is set from the table level CHARSET/COLLATE clause (if not specified explicitly in the column definition). - For numeric and temporal fields, Column_definition_attributes::charset is set to &my_charset_numeric, no matter what the table level CHARSET/COLLATE says. - For GEOMETRY, Column_definition_attributes::charset is set to &my_charset_bin, no matter what the table level CHARSET/COLLATE says. Previously this code (setting `charset`) was outside of of Column_definition_prepare_stage1(), namely in mysql_prepare_create_table(), and was erroneously called for all data types. 3. Adding Type_handler::Column_definition_bulk_alter(), to handle "ALTER TABLE .. CONVERT TO". Previously this code was inside get_sql_field_charset() and was erroneously called for all data types. 4. Removing the Schema_specification_st parameter from Type_handler::Column_definition_redefine_stage1(). Column_definition_attributes::charset is now fully properly initialized by Column_definition_prepare_stage1(). So we don't need access to the table level CHARSET/COLLATE clause in Column_definition_redefine_stage1() any more. 5. Other changes: - Removing global function get_sql_field_charset() - Moving the part of the former get_sql_field_charset(), which was responsible to inherit the table level CHARSET/COLLATE clause to new methods: -- Column_definition_attributes::explicit_or_derived_charset() and -- Column_definition::prepare_charset_for_string(). This code is only needed for string data types. Previously it was erroneously called for all data types. - Moving another part, which was responsible to apply the "CONVERT TO" clause, to Type_handler_general_purpose_string::Column_definition_bulk_alter(). - Replacing the call for get_sql_field_charset() in sql_partition.cc to sql_field->explicit_or_derived_charset() - it is perfectly enough. The old code was redundant: get_sql_field_charset() was called from sql_partition.cc only when there were no a "CONVERT TO CHARACTER SET" clause involved, so its purpose was only to inherit the table level CHARSET/COLLATE clause. - Moving the code handling the BINCMP_FLAG flag from mysql_prepare_create_table() to Column_definition::prepare_charset_for_string(): This code is responsible to resolve the BINARY comparison style into the corresponding _bin collation, to do the following transparent rewrite: CREATE TABLE t1 (a VARCHAR(10) BINARY) CHARSET utf8; -> CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf8 COLLATE utf8_bin); This code is only needed for string data types. Previously it was erroneously called for all data types. 6. Renaming Table_scope_and_contents_source_pod_st::table_charset to alter_table_convert_to_charset, because the only purpose it's used for is handlering "ALTER .. CONVERT". The new name is much more self-descriptive.
* | | | Merge 10.4 into 10.5Marko Mäkelä2021-04-0820-31/+653
|\ \ \ \ | |/ / /
| * | | MDEV-19508: SI_KERNEL is not on all implementationsbb-10.4-danielblack-MDEV-19508-minimal-compile-fixDaniel Black2021-04-072-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | SI_USER is, however in FreeBSD there are a couple of non-kernel user signal infomations above SI_KERNEL. Put a fallback just in case there is nothing available.
| * | | MDEV-21402 : sql_safe_updates breaks Galera 4bb-10.4-MDEV-21402Jan Lindström2021-04-064-5/+188
| | | | | | | | | | | | | | | | | | | | Added handling for sql_safe_updated i.e. we disable it while we do wsrep_schema operations.
| * | | MDEV-24956: ALTER TABLE not replicated with Galera in MariaDB 10.5.9bb-10.4-MDEV-25226mkaruza2021-04-055-6/+269
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `WSREP_CLIENT` is used as condition for starting ALTER/OPTIMIZE/REPAIR TOI. Using this condition async replicated affected DDL's will not be replicated. Fixed by removing this condition. Reviewed-by: Jan Lindström <jan.lindstrom@mariadb.com>
| * | | MDEV-25226 Assertion when wsrep_on set OFF with SR transactionDaniele Sciascia2021-04-0510-19/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes the following changes around variable wsrep_on: 1) Variable wsrep_on can no longer be updated from a session that has an active transaction running. The original behavior allowed cases like this: BEGIN; INSERT INTO t1 VALUES (1); SET SESSION wsrep_on = OFF; INSERT INTO t1 VALUES (2); COMMIT; With regular transactions this would result in no replication events (not even value 1). With streaming replication it would be unnecessarily complex to achieve the same behavior. In the above example, it would be possible for value 1 to be already replicated if it happened to fill a separate fragment, while value 2 wouldn't. 2) Global variable wsrep_on no longer affects current sessions, only subsequent ones. This is to avoid a similar case to the above, just using just by using global wsrep_on instead session wsrep_on: --connection conn_1 BEGIN; INSERT INTO t1 VALUES(1); --connection conn_2 SET GLOBAL wsrep_on = OFF; --connection conn_1 INSERT INTO t1 VALUES(2); COMMIT; The above example results in the transaction to be replicated, as global wsrep_on will only affect the session wsrep_on of new connections. Reviewed-by: Jan Lindström <jan.lindstrom@mariadb.com>
| * | | MDEV-17913 Encrypted transactional Aria tables remain corrupt after crash ↵Monty2021-04-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery, automatic repairment does not work This was because of a wrong test in encryption code that wrote random numbers over the LSN for pages for transactional Aria tables during repair. The effect was that after an ALTER TABLE ENABLE KEYS of a encrypted recovery of the tables would not work. The test cases will be pushed into 10.5 as it requires of several changes to check table that safer not to backport.
* | | | MDEV-17913 Encrypted transactional Aria tables remain corrupt after crash ↵Monty2021-04-0613-48/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recovery, automatic repairment does not work This was because of a wrong test in encryption code that wrote random numbers over the LSN for pages for transactional Aria tables during repair. The effect was that after an ALTER TABLE ENABLE KEYS of a encrypted recovery of the tables would not work. Fixed by changing testing of !share->now_transactional to !share->base.born_transactional. Other things: - Extended Aria check_table() to check for wrong (= too big) LSN numbers. - If check_table() failed just because of wrong LSN or TRN numbers, a following repair table will just do a zerofill which is much faster. - Limit number of LSN errors in one check table to MAX_LSN_ERROR (10). - Removed old obsolete test of 'if (error_count & 2)'. Changed error_count and warning_count from bits to numbers of errors/warnings as this is more useful.
* | | | MDEV-25313: Assertion pending==log_requests.start... failedMarko Mäkelä2021-04-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | log_flush_notify(): Restore the reload of log_requests.start that was accidentally removed in commit 8c2e3259c13d1d0a494fb3f9c1e5fb780a193ab1. Thanks to Elena Stepanova for a test case (repeatedly running FLUSH LOGS concurrently with InnoDB write transactions).
* | | | MDEV-25072: Livelock due to innodb_change_buffering_debugMarko Mäkelä2021-03-311-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buf_page_get_low(): Do not try to re-evict the page if it is multiply buffer-fixed. In commit 7cffb5f6e8a231a041152447be8980ce35d2c9b8 (MDEV-23399) a livelock was introduced. If multiple threads are concurrently requesting the same secondary index leaf page in buf_page_get_low() and innodb_change_buffering_debug is set, all threads would try to evict the page in a busy loop, never succeeding because the block is buffer-fixed by other threads. Thanks to Roel Van de Paar for reporting the original failure and Elena Stepanova for producing an "rr replay" trace.
* | | | Merge 10.4 into 10.5Marko Mäkelä2021-03-3137-941/+880
|\ \ \ \ | |/ / /
| * | | MDEV-15527 fixup for innodb_checksum_algorithm=full_crc32Marko Mäkelä2021-03-313-17/+38
| | | |
| * | | Merge 10.3 into 10.4Marko Mäkelä2021-03-3135-947/+866
| |\ \ \ | | |/ /
| | * | Merge 10.2 into 10.3Marko Mäkelä2021-03-3135-962/+873
| | |\ \ | | | |/
| | | * MDEV-25294 signal handler display coredump on macDavid CARLIER2021-03-301-1/+13
| | | |
| | | * MDEV-25200 Index count mismatch due to aborted FULLTEXT INDEXThirunarayanan Balathandayuthapani2021-03-303-0/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Aborting of fulltext index creation fails to remove the index from sys indexes table. When we try to reload the table definition, InnoDB fails with index count mismatch error. InnoDB should remove the index from sys indexes while rollbacking the secondary index creation.
| | | * MDEV-15527 page_compressed compressed page partially during import tablespaceThirunarayanan Balathandayuthapani2021-03-301-1/+1
| | | | | | | | | | | | | | | | - Post push to address 32-bit build failure.
| | | * Add missing have_perfschema.incMarko Mäkelä2021-03-302-0/+2
| | | |
| | | * MDEV-15527 page_compressed compressed page partially during import tablespacebb-10.2-MDEV-15527Thirunarayanan Balathandayuthapani2021-03-301-11/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Importing table operation fails to punch the hole in the filesystem when page compressed table is involved. To achieve that, InnoDB firstly punches the hole for the IOBuffer size(1MB). After that, InnoDB should write page by page when page compression is involved.
| | | * Add supression for warning.Jan Lindström2021-03-302-0/+3
| | | |
| | | * MDEV-24923 : Port selected Galera conflict resolution changes from 10.6Jan Lindström2021-03-303-121/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add condition on trx->state == TRX_STATE_COMMITTED_IN_MEMORY in order to avoid unnecessary work. If a transaction has already been committed or rolled back, it will release its locks in lock_release() and let the waiting thread(s) continue execution. Let BF wait on lock_rec_has_to_wait and if necessary other BF is replayed. wsrep_trx_order_before If BF is not even replicated yet then they are ordered correctly. bg_wsrep_kill_trx Make sure victim_trx is found and check also its state. If state is TRX_STATE_COMMITTED_IN_MEMORY transaction is already committed or rolled back and will release it locks soon. wsrep_assert_no_bf_bf_wait Transaction requesting new record lock should be TRX_STATE_ACTIVE Conflicting transaction can be in states TRX_STATE_ACTIVE, TRX_STATE_COMMITTED_IN_MEMORY or in TRX_STATE_PREPARED. If conflicting transaction is already committed in memory or prepared we should wait. When transaction is committed in memory we held trx mutex, but not lock_sys->mutex. Therefore, we could end here before transaction has time to do lock_release() that is protected with lock_sys->mutex. lock_rec_has_to_wait We very well can let bf to wait normally as other BF will be replayed in case of conflict. For debug builds we will do additional sanity checks to catch unsupported bf wait if any. wsrep_kill_victim Check is victim already in TRX_STATE_COMMITTED_IN_MEMORY state and if it is we can return. lock_rec_dequeue_from_page lock_rec_unlock Remove unnecessary wsrep_assert_no_bf_bf_wait function calls. We can very well let BF wait here.
| | | * remove broken tests/grant.plDaniel Black2021-03-301-750/+0
| | | |
| | | * mallinfo2: whitespace fixDaniel Black2021-03-301-1/+1
| | | |
| | | * Windows - suppress nonsensical(for this OS) system check.Vladislav Vaintroub2021-03-301-0/+1
| | | | | | | | | | | | | | | | Amends 48141f3c1787de941d969ad1e6675611b2b650c2
| | | * MDEV-24586: remove mysql_to_mariadb.sqlbb-10.2-MDEV-24586-danielblack-remove-mysql_to_mariadb.sqlDaniel Black2021-03-302-23/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This script is unused and unmaintained. The logic is implemented in scripts/mysql_system_tables_fix.sql that forms part of mysql_upgrade Its components: alter table mysql.user drop column `password_last_changed`, drop column `password_lifetime`, drop column `account_locked`; has a friendlier migration path coming MDEV-24122 alter table mysql.user change column `authentication_string` `auth_string` text COLLATE utf8_bin NOT NULL; Already part of scripts/mysql_system_tables_fix.sql alter table mysql.user add column `Password` char(41) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '' after `user`, add column `is_role` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N' after `auth_string`; alter table mysql.user add column `default_role` char(80) COLLATE utf8_bin NOT NULL DEFAULT '', add column `max_statement_time` decimal(12,6) NOT NULL DEFAULT '0.000000'; corrected in MDEV-23201 to be in the right order. update mysql.user set `password`=`auth_string`, plugin='' where plugin="mysql_native_password"; Is handled in server in the function acl_load.
| | | * Don't pass password to innobackup via command line, use environment insteadbb-10.2-codership-cmd-line-pswdAlexey Yurchenko2021-03-292-6/+6
| | | | | | | | | | | | | | | | Signed-off-by: Julius Goryavsky <julius.goryavsky@mariadb.com>
| | | * MDEV-25457 CREATE / DROP PROCEDURE not logged with audit plugin.Alexey Botchkov2021-03-293-5/+26
| | | | | | | | | | | | | | | | CREATE/DROP PROCEDIRE/FUNCTION is now treated as DDL.
| | | * MDEV-25240 minor upgrade does not perform server restartbb-10.2-MDEV-25240Alexey Bychko2021-03-291-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | we need to stop server instance on upgrade, but it may be started either by SysV init script or by SystemD. this commit adds `mysql` target to `systemctl stop` call. `mysql` may be the name of initscript or an alias while `mariadb` is a systemd unit file.
| | | * MDEV-13467: Feature request: Support for ST_Distance_Sphere()bb-10.2-anel-MDEV-13467-gis-feature-v1Anel Husakovic2021-03-271-2/+2
| | | | | | | | | | | | | | | | | | | | - jump to label ‘handle_errors’ can enter to the scope of non-POD ‘Geometry_buffer buffer2’
| | | * MDEV-25272: Wrong function name in error messages upon ST_GeomFromGeoJSON callAnel Husakovic2021-03-272-4/+4
| | | | | | | | | | | | | | | | - Invalid function name during ER_WRONG_VALUE_FOR_TYPE and ER_GIS_INVALID_DATA
| | | * MDEV-13467: Feature request: Support for ST_Distance_Sphere()Anel Husakovic2021-03-2714-39/+598
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Cherry-pick 51e48b9f8981 - vscode gitignore - Thanks Robin Dupret for the review. Reviewed by:daniel@mariadb.org holyfoot@mariadb.com
| | * | MDEV-25457 CREATE / DROP PROCEDURE not logged with audit plugin.Alexey Botchkov2021-03-273-5/+24
| | | | | | | | | | | | | | | | CREATE/DROP PROCEDIRE/FUNCTION is now treated as DDL.
* | | | MDEV-25305: MyRocks: Killing server during RESET MASTER can lose last ↵bb-10.5-mdev25305Sergei Petrunia2021-03-314-1/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transactions rocksdb_checkpoint_request() should call FlushWAL(sync=true) (which does write-out and sync), not just SyncWAL() (which just syncs without writing out) Followup: the test requires debug sync facility (This is a backport to 10.5)
* | | | MDEV-25251: main.derived_split_innodb fails on ICC release binarybb-10.5-mdev25251-v2Sergei Petrunia2021-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The code compares two query plans with identical costs, the plan with lateral is the same as one without. Introduce a small difference to cost numbers to prefer non-lateral plan in this case.
* | | | MDEV-24630: MY_RELAX_CPU assembly instruction upgrade/research forKrunal Bauskar2021-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |             memory barrier on ARM As suggested in the said JIRA ticket based on the contribution done by the community (in an attempt to optimize the spin-loop) the said approach was evaluated against MariaDB Server 10.5 and found to help improve throughput in the range of 2-5%. Note: 10.6 timing graph and model are different as home-brew mutexes are replaced with pthread mutexes. Said patch has mixed impact on 10.6 so not recommended for 10.6.
* | | | MDEV-24302 follow-up: RESET MASTER hangsbb-10.5-MDEV-24302Marko Mäkelä2021-03-307-69/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As pointed out by Andrei Elkin, the previous fix did not fix one race condition that may have caused the observed hang. innodb_log_flush_request(): If we are enqueueing the very first request at the same time the log write is being completed, we must ensure that a near-concurrent call to log_flush_notify() will not result in a missed notification. We guarantee this by release-acquire operations on log_requests.start and log_sys.flushed_to_disk_lsn. log_flush_notify_and_unlock(): Cleanup: Always release the mutex. log_sys_t::get_flushed_lsn(): Use acquire memory order. log_sys_t::set_flushed_lsn(): Use release memory order. log_sys_t::set_lsn(): Use release memory order. log_sys_t::get_lsn(): Use relaxed memory order by default, and allow the caller to specify acquire memory order explicitly. Whenever the log_sys.mutex is being held or when log writes are prohibited during startup, we can use a relaxed load. Likewise, in some assertions where reading a stale value of log_sys.lsn should not matter, we can use a relaxed load. This will cause some additional instructions to be emitted on architectures that do not implement Total Store Ordering (TSO), such as POWER, ARM, and RISC-V Weak Memory Ordering (RVWMO).
* | | | Deb: Fix failing Salsa-CI by syncing fixes from downstream to upstreamOtto Kekäläinen2021-03-291-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes jobs: - mysql-8.0 Sid to mariadb-10.5 upgrade - mariadb.org-10.5 to mariadb-10.5 upgrade Downstream source: https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/8db0e530872fea258e87533349fa83568eeed02d
* | | | Deb: Add Breaks/ReplacesOtto Kekäläinen2021-03-292-29/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the following Breaks/Replaces errors detected by Salsa-CI: [ERROR] mariadb-server-10.5 conflicts with mysql-client-core-8.0 files: {'/usr/bin/myisam_ftdump', '/usr/share/man/man1/myisam_ftdump.1.gz'} [ERROR] mariadb-server-10.5 conflicts with mysql-server-core-8.0 files: {'/usr/share/man/man1/mysqlbinlog.1.gz', '/usr/share/man/man1/myisamlog.1.gz', '/usr/share/man/man1/mysql_tzinfo_to_sql.1.gz', '/usr/share/man/man1/perror.1.gz', '/usr/share/man/man1/myisampack.1.gz', '/usr/bin/mysqld_safe', '/usr/share/man/man1/myisamchk.1.gz', '/usr/bin/myisamchk', '/usr/bin/mysql_secure_installation', '/usr/bin/mysqld_multi', '/usr/bin/mysql_tzinfo_to_sql', '/usr/bin/perror', '/usr/share/man/man1/mysqld_multi.1.gz', '/usr/bin/myisampack', '/usr/share/man/man1/mysqld_safe.1.gz', '/usr/bin/myisamlog', '/usr/share/man/man1/mysql_secure_installation.1.gz', '/usr/bin/mysqlbinlog'} [ERROR] mariadb-test conflicts with mysql-server-core-8.0 files: {'/usr/lib/mysql/plugin/adt_null.so', '/usr/lib/mysql/plugin/mypluglib.so'} Upstreamed from Debian packaging commits: https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/9b6a67b53c2adf1bb5497d8649eb079767419835 https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/f6d5545a0241de2cda81c878a157517b83378c04 Also: - remove excess '<< ${source:Version}' on mysql-client-* and mysql-server-* - move more packages to Conflicts as it is semantically more correct than having those packages in Replaces
* | | | Revert "MDEV-23342 MariaDB cannot be installed over MySQL 5.7.30 on Bionic ↵Otto Kekäläinen2021-03-291-30/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | anymore" This reverts commit 44885273f2cffd3b269fb18b0c369b343d9de512. Reverting this commit is necessary to fix missing-breaks errors in the Debian packaging. The original fix was also not entirely necessary as a fix to the original problem. Partially also reverts commit e7c7f5c1bbac9a081775a1dc50088ae1e32e2a8d where this unsorted debian/control file was sorted.
* | | | MDEV-24302: RESET MASTER hangsMarko Mäkelä2021-03-299-165/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with MariaDB 10.5, roughly after MDEV-23855 was fixed, we are observing sporadic hangs during the execution of the RESET MASTER statement. We are hoping to fix the hangs with these changes, but due to the rather infrequent occurrence of the hangs and our inability to reliably reproduce the hangs, we cannot be sure of this. What we do know is that innodb_force_recovery=2 (or a larger setting) will prevent srv_master_callback (the former srv_master_thread) from running. In that mode, periodic log flushes would never occur and RESET MASTER could hang indefinitely. That is demonstrated by the new test case that was developed by Andrei Elkin. We fix this case by implementing a special case for it. This also includes some code cleanup and renames of misleadingly named code. The interface has nothing to do with log checkpoints in the storage engine; it is only about requesting log writes to be persistent. handlerton::commit_checkpoint_request, commit_checkpoint_notify_ha(): Remove the unused parameter hton. log_requests.start: Replaces pending_checkpoint_list. log_requests.end: Replaces pending_checkpoint_list_end. log_requests.mutex: Replaces pending_checkpoint_mutex. log_flush_notify_and_unlock(), log_flush_notify(): Replaces innobase_mysql_log_notify(). The new implementation should be functionally equivalent to the old one. innodb_log_flush_request(): Replaces innobase_checkpoint_request(). Implement a fast path for common cases, and reduce the mutex hold time. POSSIBLE FIX OF THE HANG: We will invoke commit_checkpoint_notify_ha() for the current request if it is already satisfied, as well as invoke log_flush_notify_and_unlock() for any satisfied requests. log_write(): Invoke log_flush_notify() when the write is already durable. This was missing WITH_PMEM when the log is in persistent memory. Reviewed by: Vladislav Vaintroub
* | | | Fixed access to undefined memoryMonty2021-03-281-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | alloc_query() is examined the content of it's argument, which was uninitalized. Fixed by storing stmt_id in llbuf, according to code comments.
* | | | Merge 10.4 into 10.5Marko Mäkelä2021-03-2761-633/+906
|\ \ \ \ | |/ / /
| * | | Merge 10.3 into 10.4Marko Mäkelä2021-03-2754-624/+701
| |\ \ \ | | |/ /
| | * | Merge 10.2 into 10.3Marko Mäkelä2021-03-2747-608/+349
| | |\ \ | | | |/
| | | * Replace mallinfo with mallinfo2 on supported systemsMichael Okoko2021-03-273-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `mallinfo` is deprecated since glibc 2.33 and has been replaced by mallinfo2. The deprecation causes building the server to fail if glibc version is > 2.33. Check if mallinfo2 exist on the system and use it instead.
| | | * cmake cleanup: drop support for ancient clang in WITH_ASAN optionEugene Kosov2021-03-261-10/+0
| | | |
| | | * MDEV-25238 add support for -fsanitize-address-use-after-scopeEugene Kosov2021-03-261-0/+6
| | | | | | | | | | | | | | | | Use like this: cmake -DWITH_ASAN=ON -DWITH_ASAN_SCOPE=ON
| | | * MDEV-24786: row_upd_clust_step() skips mtr_t::commit() on virtual column errorst-10.2-MDEV-24786Marko Mäkelä2021-03-261-80/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function row_upd_clust_step() is invoking several static functions, some of which used to commit the mini-transaction in some cases. If innobase_get_computed_value() would fail due to some reason, we would fail to invoke mtr_t::commit() and release buffer pool page latches. This would likely lead to a hanging server later. This regression was introduced in commit 97db6c15ea3e83a21df137c222dbd5a40fbe7c82 (MDEV-20618). row_upd_index_is_referenced(), row_upd_sec_index_entry(), row_upd_sec_index_entry(): Cleanup: Replace some ibool with bool. row_upd_clust_rec_by_insert(), row_upd_clust_rec(): Guarantee that the mini-transaction will always remain in active state. row_upd_del_mark_clust_rec(): Guarantee that the mini-transaction will always remain in active state. This fixes one "leak" of mini-transaction on DB_COMPUTE_VALUE_FAILED. row_upd_clust_step(): Use only one return path, which will always invoke mtr.commit(). After a failed row_upd_store_row() call, we will no longer "leak" the mini-transaction. This fix was verified by RQG on 10.6 (depending on MDEV-371 that was introduced in 10.4). Unfortunately, it is challenging to create a regression test for this, and a test case could soon become invalid as more bugs in virtual column evaluation are fixed.
| | | * Cleanup - reduce duplicate code, in SSL IO error handling.bb-10.2-sysprgVladislav Vaintroub2021-03-251-23/+29
| | | |