mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 02:05:57 +01:00
eb483c5181
- multi_range_read_info_const now uses the new records_in_range interface - Added handler::avg_io_cost() - Don't calculate avg_io_cost() in get_sweep_read_cost if avg_io_cost is not 1.0. In this case we trust the avg_io_cost() from the handler. - Changed test_quick_select to use TIME_FOR_COMPARE instead of TIME_FOR_COMPARE_IDX to align this with the rest of the code. - Fixed bug when using test_if_cheaper_ordering where we didn't use keyread if index was changed - Fixed a bug where we didn't use index only read when using order-by-index - Added keyread_time() to HEAP. The default keyread_time() was optimized for blocks and not suitable for HEAP. The effect was the HEAP prefered table scans over ranges for btree indexes. - Fixed get_sweep_read_cost() for HEAP tables - Ensure that range and ref have same cost for simple ranges Added a small cost (MULTI_RANGE_READ_SETUP_COST) to ranges to ensure we favior ref for range for simple queries. - Fixed that matching_candidates_in_table() uses same number of records as the rest of the optimizer - Added avg_io_cost() to JT_EQ_REF cost. This helps calculate the cost for HEAP and temporary tables better. A few tests changed because of this. - heap::read_time() and heap::keyread_time() adjusted to not add +1. This was to ensure that handler::keyread_time() doesn't give higher cost for heap tables than for normal tables. One effect of this is that heap and derived tables stored in heap will prefer key access as this is now regarded as cheap. - Changed cost for index read in sql_select.cc to match multi_range_read_info_const(). All index cost calculation is now done trough one function. - 'ref' will now use quick_cost for keys if it exists. This is done so that for '=' ranges, 'ref' is prefered over 'range'. - scan_time() now takes avg_io_costs() into account - get_delayed_table_estimates() uses block_size and avg_io_cost() - Removed default argument to test_if_order_by_key(); simplifies code
34 lines
830 B
Text
34 lines
830 B
Text
#
|
|
# verify that DELETE IGNORE does not ignore deadlocks
|
|
#
|
|
|
|
--source include/have_innodb.inc
|
|
|
|
SET GLOBAL innodb_lock_wait_timeout=3;
|
|
|
|
CREATE TABLE t1 (col_int_key INT, KEY (col_int_key)) ENGINE=InnoDB;
|
|
INSERT INTO t1 VALUES (6);
|
|
|
|
--connect (con1,localhost,root,,test)
|
|
SET SESSION TRANSACTION ISOLATION LEVEL SERIALIZABLE;
|
|
SET AUTOCOMMIT=OFF;
|
|
SELECT col_int_key FROM t1;
|
|
|
|
--connection default
|
|
--send DELETE IGNORE FROM t1;
|
|
|
|
--connection con1
|
|
--error 0,ER_LOCK_DEADLOCK,ER_LOCK_WAIT_TIMEOUT
|
|
DELETE FROM t1 WHERE col_int_key IN (1, 40000000);
|
|
|
|
--connection default
|
|
--disable_warnings
|
|
--error 0,ER_LOCK_DEADLOCK,ER_LOCK_WAIT_TIMEOUT
|
|
--reap
|
|
--enable_warnings
|
|
|
|
--disconnect con1
|
|
drop table t1;
|
|
SET GLOBAL innodb_lock_wait_timeout=default;
|
|
|
|
call mtr.add_suppression("Deadlock found when trying to get lock; try restarting transaction");
|