From 199863d72b7cccaa4c75641c50c45a83b568ab8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Fri, 30 Oct 2020 11:04:16 +0200 Subject: MDEV-23991 fixup: Initialize the memory Also, revert the work-around for the test that was attempted in commit 85613a32477ef4b8fb9aefba5f61689028f3ff87. This issue was caught by MemorySanitizer as well as on the Microsoft Windows debug builds, thanks to /MD being used starting with 10.4. The code fix will also be applied to 10.2 because the regression was introduced in commit afc9d00c66db946c8240fe1fa6b345a3a8b6fec1. --- mysql-test/main/innodb_ext_key.test | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'mysql-test/main/innodb_ext_key.test') diff --git a/mysql-test/main/innodb_ext_key.test b/mysql-test/main/innodb_ext_key.test index 2fed1c35a41..9ca9bbd608f 100644 --- a/mysql-test/main/innodb_ext_key.test +++ b/mysql-test/main/innodb_ext_key.test @@ -98,11 +98,11 @@ select l_orderkey, l_linenumber or l_receiptdate='1992-07-01' and l_orderkey between 5001 and 6000; show status like 'handler_read%'; -# FIXME: optimizer_switch=extended_keys=off occasionally gets wrong plan -#explain -#select l_orderkey, l_linenumber from lineitem -# where l_shipdate='1992-07-01' and l_orderkey between 1 and 1000 -# or l_receiptdate='1992-07-01' and l_orderkey between 5001 and 6000; +--replace_column 7 # 9 # 10 Using +explain +select l_orderkey, l_linenumber from lineitem + where l_shipdate='1992-07-01' and l_orderkey between 1 and 1000 + or l_receiptdate='1992-07-01' and l_orderkey between 5001 and 6000; flush status; select l_orderkey, l_linenumber from lineitem where l_shipdate='1992-07-01' and l_orderkey between 1 and 1000 -- cgit v1.2.1