From dd377bfba62b5f9d8bc43b9d2fdaddbc4107d6e9 Mon Sep 17 00:00:00 2001
From: "monty@mashka.mysql.fi" <>
Date: Sun, 27 Apr 2003 22:12:08 +0300
Subject: Fixed problem when comparing a key for a multi-byte-character set.
 (bug 152) Use 0x.... as strings if 'new' mode. (bug 152) Don't report -max on
 windows when InnoDB is enabled. (bug 332) Reset current_linfo;  This could
 cause a hang when doing PURGE LOGS. Fix for row numbers in EXPLAIN (bug 322) 
 Fix that USE_FRM works for all table types (bug 97)

---
 myisam/mi_key.c | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

(limited to 'myisam/mi_key.c')

diff --git a/myisam/mi_key.c b/myisam/mi_key.c
index 9ec1ca99e0e..5b167cc9ab0 100644
--- a/myisam/mi_key.c
+++ b/myisam/mi_key.c
@@ -136,11 +136,26 @@ uint _mi_make_key(register MI_INFO *info, uint keynr, uchar *key,
 } /* _mi_make_key */
 
 
-	/* Pack a key to intern format from given format (c_rkey) */
-	/* returns length of packed key */
+/*
+  Pack a key to intern format from given format (c_rkey)
+
+  SYNOPSIS
+    _mi_pack_key()
+    info		MyISAM handler
+    uint keynr		key number
+    key			Store packed key here
+    old			Not packed key
+    k_length		Length of 'old' to use
+    last_used_keyseg	out parameter.  May be NULL
+
+   RETURN
+     length of packed key
+
+     last_use_keyseg 	Store pointer to the keyseg after the last used one
+*/
 
 uint _mi_pack_key(register MI_INFO *info, uint keynr, uchar *key, uchar *old,
-		  uint k_length)
+		  uint k_length, MI_KEYSEG **last_used_keyseg)
 {
   uint length;
   uchar *pos,*end,*start_key=key;
@@ -211,6 +226,8 @@ uint _mi_pack_key(register MI_INFO *info, uint keynr, uchar *key, uchar *old,
     key+= length;
     k_length-=length;
   }
+  if (last_used_keyseg)
+    *last_used_keyseg= keyseg;
 
 #ifdef NOT_USED
   if (keyseg->type)
-- 
cgit v1.2.1