From 2e96b7050c2aa62eb2887e269c85545e2f1da252 Mon Sep 17 00:00:00 2001
From: unknown <Sinisa@sinisa.nasamreza.org>
Date: Tue, 12 Nov 2002 16:22:26 +0200
Subject: [PATCH] IGNORE_INDEX fix for 4.0
---
mysql-test/r/select.result | 4 ++--
sql/sql_base.cc | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result
index 1a40c5b11c3..fdcc7f9cdea 100644
--- a/mysql-test/r/select.result
+++ b/mysql-test/r/select.result
@@ -1331,10 +1331,10 @@ table type possible_keys key key_len ref rows Extra
t2 ref fld3 fld3 30 const 1 Using where; Using index
explain select fld3 from t2 ignore index (fld3) where fld3 = 'honeysuckle';
table type possible_keys key key_len ref rows Extra
-t2 index NULL fld3 30 NULL 1199 Using where; Using index
+t2 ALL NULL NULL NULL NULL 1199 Using where
explain select fld3 from t2 use index (fld1) where fld3 = 'honeysuckle';
table type possible_keys key key_len ref rows Extra
-t2 index NULL fld3 30 NULL 1199 Using where; Using index
+t2 ALL NULL NULL NULL NULL 1199 Using where
explain select fld3 from t2 use index (fld3) where fld3 = 'honeysuckle';
table type possible_keys key key_len ref rows Extra
t2 ref fld3 fld3 30 const 1 Using where; Using index
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index ec2e22d2a5d..458611d1504 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -1850,6 +1850,7 @@ bool setup_tables(TABLE_LIST *tables)
for (Field **ptr=table->field ; *ptr ; ptr++)
(*ptr)->query_id=0;
}
+ table->used_keys&= table->keys_in_use_for_query;
}
if (tablenr > MAX_TABLES)
{
--
2.30.9