summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-18333 Slow_queries count doesn't increase when slow_query_log is turned offAlexander Barkov2019-03-0411-29/+161
|
* Merge branch '10.0' into 10.1Oleksandr Byelkin2019-03-0114-60/+239
|\
| * Increase the versionOleksandr Byelkin2019-02-281-1/+1
| |
| * Merge branch '5.5' into 10.0Oleksandr Byelkin2019-02-2815-61/+240
| |\
| | * MDEV-17055: Server crashes in find_order_in_list upon 2nd (3rd) execution of ↵Oleksandr Byelkin2019-02-288-15/+104
| | | | | | | | | | | | | | | | | | | | | SP with UPDATE 1. Always drop merged_for_insert flag on cleanup (there could be errors which prevent TABLE to be assigned) 2. Make more precise cleanup of select parts which was touched
| | * A cleanup in derived table handling: removing duplicate code from ↵Alexander Barkov2019-02-287-44/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | st_select_lex::handle_derived() st_select_lex::handle_derived() and mysql_handle_list_of_derived() had exactly the same implementations. - Adding a new method LEX::handle_list_of_derived() instead - Removing public function mysql_handle_list_of_derived() - Reusing LEX::handle_list_of_derived() in st_select_lex::handle_derived()
| | * MDEV-18506 MSI can't be built if MFC package is not installed with Visual StudioVladislav Vaintroub2019-02-071-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | candle.exe's preprocessor flags (-dHaveUpgradeWizard=0 -DHaveInnodb=1) were not passed correctly to EXECUTE_PROCESS Fix is to make a list out of the EXTRA_WIX_PREPROCESSOR_FLAGS string, and use the preprocessor flags list in EXECUTE_PROCESS.
| | * bump the VERSIONDaniel Bartholomew2019-01-301-1/+1
| | |
| | * MDEV-15950: LOAD DATA INTO compex_view crashedVarun Gupta2019-01-303-0/+62
| | | | | | | | | | | | | | | For multi-table views with LOAD, updates are not allowed, so we should just throw an error.
| | * MDEV-15744: Assertion `derived->table' failed in mysql_derived_merge_for_insertVarun Gupta2019-01-293-2/+41
| | | | | | | | | | | | | | | For singe-table views, we need to find the bottom most base table in the embedded views and then update that table
* | | MDEV-18601 Can't create table with ENCRYPTED=DEFAULT when ↵Marko Mäkelä2019-02-288-162/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innodb_default_encryption_key_id!=1 The problem with the InnoDB table attribute encryption_key_id is that it is not being persisted anywhere in InnoDB except if the table attribute encryption is specified and is something else than encryption=default. MDEV-17320 made it a hard error if encryption_key_id is specified to be anything else than 1 in that case. Ideally, we would always persist encryption_key_id in InnoDB. But, then we would have to be prepared for the case that when encryption is being enabled for a table whose encryption_key_id attribute refers to a non-existing key. In MariaDB Server 10.1, our best option remains to not store anything inside InnoDB. But, instead of returning the error that MDEV-17320 introduced, we should merely issue a warning that the specified encryption_key_id is going to be ignored if encryption=default. To improve the situation a little more, we will issue a warning if SET [GLOBAL|SESSION] innodb_default_encryption_key_id is being set to something that does not refer to an available encryption key. Starting with MariaDB Server 10.2, thanks to MDEV-5800, we could open the table definition from InnoDB side when the encryption is being enabled, and actually fix the root cause of what was reported in MDEV-17320.
* | | MDEV-18265: Replace deprecated variable debug to debug_dbug on Galera testsJan Lindström2019-02-2811-88/+37
| | | | | | | | | | | | | | | Replaced debug to debug_dbug on 10.1 on galera suite. Nothing to do in wsrep and galera_3nodes suites.
* | | Revert offending part of MDEV-9519: Data corruption will happen on the ↵Jan Lindström2019-02-281-13/+25
| | | | | | | | | | | | | | | | | | | | | Galera cluster size change This will allow test binlog.binlog_stm_binlog to pass more often. Note that this is not a real fix to that test failure.
* | | MDEV-9519: Data corruption will happen on the Galera cluster size changeJulius Goryavsky2019-02-2517-81/+392
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we have a 2+ node cluster which is replicating from an async master and the binlog_format is set to STATEMENT and multi-row inserts are executed on a table with an auto_increment column such that values are automatically generated by MySQL, then the server node generates wrong auto_increment values, which are different from what was generated on the async master. In the title of the MDEV-9519 it was proposed to ban start slave on a Galera if master binlog_format = statement and wsrep_auto_increment_control = 1, but the problem can be solved without such a restriction. The causes and fixes: 1. We need to improve processing of changing the auto-increment values after changing the cluster size. 2. If wsrep auto_increment_control switched on during operation of the node, then we should immediately update the auto_increment_increment and auto_increment_offset global variables, without waiting of the next invocation of the wsrep_view_handler_cb() callback. In the current version these variables retain its initial values if wsrep_auto_increment_control is switched on during operation of the node, which leads to inconsistent results on the different nodes in some scenarios. 3. If wsrep auto_increment_control switched off during operation of the node, then we must return the original values of the auto_increment_increment and auto_increment_offset global variables, as the user has set. To make this possible, we need to add a "shadow copies" of these variables (which stores the latest values set by the user). https://jira.mariadb.org/browse/MDEV-9519
* | | MDEV-18662 ib_wqueue_t has a data raceEugene Kosov2019-02-214-40/+28
| | | | | | | | | | | | | | | | | | ib_wqueue_is_empty(): protect ib_list_is_empty() call Closes #1202
* | | MDEV-17428: Update wsrep_max_ws_rows and wsrep_max_ws_size values in ↵Jan Lindström2019-02-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wsrep.cnf.sh Since MariaDB 10.1.17 the new default values for wsrep_max_ws_rows and wsrep_max_ws_size were set: wsrep_max_ws_rows Default Value: 0 (>= MariaDB Galera 10.0.27, MariaDB 10.1.17) 131072 (<= MariaDB Galera 10.0.26, MariaDB 10.1.16) wsrep_max_ws_size Default Value: 2147483647 (2GB, >= MariaDB Galera 10.0.27, MariaDB 10.1.17) 1073741824 (1GB, <= MariaDB Galera 10.0.26, MariaDB 10.1.16)
* | | MDEV-17942 fixup : protect rebuild_check_host() / rebuild_role_grants() ↵Vladislav Vaintroub2019-02-201-6/+7
| | | | | | | | | | | | with acl_cache->lock mutex
* | | Revert "MDEV-18575 Cleanup : remove innodb-encrypt-log parameter from ↵Vladislav Vaintroub2019-02-201-0/+5
| | | | | | | | | | | | | | | | | | | | | mariabackup" This reverts commit 3262967008bf2c2978bbf97960a3ea168fec9c26. It was checked in by mistake
* | | MDEV-17942 Assertion `found' failed in remove_ptr_from_dynarray after ↵Vladislav Vaintroub2019-02-203-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | failed CREATE OR REPLACE Failed CREATE OR REPLACE for existing user removes that user from acl_users array. Thus dependend structures (roles, check_host) must be rebuilt.
* | | Merge branch '10.1' of https://github.com/mariadb/server into 10.1Vladislav Vaintroub2019-02-205-6/+14
|\ \ \
| * | | 1. centos has symlinks /bin->usr/bin and /sbin -> usr/sbin,Oleksandr Byelkin2019-02-191-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | but even if this script called as /bin/mysql_install_db it is still standard install and scripts are in /usr/share/ (but not in the /share/) 2. fix of bindir path
| * | | Don't build aws_key_management plugin by defaultSergei Golubchik2019-02-194-3/+9
| | | |
* | | | Merge branch '10.1' of https://github.com/mariadb/server into 10.1Vladislav Vaintroub2019-02-197-70/+62
|\ \ \ \ | |/ / /
| * | | Fixed bug in macro _ma_mark_page_with_transid()Monty2019-02-193-6/+3
| | | | | | | | | | | | | | | | | | | | By pure chance the macro worked in the cases it was used, but better to get this fixed!
| * | | MDEV-18630 Uninitialised value in FOREIGN KEY error messageMarko Mäkelä2019-02-184-64/+59
| | | | | | | | | | | | | | | | | | | | | | | | dict_create_foreign_constraints_low(): Clean up the way in which the error messages are initialized, and ensure that the table name is always initialized.
* | | | MDEV-18575 Cleanup : remove innodb-encrypt-log parameter from mariabackupVladislav Vaintroub2019-02-141-5/+0
|/ / /
* | | MDEV-18426: Most of the mtr tests in the galera_3nodes suite failJulius Goryavsky2019-02-1218-22/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the mtr tests in the galera_3nodes suite fail for a variety of reasons with a variety of errors. This patch fixes several substantial flaws in the galera_3nodes suite tests and in the mtr framework service files, adapting the tests from galera_3nodes for the current version of MariaDB. This patch also synchronizes some galera_3nodes-related files with the latest changes made for MDEV-17835 (v2 patch) and for MDEV-18379 in other branches (10.2 and 10.3). Closes #1161
* | | MDEV-18016: Cover the no-rebuild case, and remove a bogus debug assertionMarko Mäkelä2019-02-114-2/+19
| | | | | | | | | | | | | | | | | | The code path where the table was not being rebuilt during ALTER TABLE was not covered by the test. Add coverage, and remove the debug assertion that could fail in this case.
* | | bump the VERSIONDaniel Bartholomew2019-02-061-1/+1
| | |
* | | MDEV-15798 Mutex leak on accessing INFORMATION_SCHEMA.INNODB_MUTEXESMarko Mäkelä2019-02-052-120/+174
| | | | | | | | | | | | | | | | | | i_s_innodb_mutexes_fill_table(): Use the C++ RAII pattern to ensure that the mutexes are released if an OK() macro returns from the function prematurely.
* | | Updated list of unstable tests for 10.1.38 releasemariadb-10.1.38Elena Stepanova2019-02-041-32/+62
| | |
* | | MDEV-16896 encryption.innodb-checksum-algorithm crashesMarko Mäkelä2019-02-032-24/+18
| | | | | | | | | | | | | | | | | | | | | buf_page_is_corrupted(): Read the global variable srv_checksum_algorithm only once in order to avoid a race condition when SET GLOBAL innodb_checksum_algorithm=...; is being executed concurrently with this function.
* | | Merge 10.1 into 10.1Marko Mäkelä2019-02-02101-7443/+2761
|\ \ \ | |/ / | | | | | | This is joint work with Oleksandr Byelkin.
| * | bump the VERSIONDaniel Bartholomew2019-01-311-1/+1
| | |
| * | List of unstable tests for 10.0.38 releasemariadb-10.0.38Elena Stepanova2019-01-291-74/+45
| | |
| * | MDEV-18016: Assertion failure on ALTER TABLE after foreign_key_checks=0Marko Mäkelä2019-01-294-68/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | ha_innobase::commit_inplace_alter_table(): Do not crash if innobase_update_foreign_cache() returns an error. It can return an error on ALTER TABLE if an inconsistent FOREIGN KEY constraint was created earlier when SET foreign_key_checks=0 was in effect. Instead, report a warning to the client that constraints cannot be loaded.
| * | MDEV-18256 Duplicated call to dict_foreign_remove_from_cache()Marko Mäkelä2019-01-294-10/+45
| | | | | | | | | | | | | | | ha_innobase::prepare_inplace_alter_table(): Filter out duplicates from ha_alter_info->alter_info->drop_list.elements.
| * | MDEV-18222: Duplicated call to dict_foreign_remove_from_cache()Marko Mäkelä2019-01-294-8/+33
| | | | | | | | | | | | | | | innobase_rename_column_try(): Declare fk_evict as std::set instead of std::list, in order to filter out duplicates.
| * | Fix xtradb version after mergeOleksandr Byelkin2019-01-291-1/+1
| | |
| * | MariaDB detect incorrect table nameOleksandr Byelkin2019-01-292-2/+3
| | |
| * | Merge branch '5.5' into 10.0Oleksandr Byelkin2019-01-2811-15/+94
| |\ \ | | |/
| | * disable an old testSergei Golubchik2019-01-281-0/+1
| | | | | | | | | | | | | | | @@open_files_limit now behaves differenly and cannot be used to skip the test anymore.
| | * Crude "auto-load-data-local-infile" modemariadb-5.5.63Sergei Golubchik2019-01-279-11/+90
| | | | | | | | | | | | | | | | | | | | | Disable LOAD DATA LOCAL INFILE suport by default and auto-enable it for the duration of one query, if the query string starts with the word "load". In all other cases the application should enable LOAD DATA LOCAL INFILE support explicitly.
| | * MDEV-18360 Prevent set_max_open_files from allocating too many filesVicențiu Ciorbaru2019-01-271-4/+3
| | | | | | | | | | | | | | | | | | | | | If the rlimit.rlim_cur value returned by getrlimit is not the RLIM_INFINITY magic constant, but a *very* large number, we can allocate too many open files. Restrict set_max_open_files to only return at most max_file_limit, as passed via its parameter.
| * | Fix detection of version in tokudbOleksandr Byelkin2019-01-281-1/+1
| | |
| * | Merge branch 'merge-tokudb-5.6' into 10.0Oleksandr Byelkin2019-01-2834-1069/+1776
| |\ \
| | * | 5.6.42-84.2Oleksandr Byelkin2019-01-2435-1075/+1778
| | | |
| * | | Version fix after mergeOleksandr Byelkin2019-01-281-1/+1
| | | |
| * | | Reverting part of da34c7de5dacac85c4dc1f714bcd7edf3b7fe5f9 that was already ↵Oleksandr Byelkin2019-01-281-3/+0
| | | | | | | | | | | | | | | | fixed by MDEV-17531 by Marko
| * | | Merge branch 'merge-xtradb-5.6' into 10.0Oleksandr Byelkin2019-01-283-14/+41
| |\ \ \