summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-10880: Assertions `keypart_map' or `prebuilt->search_tuple->n_fields > ↵bb-10.1-MDEV-10880Oleksandr Byelkin2017-06-219-37/+65
| | | | | | 0' fail on DISTINCT and GROUP BY constant add_group_and_distinct_keys() should take into account JOIN::simple_group.
* MDEV-12620 - set lock_wait_timeout = 1;flush tables with read lock;Sergey Vojtovich2017-06-163-1/+41
| | | | | | lock not released after timeout Release GRL if FLUSH TABLES phase failed.
* Remove some fields from dict_table_tMarko Mäkelä2017-06-1516-82/+14
| | | | | | | | | | | | | | | | | dict_table_t::thd: Remove. This was only used by btr_root_block_get() for reporting decryption failures, and it was only assigned by ha_innobase::open(), and never cleared. This could mean that if a connection is closed, the pointer would become stale, and the server could crash while trying to report the error. It could also mean that an error is being reported to the wrong client. It is better to use current_thd in this case, even though it could mean that if the code is invoked from an InnoDB background operation, there would be no connection to which to send the error message. Remove dict_table_t::crypt_data and dict_table_t::page_0_read. These fields were never read. fil_open_single_table_tablespace(): Remove the parameter "table".
* Re-record a failing test, likely related to MDEV-12610Marko Mäkelä2017-06-151-14/+14
|
* Merge 10.0 into 10.1, plus fixup for MDEV-12873Marko Mäkelä2017-06-1310-52/+723
|\ | | | | | | | | | | | | | | | | | | Cover innodb.table_flags with the new innodb_page_size.combinations 32k and 64k. dict_sys_tables_type_validate(): Remove an assertion that made a check in the function redundant. Remove the excessive output to the error log, as the invalid SYS_TABLES.TYPE value is already being output.
| * MDEV-12873 InnoDB SYS_TABLES.TYPE incompatibility for PAGE_COMPRESSION in ↵Marko Mäkelä2017-06-135-3/+532
| | | | | | | | | | | | | | | | | | | | | | | | MariaDB 10.2.2 to 10.2.6 Add a test case for corrupting SYS_TABLES.TYPE, and for ROW_FORMAT=REDUNDANT, the unused field SYS_TABLES.MIX_LEN that must be ignored (InnoDB before MySQL 5.5 wrote uninitialized garbage to this column). MariaDB 10.0 appears to validate the SYS_TABLES.TYPE properly. This is a test-only change.
| * MDEV-13059 XtraDB hangs on Windows due to failing to release block->lock X-latchVladislav Vaintroub2017-06-122-11/+1
| | | | | | | | | | | | | | | | | | | | | | | | in innodb_read_only mode. The reason for the hang is that there was no notification received about completed read io. File handles are bound to completion_port, and there were no background "write" threads that would be waiting on completion_port, only 2 "read" threads waiting on read_completion_port were active. The fix is to use a single IO completion port for all IOs, if innodb_read_only is set.
* | MDEV-13009 10.1.24 does not compile on architectures without 64-bit atomicsMarko Mäkelä2017-06-131-0/+1
| | | | | | | | Add a missing #include "sync0types.h" that was removed in MDEV-12674.
* | MDEV-13043 Skipped tests ignore warning suppressionsElena Stepanova2017-06-122-5/+10
| |
* | Post-push fix for MDEV-12610 MariaDB start is slowMarko Mäkelä2017-06-122-84/+44
| | | | | | | | | | | | fil_crypt_read_crypt_data(): Remove an unnecessary acquisition of fil_system->mutex. Remove a duplicated condition from the callers.
* | Adjust a test result after mergeMarko Mäkelä2017-06-121-5/+5
| |
* | Merge 10.0 into 10.1Marko Mäkelä2017-06-1225-447/+373
|\ \ | |/
| * Partially disable a test affected by MDEV-13059Marko Mäkelä2017-06-121-0/+10
| |
| * MDEV-13057 innodb_read_only=1 should avoid creating ↵Marko Mäkelä2017-06-125-13/+22
| | | | | | | | | | | | | | | | | | | | buf_flush_page_cleaner_thread When the server is started in innodb_read_only mode, there cannot be any writes to persistent InnoDB/XtraDB files. Just like the creation of buf_flush_page_cleaner_thread is skipped in this case, also the creation of the XtraDB-specific buf_flush_lru_manager_thread should be skipped.
| * MDEV-13039 innodb_fast_shutdown=0 may fail to purge all undo logMarko Mäkelä2017-06-0922-402/+339
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a slow shutdown is performed soon after spawning some work for background threads that can create or commit transactions, it is possible that new transactions are started or committed after the purge has finished. This is violating the specification of innodb_fast_shutdown=0, namely that the purge must be completed. (None of the history of the recent transactions would be purged.) Also, it is possible that the purge threads would exit in slow shutdown while there exist active transactions, such as recovered incomplete transactions that are being rolled back. Thus, the slow shutdown could fail to purge some undo log that becomes purgeable after the transaction commit or rollback. srv_undo_sources: A flag that indicates if undo log can be generated or the persistent, whether by background threads or by user SQL. Even when this flag is clear, active transactions that already exist in the system may be committed or rolled back. innodb_shutdown(): Renamed from innobase_shutdown_for_mysql(). Do not return an error code; the operation never fails. Clear the srv_undo_sources flag, and also ensure that the background DROP TABLE queue is empty. srv_purge_should_exit(): Do not allow the purge to exit if srv_undo_sources are active or the background DROP TABLE queue is not empty, or in slow shutdown, if any active transactions exist (and are being rolled back). srv_purge_coordinator_thread(): Remove some previous workarounds for this bug. innobase_start_or_create_for_mysql(): Set buf_page_cleaner_is_active and srv_dict_stats_thread_active directly. Set srv_undo_sources before starting the purge subsystem, to prevent immediate shutdown of the purge. Create dict_stats_thread and fts_optimize_thread immediately after setting srv_undo_sources, so that shutdown can use this flag to determine if these subsystems were started. dict_stats_shutdown(): Shut down dict_stats_thread. Backported from 10.2. srv_shutdown_table_bg_threads(): Remove (unused).
| * Correct a merge error of MDEV-11626Marko Mäkelä2017-06-091-0/+1
| |
| * MDEV-12609: Allow suppression of InnoDB log messages about reserving extentsJan Lindström2017-06-082-22/+0
| | | | | | | | Removed this output.
* | MDEV-12610: MariaDB start is slowJan Lindström2017-06-0914-104/+359
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem appears to be that the function fsp_flags_try_adjust() is being unconditionally invoked on every .ibd file on startup. Based on performance investigation also the top function fsp_header_get_crypt_offset() needs to addressed. Ported implementation of fsp_header_get_encryption_offset() function from 10.2 to fsp_header_get_crypt_offset(). Introduced a new function fil_crypt_read_crypt_data() to read page 0 if it is not yet read. fil_crypt_find_space_to_rotate(): Now that page 0 for every .ibd file is not read on startup we need to check has page 0 read from space that we investigate for key rotation, if it is not read we read it. fil_space_crypt_get_status(): Now that page 0 for every .ibd file is not read on startup here also we need to read page 0 if it is not yet read it. This is needed as tests use IS query to wait until background encryption or decryption has finished and this function is used to produce results. fil_crypt_thread(): Add is_stopping condition for tablespace so that we do not rotate pages if usage of tablespace should be stopped. This was needed for failure seen on regression testing. fil_space_create: Remove page_0_crypt_read and extra unnecessary info output. fil_open_single_table_tablespace(): We call fsp_flags_try_adjust only when when no errors has happened and server was not started on read only mode and tablespace validation was requested or flags contain other table options except low order bits to FSP_FLAGS_POS_PAGE_SSIZE position. fil_space_t::page_0_crypt_read removed. Added test case innodb-first-page-read to test startup when encryption is on and when encryption is off to check that not for all tables page 0 is read on startup.
* | Cleanup of MDEV-12600: crash during install_db with innodb_page_size=32K and ↵Marko Mäkelä2017-06-0830-429/+319
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ibdata1=3M The doublewrite buffer pages must fit in the first InnoDB system tablespace data file. The checks that were added in the initial patch (commit 112b21da37dad0fbb28bc65f9ab5a3ba6c0c2186) were at too high level and did not cover all cases. innodb.log_data_file_size: Test all innodb_page_size combinations. fsp_header_init(): Never return an error. Move the change buffer creation to the only caller that needs to do it. btr_create(): Clean up the logic. Remove the error log messages. buf_dblwr_create(): Try to return an error on non-fatal failure. Check that the first data file is big enough for creating the doublewrite buffers. buf_dblwr_process(): Check if the doublewrite buffer is available. Display the message only if it is available. recv_recovery_from_checkpoint_start_func(): Remove a redundant message about FIL_PAGE_FILE_FLUSH_LSN mismatch when crash recovery has already been initiated. fil_report_invalid_page_access(): Simplify the message. fseg_create_general(): Do not emit messages to the error log. innobase_init(): Revert the changes. trx_rseg_create(): Refactor (no functional change).
* | Revert part of MDEV-12113Marko Mäkelä2017-06-082-21/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 1af8bf39ca2513bfdf43a55af0b6af10d32dcebb added unnecessary calls to fil_write_flushed_lsn() during redo log resizing at InnoDB server startup. Because fil_write_flushed_lsn() is neither redo-logged nor doublewrite buffered, the call is risky and should be avoided, because if the server killed during the write call, the whole InnoDB instance can become inaccessible (corrupted page 0 in the system tablespace). In the best case, this call might prevent a diagnostic message from being emitted to the error log on the next startup.
* | Merge pull request #404 from grooverdan/10.1-MDEV-13032-galera_new_clusterJan Lindström2017-06-081-1/+1
|\ \ | | | | | | MDEV-13032: fix galera_new_cluster to be POSIX
| * | MDEV-13032: fix galera_new_cluster to be POSIXDaniel Black2017-06-081-1/+1
|/ / | | | | | | Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
* | Correct a merge errorMarko Mäkelä2017-06-061-0/+1
| |
* | Merge 10.0 into 10.1Marko Mäkelä2017-06-0632-1435/+1200
|\ \ | |/ | | | | | | | | | | | | Rewrite the test encryption.innodb-checksum-algorithm not to require any restarts or re-bootstrapping, and to cover all innodb_page_size combinations. Test innodb.101_compatibility with all innodb_page_size combinations.
| * Follow-up to MDEV-12042 (test innodb_page_size variants)Marko Mäkelä2017-06-0615-24/+24
| | | | | | | | | | | | | | | | | | | | innodb_page_size_small: A new set of combinations, for innodb_page_size up to 16k. In MariaDB 10.0, this does not make a difference, but in 10.1 and later, innodb_page_size would cover 32k and 64k, for which ROW_FORMAT=COMPRESSED is not available. Enable these combinations in a few InnoDB tests.
| * MDEV-12994 innodb_fast_shutdown=0 skips change buffer merge; fast shutdown ↵Marko Mäkelä2017-06-052-2/+2
| | | | | | | | | | | | | | | | does it srv_master_thread(): Pass the correct parameter to srv_shutdown(). This bug was introduced in MDEV-12052, and it affects the MariaDB 10.1.24 release.
| * MDEV-12042 Re-bootstrap the server if InnoDB options are incompatiblebb-10.0-elenst-mdev12042Elena Stepanova2017-06-023-7/+36
| |
| * Merge 5.5 into 10.0Marko Mäkelä2017-05-296-17/+297
| |\
| | * MDEV-11626 innodb.innodb-change-buffer-recovery fails for xtradbMarko Mäkelä2017-05-292-12/+0
| | | | | | | | | | | | | | | | | | buf_page_get_gen(): Remove the error log messages about page flushing and eviction when innodb_change_buffering_debug=1 is in effect.
| | * MDEV-11958: LEFT JOIN with stored routine produces incorrect resultOleksandr Byelkin2017-05-234-4/+297
| | | | | | | | | | | | | | | Added forgoten method of Item_func_sp to make it correctly work with LEFT/RIGHT JOIN. Fixed inconsistency with the null table caches.
* | | MDEV-9544 FLUSH [RELAY] LOGS does not rotate logs for a named slaveSachin Setiya2017-06-056-3/+274
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem:- In the case of multisource replication/named slave when we run "FLUSH LOGS" , it does not flush logs. Solution:- A new function Master_info_index->flush_all_relay_logs() is created which will rotate relay logs for all named slave. This will be called in reload_acl_and_cache function when connection_name.length == 0
* | | MDEV-12600: crash during install_db with innodb_page_size=32K and ibdata1=3M;bb-10.1-MDEV-12113Jan Lindström2017-06-0119-89/+319
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem was that all doublewrite buffer pages must fit to first system datafile. Ported commit 27a34df7882b1f8ed283f22bf83e8bfc523cbfde Author: Shaohua Wang <shaohua.wang@oracle.com> Date: Wed Aug 12 15:55:19 2015 +0800 BUG#21551464 - SEGFAULT WHILE INITIALIZING DATABASE WHEN INNODB_DATA_FILE SIZE IS SMALL To 10.1 (with extended error printout). btr_create(): If ibuf header page allocation fails report error and return FIL_NULL. Similarly if root page allocation fails return a error. dict_build_table_def_step: If fsp_header_init fails return error code. fsp_header_init: returns true if header initialization succeeds and false if not. fseg_create_general: report error if segment or page allocation fails. innobase_init: If first datafile is smaller than 3M and could not contain all doublewrite buffer pages report error and fail to initialize InnoDB plugin. row_truncate_table_for_mysql: report error if fsp header init fails. srv_init_abort: New function to report database initialization errors. srv_undo_tablespaces_init, innobase_start_or_create_for_mysql: If database initialization fails report error and abort. trx_rseg_create: If segment header creation fails return.
* | | MDEV-12114: install_db shows corruption for rest encryption and ↵Jan Lindström2017-06-0111-117/+1577
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innodb_checksum_algorithm=strict_none Problem was that checksum check resulted false positives that page is both not encrypted and encryted when checksum_algorithm was strict_none. Encrypton checksum will use only crc32 regardless of setting. buf_zip_decompress: If compression fails report a error message containing the space name if available (not available during import). And note if space could be encrypted. buf_page_get_gen: Do not assert if decompression fails, instead unfix the page and return NULL to upper layer. fil_crypt_calculate_checksum: Use only crc32 method. fil_space_verify_crypt_checksum: Here we need to check crc32, innodb and none method for old datafiles. fil_space_release_for_io: Allow null space. encryption.innodb-compressed-blob is now run with crc32 and none combinations. Note that with none and strict_none method there is not really a way to detect page corruptions and page corruptions after decrypting the page with incorrect key. New test innodb-checksum-algorithm to test different checksum algorithms with encrypted, row compressed and page compressed tables.
* | | MDEV-12113: install_db shows corruption for rest encryption with ↵Jan Lindström2017-06-0118-605/+558
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innodb_data_file_path=ibdata1:3M; Problem was that FIL_PAGE_FLUSH_LSN_OR_KEY_VERSION field that for encrypted pages even in system datafiles should contain key_version except very first page (0:0) is after encryption overwritten with flush lsn. Ported WL#7990 Repurpose FIL_PAGE_FLUSH_LSN to 10.1 The field FIL_PAGE_FLUSH_LSN_OR_KEY_VERSION is consulted during InnoDB startup. At startup, InnoDB reads the FIL_PAGE_FLUSH_LSN_OR_KEY_VERSION from the first page of each file in the InnoDB system tablespace. If there are multiple files, the minimum and maximum LSN can differ. These numbers are passed to InnoDB startup. Having the number in other files than the first file of the InnoDB system tablespace is not providing much additional value. It is conflicting with other use of the field, such as on InnoDB R-tree index pages and encryption key_version. This worklog will stop writing FIL_PAGE_FLUSH_LSN_OR_KEY_VERSION to other files than the first file of the InnoDB system tablespace (page number 0:0) when system tablespace is encrypted. If tablespace is not encrypted we continue writing FIL_PAGE_FLUSH_LSN_OR_KEY_VERSION to all first pages of system tablespace to avoid unnecessary warnings on downgrade. open_or_create_data_files(): pass only one flushed_lsn parameter xb_load_tablespaces(): pass only one flushed_lsn parameter. buf_page_create(): Improve comment about where FIL_PAGE_FIL_FLUSH_LSN_OR_KEY_VERSION is set. fil_write_flushed_lsn(): A new function, merged from fil_write_lsn_and_arch_no_to_file() and fil_write_flushed_lsn_to_data_files(). Only write to the first page of the system tablespace (page 0:0) if tablespace is encrypted, or write all first pages of system tablespace and invoke fil_flush_file_spaces(FIL_TYPE_TABLESPACE) afterwards. fil_read_first_page(): read flush_lsn and crypt_data only from first datafile. fil_open_single_table_tablespace(): Remove output of LSN, because it was only valid for the system tablespace and the undo tablespaces, not user tablespaces. fil_validate_single_table_tablespace(): Remove output of LSN. checkpoint_now_set(): Use fil_write_flushed_lsn and output a error if operation fails. Remove lsn variable from fsp_open_info. recv_recovery_from_checkpoint_start(): Remove unnecessary second flush_lsn parameter. log_empty_and_mark_files_at_shutdown(): Use fil_writte_flushed_lsn and output error if it fails. open_or_create_data_files(): Pass only one flushed_lsn variable.
* | | bump the VERSIONDaniel Bartholomew2017-05-311-1/+1
| | |
* | | cleanup: remove Regexp_processor_pcre::m_subpatterns_neededSergei Golubchik2017-05-293-9/+6
| | | | | | | | | | | | it's unused now.
* | | MDEV-12942 REGEXP_INSTR returns 1 when using bracketsSergei Golubchik2017-05-293-2/+18
| | | | | | | | | | | | | | | always use full m_SubStrVec length in pcre_exec, we don't know how many subexpressions user's regexp will have
* | | Fixed the bug mdev-12931.mariadb-10.1.24Igor Babaev2017-05-293-1/+76
| | | | | | | | | | | | | | | | | | This corrects the patch for mdev-10006. The current code supports only those semi-join nests that are placed at the join top level. So such nests cannot depend on other tables or nests.
* | | MDEV-11196: Error:Run-Time Check Failure #2 - Stack around the variable ↵bb-mdev-12229Varun Gupta2017-05-283-1/+170
| | | | | | | | | | | | | | | | | | | | | | | | 'key_buff' was corrupted, server crashes in opt_sum_query Extended keys feature disabled if the length of extended key is longer than MAX_KEY_LEN
* | | Merge branch '10.0-galera' into 10.1Sergei Golubchik2017-05-2617-22/+126
|\ \ \
| * | | Fix galera tests part II(Fix previous commit)Sachin Setiya2017-05-082-2/+2
| | | |
| * | | Fix galera test failures.Sachin Setiya2017-05-081-1/+1
| | | |
| * | | fix warning "ignoring return value" of fwrite.Jan Lindström2017-04-051-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Merge pull request https://github.com/MariaDB/server/pull/343 contributed by Eric Herman.
| * | | Fix compiler warnings on gcc 6.x.Jan Lindström2017-04-053-4/+4
| | | |
| * | | Merge pull request #351 from ↵Jan Lindström2017-04-051-4/+22
| |\ \ \ | | | | | | | | | | | | | | | | | | | | grooverdan/10.0-galera-MDEV-7560-check_galera_version MDEV-7560: check_galera_version to account for greater version than specified
| | * | | MDEV-7560: check_galera_version to account for greater version than specifiedDaniel Black2017-04-051-4/+22
| |/ / / | | | | | | | | | | | | Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
| * | | Fix galera.galera_gcs_fc_limitSachin Setiya2017-03-231-1/+4
| | | |
| * | | MDEV-12319 Part 2Sachin Setiya2017-03-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Add more tests to disabled.diff Signed-off-by: Sachin Setiya <sachin.setiya@mariadb.com>
| * | | bump the VERSIONDaniel Bartholomew2017-03-221-1/+1
| | | |
| * | | MDEV-12319 Test added to disabled.defSachin Setiya2017-03-221-0/+11
| | | |