summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2020-10-29 01:42:07 +0100
committerSergei Golubchik <serg@mariadb.org>2020-10-29 09:27:05 +0100
commit313cf9de2c9036e5acd5fef3be6afebbad471998 (patch)
treed2e4265ff346561bbc6ed2e23cd9df0f7c39f40f
parenteae10a87ff60d1b419f103533d739caa8c5e467c (diff)
downloadmariadb-git-313cf9de2c9036e5acd5fef3be6afebbad471998.tar.gz
update result files after backport
followup for 3e807d255e0e and eae10a87ff60
-rw-r--r--mysql-test/r/aria_icp_debug.result4
-rw-r--r--mysql-test/r/innodb_icp_debug.result4
-rw-r--r--mysql-test/r/myisam_icp_debug.result4
3 files changed, 0 insertions, 12 deletions
diff --git a/mysql-test/r/aria_icp_debug.result b/mysql-test/r/aria_icp_debug.result
index fc01ee4fb3b..26881d5a4cc 100644
--- a/mysql-test/r/aria_icp_debug.result
+++ b/mysql-test/r/aria_icp_debug.result
@@ -21,14 +21,10 @@ id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t2 range kp1 kp1 5 NULL 10 Using index condition
set debug_sync='handler_index_cond_check SIGNAL at_icp_check WAIT_FOR go';
select * from t2 where kp1 between 10 and 20 and kp2 +1 >100;
-connect con1, localhost, root,,;
-connection con1;
set debug_sync='now WAIT_FOR at_icp_check';
kill query $target_id;
set debug_sync='now SIGNAL go';
-connection default;
ERROR 70100: Query execution was interrupted
set debug_sync='RESET';
-disconnect con1;
drop table t0,t1,t2;
set default_storage_engine=default;
diff --git a/mysql-test/r/innodb_icp_debug.result b/mysql-test/r/innodb_icp_debug.result
index 5a169650c8e..f9f5dcc794c 100644
--- a/mysql-test/r/innodb_icp_debug.result
+++ b/mysql-test/r/innodb_icp_debug.result
@@ -21,14 +21,10 @@ id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t2 range kp1 kp1 5 NULL 11 Using index condition
set debug_sync='handler_index_cond_check SIGNAL at_icp_check WAIT_FOR go';
select * from t2 where kp1 between 10 and 20 and kp2 +1 >100;
-connect con1, localhost, root,,;
-connection con1;
set debug_sync='now WAIT_FOR at_icp_check';
kill query $target_id;
set debug_sync='now SIGNAL go';
-connection default;
ERROR 70100: Query execution was interrupted
set debug_sync='RESET';
-disconnect con1;
drop table t0,t1,t2;
set default_storage_engine=default;
diff --git a/mysql-test/r/myisam_icp_debug.result b/mysql-test/r/myisam_icp_debug.result
index cb45a0e2274..8c5caef7874 100644
--- a/mysql-test/r/myisam_icp_debug.result
+++ b/mysql-test/r/myisam_icp_debug.result
@@ -20,13 +20,9 @@ id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t2 range kp1 kp1 5 NULL 11 Using index condition
set debug_sync='handler_index_cond_check SIGNAL at_icp_check WAIT_FOR go';
select * from t2 where kp1 between 10 and 20 and kp2 +1 >100;
-connect con1, localhost, root,,;
-connection con1;
set debug_sync='now WAIT_FOR at_icp_check';
kill query $target_id;
set debug_sync='now SIGNAL go';
-connection default;
ERROR 70100: Query execution was interrupted
set debug_sync='RESET';
-disconnect con1;
drop table t0,t1,t2;