summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Adjust the test suite and overlays according to server changes in 10.2bb-10.2-elenst2Elena Stepanova2017-05-2433-839/+329
|
* MDEV-12764 main.log_tables-big fails in buildbot due to connect_logElena Stepanova2017-05-232-1/+9
| | | | | Additionally internal check was failing because the test did not restore a global value properly
* InnoDB plugin is now default, and XtraDB is not builtElena Stepanova2017-05-232-1/+9
|
* Merge 10.1 into 10.2Marko Mäkelä2017-05-23320-6155/+8039
|\
| * Merge 10.0 into 10.1Marko Mäkelä2017-05-2377-184/+488
| |\
| | * Merge branch '5.5' into 10.0mariadb-10.0.31Sergei Golubchik2017-05-2011-9/+314
| | |\
| | | * MDEV-11092 :- Fix Previous commit of MDEV-11092Sachin Setiya2017-05-191-0/+1
| | | |
| | | * Make IF clear.Oleksandr Byelkin2017-05-181-8/+17
| | | |
| | | * MDEV-11092 Assertion `!writer.checksum_len || writer.remains == 0' failedSachin Setiya2017-05-183-0/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem:- This crash happens because logged stmt is quite big and while writing Annotate_rows_log_event it throws EFBIG error but we ignore this error and do not call cache_data->set_incident(). Solution:- When we normally write Binlog_log_event we check for error EFBIG, but we did do this for Annotate_rows_log_event. We check for this error and call cache_data->set_incident() accordingly. # Conflicts: # sql/log.cc
| | | * Fixed the bug mdev-12812.Igor Babaev2017-05-173-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is another correction of the patch for bug mdev-12670. If a derived table is merged into a select with STRAIGHT_JOIN modifier all IN subquery predicates contained in the specification of the derived table cannot be subject to conversion to semi-joins.
| | | * Fixed the bug mdev-12817/mdev-12820.Igor Babaev2017-05-174-1/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is a correction of the patch for bug mdev-12670. With the current code handling semi-joins the following must be taken into account. Conversion of an IN subquery predicate into semi-join has to be blocked if the predicate occurs: (a) in the ON expression of an outer join (b) in the ON expression of an inner join embedded directly or indirectly in the inner nest of an outer join. The patch for mdev-12670 blocked conversion to semi-joins only in the case (a), but not in the case (b). This patch blocks the conversion in both cases.
| | * | compilation warnings in ConnectSergei Golubchik2017-05-1929-72/+71
| | | |
| | * | MDEV-10788 Not able to compile source with -DBUILD_CONFIG=mysql_release ↵Sergei Golubchik2017-05-191-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | -DCMAKE_BUILD_TYPE=Debug fix incorrect merge, 831b531895 was not fully merged into 10.0
| | * | MDEV-6262 analyze the coverity report on mariadbSergei Golubchik2017-05-1937-63/+96
| | | | | | | | | | | | | | | | | | | | uploaded 10.0, analyzed everything with the Impact=High (and a couple of Medium)
| * | | Merge branch 'bb-10.1-wlad' into 10.1Vladislav Vaintroub2017-05-228-196/+7
| |\ \ \
| | * | | MDEV-12832 : remove libarchive support from mariabackup,Vladislav Vaintroub2017-05-218-196/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | due to different packaging issues. Also, Percona thinks that tar support has many limitations and should be removed as well( see discussion in https://bugs.launchpad.net/percona-xtrabackup/+bug/1681721) there is an alternative streaming format xbstream that is supported and does not have these limitations.
| * | | | Changing maturity to stableRasmus Johansson2017-05-221-1/+1
| |/ / / | | | | | | | | Additional tests have been done and conclusion was to update maturity to stable
| * | | MDEV-12615: InnoDB page compression method snappy mostly does not compress pagesJan Lindström2017-05-2012-811/+276
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Snappy compression method require that output buffer used for compression is bigger than input buffer. Similarly lzo require additional work memory buffer. Increase the allocated buffer accordingly. buf_tmp_buffer_t: removed unnecessary lzo_mem, crypt_buf_free and comp_buf_free. buf_pool_reserve_tmp_slot: use alligned_alloc and if snappy available allocate size based on snappy_max_compressed_length and if lzo is available increase buffer by LZO1X_1_15_MEM_COMPRESS. fil_compress_page: Remove unneeded lzo mem (we use same buffer) and if output buffer is not yet allocated allocate based similarly as above. Decompression does not require additional work area. Modify test to use same test as other compression method tests.
| * | | After-merge fix: Correct the 32-bit XtraDB result diff.Marko Mäkelä2017-05-201-2/+2
| | | |
| * | | After-merge fix: Correct the XtraDB result diff.Marko Mäkelä2017-05-201-1/+1
| | | |
| * | | Clean up a testMarko Mäkelä2017-05-202-15/+0
| | | | | | | | | | | | | | | | | | | | Changed global parameters will be reset by server restart. There is no need to save and restore the original values.
| * | | After-merge fix for MDEV-11638Marko Mäkelä2017-05-205-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 360a4a037271d65ab6471f7ab3f9b6a893d90a31 some debug assertions were introduced to the page flushing code in XtraDB. Add these assertions to InnoDB as well, and adjust the InnoDB shutdown so that these assertions will not fail. logs_empty_and_mark_files_at_shutdown(): Advance srv_shutdown_state from the first phase SRV_SHUTDOWN_CLEANUP only after no page-dirtying activity is possible (well, except by srv_master_do_shutdown_tasks(), which will be fixed separately in MDEV-12052). rotate_thread_t::should_shutdown(): Already exit the key rotation threads at the first phase of shutdown (SRV_SHUTDOWN_CLEANUP). page_cleaner_sleep_if_needed(): Do not sleep during shutdown. This change is originally from XtraDB.
| * | | Merge 10.0 into 10.1Marko Mäkelä2017-05-20255-4965/+7289
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | Significantly reduce the amount of InnoDB, XtraDB and Mariabackup code changes by defining pfs_os_file_t as something that is transparently compatible with os_file_t.
| | * | Remove dead code added in merge commit d8b45b0c004edc0b91029b232d7cc9aad02cc822Marko Mäkelä2017-05-191-24/+0
| | | | | | | | | | | | | | | | | | | | In a merge conflict resolution, callers of the added function rec_field_len_in_chars() were removed, but the function itself was not.
| | * | Update xtradb and innodb version to 5.6.36Vicențiu Ciorbaru2017-05-182-2/+2
| | | |
| | * | Fix xtradb handler compilation post mergeVicențiu Ciorbaru2017-05-181-0/+25
| | | |
| | * | Merge remote-tracking branch 'origin/10.0' into 10.0Vicențiu Ciorbaru2017-05-18104-643/+574
| | |\ \
| | | * | Fixed typo in the case operator.Oleksandr Byelkin2017-05-181-0/+1
| | | | |
| | | * | List of unstable tests for 10.0.31 releaseElena Stepanova2017-05-181-75/+66
| | | | |
| | * | | Change lower_case_file_system definition to feature MYSQL_PLUGIN_IMPORTVicențiu Ciorbaru2017-05-171-1/+1
| | | | |
| | * | | Fix windows compilation in xtradb post-mergeVicențiu Ciorbaru2017-05-171-5/+5
| | | | |
| | * | | Fix tokudb test failures post mergeVicențiu Ciorbaru2017-05-1714-1/+13
| | | | |
| | * | | Fix sys_vars innodb_empty_free_list_algorithm_basicVicențiu Ciorbaru2017-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | Post xtradb 5.6.36 merge the output has changed.
| | * | | Merge remote-tracking branch 'origin/5.5' into 10.0Vicențiu Ciorbaru2017-05-1719-19/+452
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Fixed the bug mdev-7791.Igor Babaev2017-05-163-5/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an IN subquery predicate was converted to a semi-join that were materialized and the result of the materialization happened to be the last in the execution plan then any conjunctive condition with RAND() turned out to be lost. Fixed by attaching this condition to the last top base table.
| | | * | MDEV-12799 Buffer overflowSergei Golubchik2017-05-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with a specially corrupted master.info one can get an invalid heartbeat_period that will trigger a heap overflow.
| | | * | Fixed the bug mdev-7599.Igor Babaev2017-05-157-0/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At some conditions the function opt_sum_query() can apply MIN/MAX optimizations to to Item_sum objects of a select These optimizations becomes invalid if this select is the subquery of an IN subquery predicate that is converted to a EXISTS subquery. Thus in this case the MIX/MAX optimizations that have been applied in opt_sum_query() must be rolled back. This bug appeared in 5.3 when the code for the cost base choice between materialization and in-to-exists transformation of non-correlated IN subqueries was introduced. Before this code in-to-exists transformations were always performed before the call of opt_sum_query().
| | | * | MDEV-11718 Post-fixbb-mdev-11718Sachin Setiya2017-05-121-1/+2
| | | | | | | | | | | | | | | | | | | | A better way of finding mysqld
| | | * | Fixed the bugs mdev-12670 and mdev-12675.Igor Babaev2017-05-099-11/+269
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code that blocked conversion of a IN subselect pedicate to a semi-join if it occurred in the ON expression of an outer join did not do it correctly. As a result, the conversion was blocked for IN subselect predicates encountered in ON expressions of INNER joins or in WHERE conditions of mergeable views / derived tables. This patch fixes this problem.
| | * | | Merge branch 'merge-innodb-5.6' into bb-10.0-vicentiuVicențiu Ciorbaru2017-05-1730-272/+505
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This merge reverts commit 6ca4f693c1ce472e2b1bf7392607c2d1124b4293 from current 5.6.36 innodb. Bug #23481444 OPTIMISER CALL ROW_SEARCH_MVCC() AND READ THE INDEX APPLIED BY UNCOMMITTED ROW Problem: ======== row_search_for_mysql() does whole table traversal for range query even though the end range is passed. Whole table traversal happens when the record is not with in transaction read view. Solution: ========= Convert the innodb last record of page to mysql format and compare with end range if the traversal of row_search_mvcc() exceeds 100, no ICP involved. If it is out of range then InnoDB can avoid the whole table traversal. Need to refactor the code little bit to make it compile. Reviewed-by: Jimmy Yang <jimmy.yang@oracle.com> Reviewed-by: Knut Hatlen <knut.hatlen@oracle.com> Reviewed-by: Dmitry Shulga <dmitry.shulga@oracle.com> RB: 14660
| | | * | | 5.6.36Vicențiu Ciorbaru2017-05-1531-292/+658
| | | | | |
| | * | | | Revert "Fix unit test after merge from mysql 5.5.35 perfschema"Vicențiu Ciorbaru2017-05-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4799af092574e7957d7143c7751acef74a95a495. Upstream provided adequate fix. This commit is no longer necessary.
| | * | | | Merge branch 'merge-xtradb-5.6' into 10.0Vicențiu Ciorbaru2017-05-1741-434/+1204
| | |\ \ \ \
| | | * | | | 5.6.36-82.0Vicențiu Ciorbaru2017-05-1642-459/+1419
| | | | | | |
| | * | | | | Remove tokudb_dir_cmd variableVicențiu Ciorbaru2017-05-161-71/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The feature is too dangerous for a stable version.
| | * | | | | Merge branch 'merge-tokudb-5.6' into 10.0Vicențiu Ciorbaru2017-05-1634-187/+1816
| | |\ \ \ \ \
| | | * | | | | 5.6.36-82.0Vicențiu Ciorbaru2017-05-1635-190/+1817
| | | | | | | |
| | * | | | | | Update perfschema version to 5.6.36 post-mergeVicențiu Ciorbaru2017-05-161-1/+1
| | | | | | | |
| | * | | | | | Merge remote-tracking branch 'connect/10.0' into 10.0Vicențiu Ciorbaru2017-05-16102-4083/+3563
| | |\ \ \ \ \ \
| | | * | | | | | MDEV-12651: change error code to ER_ILLEGAL_HA in rnd_pos (ha_connect.cc)Olivier Bertrand2017-05-121-1/+1
| | | | | | | | |