summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-19541 InnoDB crashes when trying to recover a corrupted pagebb-10.2-MDEV-19541Thirunarayanan Balathandayuthapani2019-05-2710-27/+162
| | | | | | | | | | - Don't apply redo log for the corrupted page when innodb_force_recovery > 0. - Don't mark the tablespace as corrupted when innodb_force_recovery > 0 or recovery is in progress. - Allow the table to be dropped when index root page is corrupted when innodb_force_recovery > 0.
* Merge 10.1 into 10.2Marko Mäkelä2019-05-211-2/+10
|\
| * Better comment from Monty for code in make_join_selectSergei Petrunia2019-05-171-2/+10
| |
| * MDEV-16021: galera mtr test galera_evs_suspect_timeout crashedJan Lindström2019-05-172-25/+44
| | | | | | | | | | Crash was timeout crash. Add correct waits for connections, wsrep sync waits and auto increment offset save and restore.
| * MDEV-13549: Timeout in wait_condition.inc for PROCESSLISTJan Lindström2019-05-173-29/+18
| | | | | | | | | | Use wsrep sync wait instead of unnecessary waits and correct slave setting.
| * MDEV-17061: Test failure on galera.galera_gcs_fc_limitJan Lindström2019-05-173-29/+29
| | | | | | | | | | | | Remove unnecessary sleeps and fix wait_condition to use wsrep_flow_control_paused i.e. we wait until flow control pauses a transaction on master.
* | Fixed monitor.test to handle statistics >= 10Monty2019-05-212-27/+21
| |
* | MDEV-17456 Malicious SUPER user can possibly change audit log configuration ↵Alexey Botchkov2019-05-201-0/+1
| | | | | | | | | | | | without leaving traces. thread_pool_server_audit.result fixed.
* | Remove UT_NOT_USEDMarko Mäkelä2019-05-205-41/+7
| | | | | | | | btr_pcur_move_to_last_on_page(): Merge with the only caller.
* | MDEV-19076: rpl_parallel_temptable result mismatch '-33 optimistic'Sujatha2019-05-203-1/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: ======== The test now fails with the following trace: CURRENT_TEST: rpl.rpl_parallel_temptable --- /mariadb/10.4/mysql-test/suite/rpl/r/rpl_parallel_temptable.result +++ /mariadb/10.4/mysql-test/suite/rpl/r/rpl_parallel_temptable.reject @@ -194,7 +194,6 @@ 30 conservative 31 conservative 32 optimistic -33 optimistic Analysis: ========= The part of test which fails with result content mismatch is given below. CREATE TEMPORARY TABLE t4 (a INT PRIMARY KEY) ENGINE=InnoDB; INSERT INTO t4 VALUES (32); INSERT INTO t4 VALUES (33); INSERT INTO t1 SELECT a, "optimistic" FROM t4; slave_parallel_mode=optimistic The expectation of the above test script is, INSERT FROM SELECT should read both 32, 33 and populate table 't1'. But this expectation fails occasionally. All three INSERT statements are handed over to three different slave parallel workers. Temporary tables are not safe for parallel replication. They were designed to be visible to one thread only, so have no table locking. Thus there is no protection against two conflicting transactions committing in parallel and things like that. So anything that uses temporary tables will be serialized with anything before it, when using parallel replication by using a "wait_for_prior_commit" function call. This will ensure that the each transaction is executed sequentially. But there exists a code path in which the above wait doesn't happen. Because of this at times INSERT from SELECT doesn't wait for the INSERT (33) to complete and it completes its executes and enters commit stage. Hence only row 32 is found in those cases resulting in test failure. The wait needs to be added within "open_temporary_table" call. The code looks like this within "open_temporary_table". Each thread tries to open temporary table in 3 different ways: case 1: Find a temporary table which is already in use by using find_temporary_table(tl) && wait_for_prior_commit() case 2: If above failed then try to look for temporary table which is marked for free for reuse. This internally calls "wait_for_prior_commit()" if table is found. find_and_use_tmp_table(tl, &table) case 3: If none of the above open a new table handle from table share. if (!table && (share= find_tmp_table_share(tl))) { table= open_temporary_table(share, tl->get_table_name(), true); } At present the "wait_for_prior_commit" happens only in case 1 & 2. Fix: ==== On slave add a call for "wait_for_prior_commit" for case 3. The above wait on slave will solve the issue. A more detailed fix would be to mark temporary tables as not safe for parallel execution on the master side. In order to do that, on the master side, mark the Gtid_log_event specific flag FL_TRANSACTIONAL to be false all the time. So that they are not scheduled parallely.
* | MDEV-17456 Malicious SUPER user can possibly change audit log configuration ↵Alexey Botchkov2019-05-192-6/+11
| | | | | | | | | | | | without leaving traces. Fix for the SET GLOBAL server_audit_loggin=on; added.
* | MDEV-16021: galera mtr test galera_evs_suspect_timeout crashedJan Lindström2019-05-172-25/+48
| | | | | | | | | | Crash was timeout crash. Add correct waits for connections, wsrep sync waits and auto increment offset save and restore.
* | MDEV-13549: Timeout in wait_condition.inc for PROCESSLISTJan Lindström2019-05-173-29/+18
| | | | | | | | | | Use wsrep sync wait instead of unnecessary waits and correct slave setting.
* | MDEV-17061: Test failure on galera.galera_gcs_fc_limitJan Lindström2019-05-173-29/+29
| | | | | | | | | | | | Remove unnecessary sleeps and fix wait_condition to use wsrep_flow_control_paused i.e. we wait until flow control pauses a transaction on master.
* | restore the correct test resultSergei Golubchik2019-05-172-4/+4
| |
* | MDEV-13992 Implement JSON_MERGE_PATCH.Alexey Botchkov2019-05-176-5/+495
| | | | | | | | | | JSON_MERGE_PATCH implemented. Added JSON_MERGE_PRESERVE as a synonim for the JSON_MERGE.
* | MDEV-19472: eq_range_index_dive_limit cannot be configured in server.cnfVarun Gupta2019-05-171-1/+0
| | | | | | | | Fixed, now server can be configured with eq_range_index_dive_limit set in cnf file
* | Fixed rocksdb.mariadb_plugin on WindowsSergey Vojtovich2019-05-161-1/+3
| |
* | MDEV-19490 show tables fails when selecting the information_schema databaseMonty2019-05-162-3/+23
| | | | | | | | | | | | | | The bug was that when using mysql_list_fields, then table_list->schema_table_name was not filled in. Fixed by using table_list->schema_table instead, which is always filled in.
* | Issue #904: Crash in rocksdb::IOStatsContext::Reset, this=NULLSergei Petrunia2019-05-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Fix both code paths: - Change the test source code so it doesn't cause the "Unused variable" warning (which -Werror converted into error and caused CMake not to set HAVE_THREAD_LOCAL) - If the system doesn't seem to support HAVE_THREAD_LOCAL, refuse to compile (rather than producing a binary that crashes for some tests) Originally submitted at https://github.com/facebook/mysql-5.6/pull/905
* | MDEV-19090 - Split rocksdb.locking_issuesSergey Vojtovich2019-05-1642-739/+764
| | | | | | | | This test takes ~6 minutes, split it for better parallelism.
* | Fixed RocksDB to follow THD ha_data protocolSergey Vojtovich2019-05-164-67/+30
| | | | | | | | | | | | | | | | | | | | | | | | Use thd_get_ha_data()/thd_set_ha_data() which protect against plugin removal until it has THD ha_data. Do not reset THD ha_data in rocksdb_close_connection(), cleaner approach is to let ha_close_connection() do it. Removed transaction objects cleanup from rocksdb_done_func(). As we lock plugin properly, there must be no transaction objects during RocksDB shutdown.
* | Fixed InnoDB to not use broken thd_ha_data()Sergey Vojtovich2019-05-161-1/+1
| |
* | MDEV-19485: Add a test caseMarko Mäkelä2019-05-162-0/+33
| | | | | | | | | | | | | | | | | | | | The bug was introduced in MariaDB 10.4.0 by commit 0e5a4ac2532c64a545796c787354dc41d61d0e62 but it is good to have a regression test for this scenario in all applicable MariaDB versions. Cover the purge of an undo log record that was written before the completion of ADD SPATIAL INDEX.
* | Merge 10.1 into 10.2Marko Mäkelä2019-05-168-3/+146
|\ \ | |/
| * Fixed the case when statistics were not getting read becauseVarun Gupta2019-05-164-1/+29
| | | | | | | | | | | | we had the statistics tables in the FROM list of the select. The statistics for tables are not read in such cases, so we need to check this case separately.
| * MDEV-19407: Assertion `field->table->stats_is_read' failed in is_eits_usableVarun Gupta2019-05-164-0/+61
| | | | | | | | | | Statistics were not read for a table when we had a CREATE TABLE query. Enforce reading statistics for commands CREATE TABLE, SET and DO.
| * MDEV-788 mysqlimport should support the ability to disable foreign keysRobert Bindar2019-05-153-2/+56
| |
* | MDEV-13080 [ERROR] InnoDB: Missing MLOG_CHECKPOINT between the checkpoint x ↵Eugene Kosov2019-05-152-88/+32
| | | | | | | | | | | | | | | | | | | | | | | | and the end y log_buffer_extend(): Do not write to disk. Just allocate new bigger buffer and copy contents of old one to it. Do not acquire write_mutex. log_t::is_extending: Removed as unneeded now. LOG_BUFFER_SIZE: Removed to make the dependence on srv_log_buffer_size visible.
* | MDEV-19449 Got error 168 for valid TRUNCATE (temporary) TABLEMarko Mäkelä2019-05-142-0/+28
| | | | | | | | | | | | | | | | Add the test case. The parent commit, which cherry-picked the MDEV-17167 fix from 10.3 (commit bad2f1569da57c4a81cc84ec2f4a79924df9c8d6) fixed the bug.
* | MDEV-17167 - InnoDB: Failing assertion: table->get_ref_count() == 0 uponSergey Vojtovich2019-05-146-1/+89
| | | | | | | | | | | | | | | | | | | | truncating a temporary table TRUNCATE expects only one TABLE instance (which is used by TRUNCATE itself) to be open. However this requirement wasn't enforced after "MDEV-5535: Cannot reopen temporary table". Fixed by closing unused table instances before performing TRUNCATE.
* | MDEV-19158: MariaDB 10.2.22 is writing duplicate entries into binary logSujatha2019-05-145-2/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: ======== We have a Master/Master Setup on two servers, but are only writing to one of those servers (so it is essentially Master/Slave) We upgraded from 10.1.* to 10.2.22 last week and starting with the upgrade, we are getting duplicate key errors on the slave. BINLOG=mixed. Analysis: ========= This issue happens with LOCK TABLES and binlog_format=MIXED combination. When an UNSAFE statement is encountered in 'MIXED' mode, it is logged in the form of 'ROW' format. For all the tables that are part of LOCK TABLES list their table maps are written into the binary log. For each table in the list a check is done to see if 'check_table_binlog_row_based_done' flag is set or not. If it is not set a check process is initiated to see if table qualifies for row based binary logging or not and 'check_table_binlog_row_based_done' is set. This flag will be cleared at the time of closing thread tables. But there can be special cases where the LOCK TABLES contains more number of tables but the unsafe query is actually using subset of tables from LOCK TABLES list. For example: LOCK TABLES locks t1,t2,t3 but the unsafe statement makes use of only two tables t1,t3. In this case the 'check_table_binlog_row_based_done' flag is enabled for table 't2' while writing table map, but 'close_thread_tables' function call will not reset this flag. Since the flag is not cleared for table 't2' even a safe statement which used t2 will be logged in the form of row based format. This leads to an assert on debug builds and causes duplicate entries in release builds. In release builds a statement is logged in the form of both ROW and STATEMENT format. This causes the slave to fail with duplicate key error. Fix: === During 'close_thread_tables' when LOCK TABLE modes are active "ha_reset" is done for all the tables which were part of current statement. As mentioned in the example 'ha_reset' is called for tables 't1' and 't3'. This will clear the 'check_table_binlog_row_based_done' flag. At this point add a check for the rest of the tables to see if 'check_table_binlog_row_based_done' is enabled or not. If enabled clear the flag.
* | Merge branch '10.1' into 10.2Sujatha2019-05-143-7/+5
|\ \ | |/
| * MDEV-11095: rpl.rpl_row_mysqlbinlog test fails if row annotation enabledSujatha2019-05-141-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: ======= Whel rpl.rpl_row_mysqlbinlog test is executed as shown below it fails with result content mismatch. perl mtr rpl_row_mysqlbinlog --mysqld=--binlog-annotate-row-events=1 Analysis: ========= When row annotations are enabled the actual query is written into the binlog which helps users to understand the query, even when row based replication is enabled. For example: Simple insert in row based replication looks like shown below. #190402 16:31:27 server id 1 end_log_pos 526 Annotate_rows: #Q> insert into t values (10) #190402 16:31:27 server id 1 end_log_pos 566 Table_map: `test`.`t` mapped to number 19 # at 566 #190402 16:31:27 server id 1 end_log_pos 600 Write_rows: table id 19 flags: STMT_END_F BINLOG ' B0GjXBMBAAAAKAAAADYCAAAAABMAAAAAAAEABHRlc3QAAXQAAQMAAQ== B0GjXBcBAAAAIgAAAFgCAAAAABMAAAAAAAEAAf/+CgAAAA== '/*!*/; # at 600 The test creates some binary log events and redirects them into a SQL file. Executes RESET MASTER and sources the SQL file back on clean master and verifies that the data is available. Please refer following steps. ../client/mysqlbinlog ./var/mysqld.1/data/master-bin.000001 > test.sql ../client/mysql -uroot -S./var/tmp/mysqld.1.sock -Dtest < test.sql ../client/mysqlbinlog ./var/mysqld.1/data/master-bin.000001 -v > row.sql When the row based replication specific SQL file is sourced once again on master the newly generated binlog will treat the entire "BASE 64" encoded event as query and write it into the binary log. Output from 'row.sql': #Q> BINLOG ' #Q> B0GjXBMBAAAAKAAAADYCAAAAABMAAAAAAAEABHRlc3QAAXQAAQMAAQ== #Q> B0GjXBcBAAAAIgAAAFgCAAAAABMAAAAAAAEAAf/+CgAAAA== #190402 16:31:27 server id 1 end_log_pos 657 Table_map: `test`.`t` mapped to number 23 # at 657 #190402 16:31:27 server id 1 end_log_pos 691 Write_rows: table id 23 flags: STMT_END_F BINLOG ' B0GjXBMBAAAAKAAAAJECAAAAABcAAAAAAAEABHRlc3QAAXQAAQMAAQ== B0GjXBcBAAAAIgAAALMCAAAAABcAAAAAAAEAAQH+CgAAAA== ### INSERT INTO `test`.`t` ### SET ### @1=10 '/*!*/; # at 691 This is expected behaviour as we cannot extract query from BASE 64 encoded input. This causes more number of binary logs to be generated when the test is executed with row annotations. The following lines from test assumes that only two binary logs will contain entire data. --echo --- Test 4 Second Remote test -- ---exec $MYSQL_BINLOG --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 > $MYSQLTEST_VARDIR/tmp/remote.sql ---exec $MYSQL_BINLOG --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002 >> $MYSQLTEST_VARDIR/tmp/remote.sql In a case when row annotations are enabled the data gets spread across four binary logs. As test uses only the first two binary log files, data available in other binary logs gets missed. Hence test fails with result content mismatch as less data is avaialble. Fix: ==== Use "-to-the-last" option of "mysqlbinlog" tool which will ensure that all the available binary log specific contents are included in .sql file.
* | Merge 10.1 into 10.2Marko Mäkelä2019-05-1318-368/+369
|\ \ | |/
| * MDEV-19445 heap-use-after-free related to innodb_ft_aux_tableMarko Mäkelä2019-05-1314-318/+341
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Try to fix the race conditions between SET GLOBAL innodb_ft_aux_table = ...; and access to the INFORMATION_SCHEMA tables that depend on this variable. innodb_ft_aux_table: Replaces fts_internal_tbl_name,fts_internal_tbl_name2. Just store the user-specified parameter as is. innodb_ft_aux_table_id: The table_id corresponding to SET GLOBAL innodb_ft_aux_table, or 0 if the table does not exist or does not contain FULLTEXT INDEX. If the table is renamed later, the INFORMATION_SCHEMA tables will continue to refer to the table. If the table is dropped or rebuilt, the INFORMATION_SCHEMA tables will not find the table.
| * fts_optimize_words(): Remove stray outputMarko Mäkelä2019-05-132-4/+0
| | | | | | | | | | | | | | | | With SET GLOBAL innodb_optimize_fulltext_only=1 in effect, OPTIMIZE TABLE would output words from the fulltext index to the server error log, even in non-debug builds. fts_optimize_words(): Remove the unwanted output.
| * fts_doc_ids_free(): Define inlineMarko Mäkelä2019-05-134-48/+12
| |
| * MDEV-19441 Typo in error message "InnoDB: FTS Doc ID must be large than"Marko Mäkelä2019-05-134-18/+16
| | | | | | | | | | row_insert_for_mysql(): Correct the grammar error, and display the table name in both messages.
* | Remove unnecessary pointer indirection for rw_lock_tMarko Mäkelä2019-05-1323-165/+115
| | | | | | | | | | | | | | | | | | | | | | In MySQL 5.7.8 an extra level of pointer indirection was added to dict_operation_lock and some other rw_lock_t without solid justification, in mysql/mysql-server@52720f1772f9f424bf3dd62fa9c214dd608cd036. Let us revert that change and remove the rather useless rw_lock_t constructor and destructor and the magic_n field. In this way, some unnecessary pointer dereferences and heap allocation will be avoided and debugging might be a little easier.
* | Merge 10.1 into 10.2Marko Mäkelä2019-05-134033-4087/+4087
|\ \ | |/
| * Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-112967-3001/+3001
| |\
| | * Update FSF AddressVicențiu Ciorbaru2019-05-114079-4102/+4102
| | | | | | | | | | | | * Update wrong zip-code
| * | Update FSF addressVicențiu Ciorbaru2019-05-11719-725/+725
| | |
| * | Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-11371-380/+380
| |\ \ | | |/
| | * Follow-up to changing FSF addressVicențiu Ciorbaru2019-05-11165-167/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some places didn't match the previous rules, making the Floor address wrong. Additional sed rules: sed -i -e 's/Place.*Suite .*, Boston/Street, Fifth Floor, Boston/g' sed -i -e 's/Suite .*, Boston/Fifth Floor, Boston/g'
| | * Update FSF addressMichal Schorm2019-05-10217-227/+227
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit is based on the work of Michal Schorm, rebased on the earliest MariaDB version. Th command line used to generate this diff was: find ./ -type f \ -exec sed -i -e 's/Foundation, Inc., 59 Temple Place, Suite 330, Boston, /Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, /g' {} \; \ -exec sed -i -e 's/Foundation, Inc. 59 Temple Place.* Suite 330, Boston, /Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, /g' {} \; \ -exec sed -i -e 's/MA.*.....-1307.*USA/MA 02110-1335 USA/g' {} \; \ -exec sed -i -e 's/Foundation, Inc., 59 Temple/Foundation, Inc., 51 Franklin/g' {} \; \ -exec sed -i -e 's/Place, Suite 330, Boston, MA.*02111-1307.*USA/Street, Fifth Floor, Boston, MA 02110-1335 USA/g' {} \; \ -exec sed -i -e 's/MA.*.....-1307/MA 02110-1335/g' {} \;
* | | MDEV-17540 Server crashes in row_purge after TRUNCATE TABLEMarko Mäkelä2019-05-103-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | row_purge_upd_exist_or_extern_func(): Check for node->vcol_op_failed() after row_purge_remove_sec_if_poss(), like row_purge_del_mark() did. This avoids us dereferencing the node->table=NULL pointer. The test case, submitted by Elena Stepanova, is not deterministic and does not repeat the bug on 10.2. With the added loop, for me, it reliably crashes 10.3 without the fix. I was unable to create a deterministic test case for either 10.2 or 10.3. Reviewed by Thirunarayanan Balathandayuthapani
* | | Merge 10.1 into 10.2Marko Mäkelä2019-05-1041-986/+851
|\ \ \ | |/ /
| * | MDEV-13893 encryption.innodb-redo-badkey failed in buildbot with page cannot ↵Thirunarayanan Balathandayuthapani2019-05-102-16/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be decrypted buf_dblwr_process(): Remove the useless warning that a copy of a page in the doublewrite buffer is corrupted. We already report an error if a corrupted page cannot be recovered from the doublewrite buffer. Note: In MariaDB 10.1, the original bug reported in MDEV-13893 could still be easily repeatable. In MariaDB 10.2.24, MDEV-12699 should have reduced the probability considerably.