From 6295e1b1954dcd1b35024586fc7bfd00005f39ac Mon Sep 17 00:00:00 2001
From: "monty@donna.mysql.com" <>
Date: Fri, 12 Jan 2001 16:40:27 +0200
Subject: Added test for innobase Fixed problem with NULL keys in BDB

---
 sql/ha_berkeley.cc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'sql')

diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc
index 981526910af..0cf789056c9 100644
--- a/sql/ha_berkeley.cc
+++ b/sql/ha_berkeley.cc
@@ -770,10 +770,8 @@ DBT *ha_berkeley::pack_key(DBT *key, uint keynr, char *buff,
 
   for (; key_part != end && (int) key_length > 0 ; key_part++)
   {
-    uint offset=0;
     if (key_part->null_bit)
     {
-      offset=1;
       if (!(*buff++ = (*key_ptr == 0)))		// Store 0 if NULL
       {
 	key_length-= key_part->store_length;
@@ -783,7 +781,7 @@ DBT *ha_berkeley::pack_key(DBT *key, uint keynr, char *buff,
       }
       key_ptr++;
     }
-    buff=key_part->field->keypack(buff,key_ptr+offset,key_part->length);
+    buff=key_part->field->keypack(buff,key_ptr,key_part->length);
     key_ptr+=key_part->store_length;
     key_length-=key_part->store_length;
   }
-- 
cgit v1.2.1