summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/innodb_icp.result18
-rw-r--r--mysql-test/r/join_cache.result24
-rw-r--r--mysql-test/r/lock_multi.result1
-rw-r--r--mysql-test/r/maria_icp.result18
-rw-r--r--mysql-test/r/myisam_icp.result33
-rw-r--r--mysql-test/r/myisam_icp_notembedded.result19
-rw-r--r--mysql-test/r/myisam_mrr.result15
-rw-r--r--mysql-test/r/status.result16
-rw-r--r--mysql-test/r/status_user.result7
-rw-r--r--mysql-test/r/type_timestamp.result13
10 files changed, 103 insertions, 61 deletions
diff --git a/mysql-test/r/innodb_icp.result b/mysql-test/r/innodb_icp.result
index a5029d7508a..5b4b09df1fe 100644
--- a/mysql-test/r/innodb_icp.result
+++ b/mysql-test/r/innodb_icp.result
@@ -816,24 +816,24 @@ KEY (c1)
);
INSERT INTO t1 VALUES ('3', '3'),('4','4'),('5','5');
flush status;
-show status like "Handler_pushed%";
+show status like "Handler_icp%";
Variable_name Value
-Handler_pushed_index_cond_checks 0
-Handler_pushed_index_cond_filtered 0
+Handler_icp_attempts 0
+Handler_icp_match 0
SELECT * FROM t1 FORCE INDEX(c1) WHERE (c1='3' or c1='4') and c1 % 2 = 0 ;
c1 c2
4 4
-show status like "Handler_pushed%";
+show status like "Handler_icp%";
Variable_name Value
-Handler_pushed_index_cond_checks 2
-Handler_pushed_index_cond_filtered 1
+Handler_icp_attempts 2
+Handler_icp_match 1
SELECT * FROM t1 WHERE (c2='3' or c2='4') and c2 % 2 = 0 ;
c1 c2
4 4
-show status like "Handler_pushed%";
+show status like "Handler_icp%";
Variable_name Value
-Handler_pushed_index_cond_checks 2
-Handler_pushed_index_cond_filtered 1
+Handler_icp_attempts 2
+Handler_icp_match 1
DROP TABLE t1;
#
# BUG#920132: Assert trx->n_active_thrs == 1 failed at que0que.c line 1050
diff --git a/mysql-test/r/join_cache.result b/mysql-test/r/join_cache.result
index db9a3b7090e..9c85fb2516a 100644
--- a/mysql-test/r/join_cache.result
+++ b/mysql-test/r/join_cache.result
@@ -3520,10 +3520,10 @@ where t1.f1=t2.f1 and t2.f2 between t1.f1 and t2.f2;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ALL NULL NULL NULL NULL 3 Using where
1 SIMPLE t2 ref f1 f1 4 test.t1.f1 3 Using index condition(BKA); Using join buffer (flat, BKA join); Key-ordered Rowid-ordered scan
-show status like "Handler_pushed%";
+show status like "Handler_icp%";
Variable_name Value
-Handler_pushed_index_cond_checks 20
-Handler_pushed_index_cond_filtered 16
+Handler_icp_attempts 20
+Handler_icp_match 4
set join_cache_level=6;
select t2.f1, t2.f2, t2.f3 from t1,t2
where t1.f1=t2.f1 and t2.f2 between t1.f1 and t1.f2 and t2.f2 + 1 >= t1.f1 + 1;
@@ -3537,10 +3537,10 @@ where t1.f1=t2.f1 and t2.f2 between t1.f1 and t2.f2;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ALL NULL NULL NULL NULL 3 Using where
1 SIMPLE t2 ref f1 f1 4 test.t1.f1 3 Using index condition(BKA); Using join buffer (flat, BKA join); Key-ordered Rowid-ordered scan
-show status like "Handler_pushed%";
+show status like "Handler_icp%";
Variable_name Value
-Handler_pushed_index_cond_checks 40
-Handler_pushed_index_cond_filtered 32
+Handler_icp_attempts 40
+Handler_icp_match 8
set join_cache_level=7;
select t2.f1, t2.f2, t2.f3 from t1,t2
where t1.f1=t2.f1 and t2.f2 between t1.f1 and t1.f2 and t2.f2 + 1 >= t1.f1 + 1;
@@ -3554,10 +3554,10 @@ where t1.f1=t2.f1 and t2.f2 between t1.f1 and t2.f2;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ALL NULL NULL NULL NULL 3 Using where
1 SIMPLE t2 ref f1 f1 4 test.t1.f1 3 Using index condition(BKA); Using where; Using join buffer (flat, BKAH join); Key-ordered Rowid-ordered scan
-show status like "Handler_pushed%";
+show status like "Handler_icp%";
Variable_name Value
-Handler_pushed_index_cond_checks 60
-Handler_pushed_index_cond_filtered 48
+Handler_icp_attempts 60
+Handler_icp_match 12
set join_cache_level=8;
select t2.f1, t2.f2, t2.f3 from t1,t2
where t1.f1=t2.f1 and t2.f2 between t1.f1 and t1.f2 and t2.f2 + 1 >= t1.f1 + 1;
@@ -3571,10 +3571,10 @@ where t1.f1=t2.f1 and t2.f2 between t1.f1 and t2.f2;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ALL NULL NULL NULL NULL 3 Using where
1 SIMPLE t2 ref f1 f1 4 test.t1.f1 3 Using index condition(BKA); Using where; Using join buffer (flat, BKAH join); Key-ordered Rowid-ordered scan
-show status like "Handler_pushed%";
+show status like "Handler_icp%";
Variable_name Value
-Handler_pushed_index_cond_checks 80
-Handler_pushed_index_cond_filtered 64
+Handler_icp_attempts 80
+Handler_icp_match 16
drop table t1,t2;
set join_cache_level=default;
#
diff --git a/mysql-test/r/lock_multi.result b/mysql-test/r/lock_multi.result
index 9d6135eda80..67712ccabe6 100644
--- a/mysql-test/r/lock_multi.result
+++ b/mysql-test/r/lock_multi.result
@@ -1,4 +1,5 @@
drop table if exists t1,t2;
+drop DATABASE if exists mysqltest_1;
create table t1(n int);
insert into t1 values (1);
select get_lock("mysqltest_lock", 100);
diff --git a/mysql-test/r/maria_icp.result b/mysql-test/r/maria_icp.result
index 1b777d63578..2d0110f2f35 100644
--- a/mysql-test/r/maria_icp.result
+++ b/mysql-test/r/maria_icp.result
@@ -822,24 +822,24 @@ KEY (c1)
);
INSERT INTO t1 VALUES ('3', '3'),('4','4'),('5','5');
flush status;
-show status like "Handler_pushed%";
+show status like "Handler_icp%";
Variable_name Value
-Handler_pushed_index_cond_checks 0
-Handler_pushed_index_cond_filtered 0
+Handler_icp_attempts 0
+Handler_icp_match 0
SELECT * FROM t1 FORCE INDEX(c1) WHERE (c1='3' or c1='4') and c1 % 2 = 0 ;
c1 c2
4 4
-show status like "Handler_pushed%";
+show status like "Handler_icp%";
Variable_name Value
-Handler_pushed_index_cond_checks 2
-Handler_pushed_index_cond_filtered 1
+Handler_icp_attempts 2
+Handler_icp_match 1
SELECT * FROM t1 WHERE (c2='3' or c2='4') and c2 % 2 = 0 ;
c1 c2
4 4
-show status like "Handler_pushed%";
+show status like "Handler_icp%";
Variable_name Value
-Handler_pushed_index_cond_checks 2
-Handler_pushed_index_cond_filtered 1
+Handler_icp_attempts 2
+Handler_icp_match 1
DROP TABLE t1;
set storage_engine= @save_storage_engine;
set optimizer_switch=@maria_icp_tmp;
diff --git a/mysql-test/r/myisam_icp.result b/mysql-test/r/myisam_icp.result
index a9b0dba3fb9..f1a2af264a3 100644
--- a/mysql-test/r/myisam_icp.result
+++ b/mysql-test/r/myisam_icp.result
@@ -820,24 +820,24 @@ KEY (c1)
);
INSERT INTO t1 VALUES ('3', '3'),('4','4'),('5','5');
flush status;
-show status like "Handler_pushed%";
+show status like "Handler_icp%";
Variable_name Value
-Handler_pushed_index_cond_checks 0
-Handler_pushed_index_cond_filtered 0
+Handler_icp_attempts 0
+Handler_icp_match 0
SELECT * FROM t1 FORCE INDEX(c1) WHERE (c1='3' or c1='4') and c1 % 2 = 0 ;
c1 c2
4 4
-show status like "Handler_pushed%";
+show status like "Handler_icp%";
Variable_name Value
-Handler_pushed_index_cond_checks 2
-Handler_pushed_index_cond_filtered 1
+Handler_icp_attempts 2
+Handler_icp_match 1
SELECT * FROM t1 WHERE (c2='3' or c2='4') and c2 % 2 = 0 ;
c1 c2
4 4
-show status like "Handler_pushed%";
+show status like "Handler_icp%";
Variable_name Value
-Handler_pushed_index_cond_checks 2
-Handler_pushed_index_cond_filtered 1
+Handler_icp_attempts 2
+Handler_icp_match 1
DROP TABLE t1;
drop table if exists t0, t1, t1i, t1m;
#
@@ -914,19 +914,4 @@ Warning 1292 Truncated incorrect DOUBLE value: 'c'
Warning 1292 Truncated incorrect DOUBLE value: 'c'
SET optimizer_switch=@save_optimizer_switch;
DROP TABLE t1,t2,t3,t4;
-#
-# BUG#933412: Server crashes in _mi_put_key_in_record on KILL QUERY with ICP, STRAIGHT_JOIN
-#
-CREATE TABLE t1 (
-b INT,
-c VARCHAR(1) NOT NULL,
-d DATETIME,
-KEY (c, b)
-) ENGINE=MyISAM;
-# INSERT some data
-CREATE TABLE t2 ( a INT ) ENGINE=MyISAM;
-INSERT INTO t2 VALUES
-(7),(3),(7),(3);
-# Now run a number of ICP queries while trying to kill them
-DROP TABLE t1,t2;
set optimizer_switch=@myisam_icp_tmp;
diff --git a/mysql-test/r/myisam_icp_notembedded.result b/mysql-test/r/myisam_icp_notembedded.result
new file mode 100644
index 00000000000..d965cbd980d
--- /dev/null
+++ b/mysql-test/r/myisam_icp_notembedded.result
@@ -0,0 +1,19 @@
+drop table if exists t1,t2;
+set @myisam_icp_notembedded_tmp=@@optimizer_switch;
+set optimizer_switch='mrr=on,mrr_sort_keys=on,index_condition_pushdown=on';
+#
+# BUG#933412: Server crashes in _mi_put_key_in_record on KILL QUERY with ICP, STRAIGHT_JOIN
+#
+CREATE TABLE t1 (
+b INT,
+c VARCHAR(1) NOT NULL,
+d DATETIME,
+KEY (c, b)
+) ENGINE=MyISAM;
+# INSERT some data
+CREATE TABLE t2 ( a INT ) ENGINE=MyISAM;
+INSERT INTO t2 VALUES
+(7),(3),(7),(3);
+# Now run a number of ICP queries while trying to kill them
+DROP TABLE t1,t2;
+set optimizer_switch=@myisam_icp_notembedded_tmp;
diff --git a/mysql-test/r/myisam_mrr.result b/mysql-test/r/myisam_mrr.result
index 01d3e6aeb5d..0da0f8fd5eb 100644
--- a/mysql-test/r/myisam_mrr.result
+++ b/mysql-test/r/myisam_mrr.result
@@ -563,6 +563,9 @@ drop table t1;
flush status;
show status like 'Handler_mrr%';
Variable_name Value
+Handler_mrr_init 0
+Handler_mrr_key_refills 0
+Handler_mrr_rowid_refills 0
create table t0 (a int);
insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
create table t1 (a int, b int, filler char(200), key(a));
@@ -578,6 +581,9 @@ sum(b)
1230
show status like 'handler_mrr%';
Variable_name Value
+Handler_mrr_init 1
+Handler_mrr_key_refills 0
+Handler_mrr_rowid_refills 0
set @mrr_buffer_size_save= @@mrr_buffer_size;
set mrr_buffer_size=128;
explain select sum(b) from t1 where a < 1600;
@@ -590,6 +596,9 @@ sum(b)
196800
show status like 'handler_mrr%';
Variable_name Value
+Handler_mrr_init 1
+Handler_mrr_key_refills 0
+Handler_mrr_rowid_refills 1
set @@mrr_buffer_size= @mrr_buffer_size_save;
#Now, let's check BKA:
set @join_cache_level_save= @@join_cache_level;
@@ -605,6 +614,9 @@ sum(t1.b)
1230
show status like 'handler_mrr%';
Variable_name Value
+Handler_mrr_init 1
+Handler_mrr_key_refills 0
+Handler_mrr_rowid_refills 0
set join_buffer_size=10;
explain select sum(t1.b) from t0,t1 where t0.a=t1.a;
id select_type table type possible_keys key key_len ref rows Extra
@@ -616,6 +628,9 @@ sum(t1.b)
1230
show status like 'handler_mrr%';
Variable_name Value
+Handler_mrr_init 2
+Handler_mrr_key_refills 3
+Handler_mrr_rowid_refills 3
set join_cache_level= @join_cache_level_save;
set join_buffer_size= @join_buffer_size_save;
drop table t0, t1;
diff --git a/mysql-test/r/status.result b/mysql-test/r/status.result
index 644137a43bd..7e3c2c45116 100644
--- a/mysql-test/r/status.result
+++ b/mysql-test/r/status.result
@@ -275,9 +275,12 @@ Variable_name Value
Handler_commit 0
Handler_delete 0
Handler_discover 0
+Handler_icp_attempts 0
+Handler_icp_match 0
+Handler_mrr_init 0
+Handler_mrr_key_refills 0
+Handler_mrr_rowid_refills 0
Handler_prepare 0
-Handler_pushed_index_cond_checks 0
-Handler_pushed_index_cond_filtered 0
Handler_read_first 0
Handler_read_key 4
Handler_read_last 0
@@ -300,7 +303,7 @@ Created_tmp_files 0
Created_tmp_tables 2
Handler_tmp_update 2
Handler_tmp_write 7
-Rows_tmp_read 38
+Rows_tmp_read 41
drop table t1;
CREATE TABLE t1 (i int(11) DEFAULT NULL, KEY i (i) ) ENGINE=MyISAM;
insert into t1 values (1),(2),(3),(4),(5);
@@ -313,9 +316,12 @@ Variable_name Value
Handler_commit 0
Handler_delete 0
Handler_discover 0
+Handler_icp_attempts 0
+Handler_icp_match 0
+Handler_mrr_init 0
+Handler_mrr_key_refills 0
+Handler_mrr_rowid_refills 0
Handler_prepare 0
-Handler_pushed_index_cond_checks 0
-Handler_pushed_index_cond_filtered 0
Handler_read_first 0
Handler_read_key 2
Handler_read_last 0
diff --git a/mysql-test/r/status_user.result b/mysql-test/r/status_user.result
index e6db4ac2403..528d005b81b 100644
--- a/mysql-test/r/status_user.result
+++ b/mysql-test/r/status_user.result
@@ -100,9 +100,12 @@ Variable_name Value
Handler_commit 19
Handler_delete 1
Handler_discover 0
+Handler_icp_attempts 0
+Handler_icp_match 0
+Handler_mrr_init 0
+Handler_mrr_key_refills 0
+Handler_mrr_rowid_refills 0
Handler_prepare 18
-Handler_pushed_index_cond_checks 0
-Handler_pushed_index_cond_filtered 0
Handler_read_first 0
Handler_read_key 3
Handler_read_last 0
diff --git a/mysql-test/r/type_timestamp.result b/mysql-test/r/type_timestamp.result
index 317b97839ed..52c7f05839e 100644
--- a/mysql-test/r/type_timestamp.result
+++ b/mysql-test/r/type_timestamp.result
@@ -587,6 +587,19 @@ Variable_name Value
Handler_read_next 1
DROP TABLE t1, t2;
End of 5.1 tests
+#
+# lp:923429 Crash in decimal_cmp on using UNIX_TIMESTAMP with a wrongly formatted timestamp
+#
+SELECT UNIX_TIMESTAMP('abc') > 0;
+UNIX_TIMESTAMP('abc') > 0
+NULL
+Warnings:
+Warning 1292 Incorrect datetime value: 'abc'
+SELECT UNIX_TIMESTAMP('abc');
+UNIX_TIMESTAMP('abc')
+NULL
+Warnings:
+Warning 1292 Incorrect datetime value: 'abc'
Bug#50888 valgrind warnings in Field_timestamp::val_str
View Lorry Controller Status