From db7efa27803b1ee58a3b04c63a4cc14241420fd0 Mon Sep 17 00:00:00 2001
From: "monty@mysql.com" <>
Date: Thu, 8 Jul 2004 15:45:25 +0300
Subject: New handler::index_flags() definition to make it easy to check the
 full used key and a specific key part. Added key part to optimize_range() to
 fix problems when using fields in key parts.

---
 sql/ha_berkeley.cc | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'sql/ha_berkeley.cc')

diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc
index 4bed33af15b..bb07bd9dc4b 100644
--- a/sql/ha_berkeley.cc
+++ b/sql/ha_berkeley.cc
@@ -340,6 +340,23 @@ const char **ha_berkeley::bas_ext() const
 { static const char *ext[]= { ha_berkeley_ext, NullS }; return ext; }
 
 
+ulong ha_berkeley::index_flags(uint idx, uint part, bool all_parts) const
+{
+  ulong flags= (HA_READ_NEXT | HA_READ_PREV | HA_READ_ORDER | HA_KEYREAD_ONLY
+                | HA_READ_RANGE);
+  for (uint idx= all_parts ? 0 : part ; idx <= part ; idx++)
+  {
+    if (table->key_info[idx].key_part[part].field->type() == FIELD_TYPE_BLOB)
+    {
+      /* We can't use BLOBS to shortcut sorts */
+      flags&= ~ (HA_READ_ORDER | HA_KEYREAD_ONLY | HA_READ_RANGE);
+      break;
+    }
+  }
+  return flags;
+}
+
+
 static int
 berkeley_cmp_hidden_key(DB* file, const DBT *new_key, const DBT *saved_key)
 {
-- 
cgit v1.2.1


From c1032fe9eb912a29653c917f63c71c97a5111daa Mon Sep 17 00:00:00 2001
From: "monty@mysql.com" <>
Date: Fri, 9 Jul 2004 10:55:16 +0300
Subject: Cleanup of db option cacheing Some bug fixes to last pushed code

---
 sql/ha_berkeley.cc | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'sql/ha_berkeley.cc')

diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc
index bb07bd9dc4b..39ef6ca855a 100644
--- a/sql/ha_berkeley.cc
+++ b/sql/ha_berkeley.cc
@@ -344,12 +344,24 @@ ulong ha_berkeley::index_flags(uint idx, uint part, bool all_parts) const
 {
   ulong flags= (HA_READ_NEXT | HA_READ_PREV | HA_READ_ORDER | HA_KEYREAD_ONLY
                 | HA_READ_RANGE);
-  for (uint idx= all_parts ? 0 : part ; idx <= part ; idx++)
+  for (uint i= all_parts ? 0 : part ; i <= part ; i++)
   {
-    if (table->key_info[idx].key_part[part].field->type() == FIELD_TYPE_BLOB)
+    if (table->key_info[idx].key_part[i].field->type() == FIELD_TYPE_BLOB)
     {
       /* We can't use BLOBS to shortcut sorts */
-      flags&= ~ (HA_READ_ORDER | HA_KEYREAD_ONLY | HA_READ_RANGE);
+      flags&= ~(HA_READ_ORDER | HA_KEYREAD_ONLY | HA_READ_RANGE);
+      break;
+    }
+    switch (table->key_info[idx].key_part[i].field->key_type()) {
+    case HA_KEYTYPE_TEXT:
+    case HA_KEYTYPE_VARTEXT:
+      /*
+        As BDB stores only one copy of equal strings, we can't use key read
+        on these
+      */
+      flags&= ~HA_KEYREAD_ONLY;
+      break;
+    default:                                    // Keep compiler happy
       break;
     }
   }
-- 
cgit v1.2.1