First part of redo/undo for key pages

Added key_nr to st_maria_keydef for faster keyinfo->keynr conversion
For transactional tables, shift record number in keys up with 1 bit to have place to indicate if transid follows
Checksum for MyISAM now ignores NULL and not used part of VARCHAR
Renamed some variables that caused shadow compiler warnings
Moved extra() call when waiting for tables to not be used to after tables are removed from cache.
Fixed crashing bugs when using Maria TEMPORARY tables with TRUNCATE. Removed 'hack' code in sql directory to go around this bug.
pagecache_unlock_by_ulink() now has extra argument to say if page was changed.
Give error message if we fail to open control file
Mark page cache variables as not flushable


include/maria.h:
  Made min page cache larger (needed for pinning key page)
  Added key_nr to st_maria_keydef for faster keyinfo->keynr conversion
  Added write_comp_flag to move some runtime code to maria_open()
include/my_base.h:
  Added new error message to be used when handler initialization failed
include/my_global.h:
  Renamed dummy to swap_dummy to avoid conflicts with local 'dummy' variables
include/my_handler.h:
  Added const to some parameters
mysys/array.c:
  More DBUG
mysys/my_error.c:
  Fixed indentation
mysys/my_handler.c:
  Added const to some parameters
  Added missing error messages
sql/field.h:
  Renamed variables to avoid variable shadowing
sql/handler.h:
  Renamed parameter to avoid variable name conflict
sql/item.h:
  Renamed variables to avoid variable shadowing
sql/log_event_old.h:
  Renamed variables to avoid variable shadowing
sql/set_var.h:
  Renamed variables to avoid variable shadowing
sql/sql_delete.cc:
  Removed maria hack for temporary tables
  Fixed indentation
sql/sql_table.cc:
  Moved extra() call when waiting for tables to not be used to after tables are removed from cache.
  This was needed to ensure we don't do a PREPARE_FOR_DROP or similar call while the table is still in use.
sql/table.cc:
  Copy page_checksum from share
  Removed Maria hack
storage/maria/Makefile.am:
  Added new files
storage/maria/ha_maria.cc:
  Renamed records -> record_count and info -> create_info to avoid variable name conflicts
  Mark page cache variables as not flushable
storage/maria/ma_blockrec.c:
  Moved _ma_unpin_all_pages() to ma_key_recover.c
  Moved init of info->pinned_pages to ma_open.c
  Moved _ma_finalize_row() to maria_key_recover.h
  Renamed some variables to avoid variable name conflicts
  Mark page_link.changed for blocks we change directly
  Simplify handling of undo link when writing LOGREC_UNDO_ROW_INSERT (old code crashed when having redo for index)
storage/maria/ma_blockrec.h:
  Removed extra empty line
storage/maria/ma_checkpoint.c:
  Remove not needed trnman.h
storage/maria/ma_close.c:
  Free pinned pages (which are now always allocated)
storage/maria/ma_control_file.c:
  Give error message if we fail to open control file
storage/maria/ma_delete.c:
  Changes for redo logging (first part, logging of underflow not yet done)
  - Log undo-key-delete
  - Log delete of key
  - Updated arguments to _ma_fetch_keypage(), _ma_dispose(), _ma_write_keypage(), _ma_insert()
  - Added new arguments to some functions to be able to write redo information
  - Mark key pages as changed when we write with PAGECACHE_LOCK_LEFT_WRITELOCKED
  
  Remove one not needed _ma_write_keypage() in d_search() when upper level will do the write anyway
  Changed 2 bmove_upp() to bmove() as this made code easer to understand
  More function comments
  Indentation fixes
storage/maria/ma_ft_update.c:
  New arguments to _ma_write_keypage()
storage/maria/ma_loghandler.c:
  Fixed some DBUG_PRINT messages
  Simplify code
  Added new log entrys for key page redo
  Renamed some variables to avoid variable name shadowing
storage/maria/ma_loghandler.h:
  Moved some defines here
  Added define for storing key number on key pages
  Added new translog record types
  Added enum for type of operations in LOGREC_REDO_INDEX
storage/maria/ma_open.c:
  Always allocate info.pinned_pages (we need now also for normal key page usage)
  Update keyinfo->key_nr
  Added virtual functions to convert record position o number to be stored on key pages
  Update keyinfo->write_comp_flag to value of search flag to be used when writing key
storage/maria/ma_page.c:
  Added redo for key pages
  - Extended _ma_fetch_keypage() with type of lock to put on page and address to used MARIA_PINNED_PAGE
  - _ma_fetch_keypage() now pin's pages if needed
  - Extended _ma_write_keypage() with type of locks to be used
  - ma_dispose() now locks info->s->state.key_del from other threads
  - ma_dispose() writes redo log record
  - ma_new() locks info->s->state.key_del from other threads if it was used
  - ma_new() now pins read page
  
  Other things:
  - Removed some not needed arguments from _ma_new() and _ma_dispose)
  - Added some new variables to simplify code
  - If EXTRA_DEBUG is used, do crc on full page to catch not unitialized bytes
storage/maria/ma_pagecache.h:
  Applied patch from Sanja to add extra argument to pagecache_unlock_by_ulink() to mark if page was changed
  Added some defines for pagecache priority levels that one can use
storage/maria/ma_range.c:
  Added new arguments for call to _ma_fetch_keypage()
storage/maria/ma_recovery.c:
  - Added hooks for new translog types:
    REDO_INDEX, REDO_INDEX_NEW_PAGE, REDO_INDEX_FREE_PAGE, UNDO_KEY_INSERT, UNDO_KEY_DELETE and
    UNDO_KEY_DELETE_WITH_ROOT.
  - Moved variable declarations to start of function (portability fixes)
  - Removed some not needed initializations
  - Set only relevant state changes for each redo/undo entry
storage/maria/lockman.c:
  Removed end space
storage/maria/ma_check.c:
  Removed end space
storage/maria/ma_create.c:
  Removed end space
storage/maria/ma_locking.c:
  Removed end space
storage/maria/ma_packrec.c:
  Removed end space
storage/maria/ma_pagecache.c:
  Removed end space
storage/maria/ma_panic.c:
  Removed end space
storage/maria/ma_rt_index.c:
  Added new arguments for call to _ma_fetch_keypage(), _ma_write_keypage(), _ma_dispose() and _ma_new()
  Fixed indentation
storage/maria/ma_rt_key.c:
  Added new arguments for call to _ma_fetch_keypage()
storage/maria/ma_rt_split.c:
  Added new arguments for call to _ma_new()
  Use new keypage header
  Added new arguments for call to _ma_write_keypage()
storage/maria/ma_search.c:
  Updated comments & indentation
  Added new arguments for call to _ma_fetch_keypage()
  Made some variables and arguments const
  Added virtual functions for converting row position to number to be stored in key
  use MARIA_RECORD_POS of record position instead of my_off_t
  Record in MARIA_KEY_PARAM how page was changed one key insert (needed for REDO)
storage/maria/ma_sort.c:
  Removed end space
storage/maria/ma_statrec.c:
  Updated arguments for call to _ma_rec_pos()
storage/maria/ma_test1.c:
  Fixed too small buffer to init_pagecache()
  Fixed bug when using insert_count and test_flag
storage/maria/ma_test2.c:
  Use more resonable pagecache size
  Remove not used code
  Reset blob_length to fix wrong output message
storage/maria/ma_test_all.sh:
  Fixed wrong test
storage/maria/ma_write.c:
  Lots of new code to handle REDO of key pages
  No logic changes because of REDO code, mostly adding new arguments and adding new code for logging 
  
  Added new arguments for calls to _ma_fetch_keypage(), _ma_write_keypage() and similar functions
  Move setting of comp_flag in ma_ck_wrte_btree() from runtime to maria_open()
  Zerofill new used pages for:
  - To remove possible sensitive data left in buffer
  - To get idenitical data on pages after running redo
  - Better compression of pages if archived
storage/maria/maria_chk.c:
  Added information if table is crash safe
storage/maria/maria_def.h:
  New virtual function to convert between record position on key and normal record position
  Aded mutex and extra variables to handle locking of share->state.key_del
  Moved some structure variables to get things more aligned
  Added extra arguments to MARIA_KEY_PARAM to be able to remember what was changed on key page on key insert
  Added argument to MARIA_PINNED_PAGE to indicate if page was changed
  Updated prototypes for functions
  Added some structures for signaling changes in REDO handling
storage/maria/unittest/ma_pagecache_single.c:
  Updated arguments for changed function calls
storage/myisam/mi_check.c:
  Made calc_check_checksum virtual
storage/myisam/mi_checksum.c:
  Update checksums to ignore null columns
storage/myisam/mi_create.c:
  Mark if table has null column (to know when we have to use mi_checksum())
storage/myisam/mi_open.c:
  Added virtual function for calculating checksum to be able to easily ignore NULL fields
storage/myisam/mi_test2.c:
  Fixed bug
storage/myisam/myisamdef.h:
  Added virtual function for calculating checksum during check table
  Removed ha_key_cmp() as this is in handler.h
storage/maria/ma_key_recover.c:
  New BitKeeper file ``storage/maria/ma_key_recover.c''
storage/maria/ma_key_recover.h:
  New BitKeeper file ``storage/maria/ma_key_recover.h''
storage/maria/ma_key_redo.c:
  New BitKeeper file ``storage/maria/ma_key_redo.c''

1 files changed, 119 insertions, 60 deletions

diff --git a/storage/maria/ma_search.c b/storage/maria/ma_search.c
index 460d8367440..8eaff88155e 100644
--- a/storage/maria/ma_search.c
+++ b/storage/maria/ma_search.c
@@ -45,12 +45,17 @@ int _ma_check_index(MARIA_HA *info, int inx)
 } /* _ma_check_index */
 
 
-        /*
-        ** Search after row by a key
-        ** Position to row is stored in info->lastpos
-        ** Return: -1 if not found
-        **          1 if one should continue search on higher level
-        */
+/**
+   @breif Search after row by a key
+
+   @note
+     Position to row is stored in info->lastpos
+
+   @return
+   @retval  0   ok (key found)
+   @retval -1   Not found
+   @retval  1   If one should continue search on higher level
+*/
 
 int _ma_search(register MARIA_HA *info, register MARIA_KEYDEF *keyinfo,
                uchar *key, uint key_len, uint nextflag, register my_off_t pos)
@@ -74,9 +79,10 @@ int _ma_search(register MARIA_HA *info, register MARIA_KEYDEF *keyinfo,
     DBUG_RETURN(1);                             /* Search at upper levels */
   }
 
-  if (!(buff= _ma_fetch_keypage(info,keyinfo,pos,DFLT_INIT_HITS,
-                                info->keyread_buff,
-                                test(!(nextflag & SEARCH_SAVE_BUFF)))))
+  if (!(buff= _ma_fetch_keypage(info,keyinfo, pos,
+                                PAGECACHE_LOCK_LEFT_UNLOCKED,
+                                DFLT_INIT_HITS, info->keyread_buff,
+                                test(!(nextflag & SEARCH_SAVE_BUFF)), 0)))
     goto err;
   DBUG_DUMP("page", buff, _ma_get_page_used(info, buff));
 
@@ -118,9 +124,10 @@ int _ma_search(register MARIA_HA *info, register MARIA_KEYDEF *keyinfo,
   if (pos != info->last_keypage)
   {
     uchar *old_buff=buff;
-    if (!(buff= _ma_fetch_keypage(info,keyinfo,pos,DFLT_INIT_HITS,
+    if (!(buff= _ma_fetch_keypage(info,keyinfo, pos,
+                                  PAGECACHE_LOCK_LEFT_UNLOCKED,DFLT_INIT_HITS,
                                   info->keyread_buff,
-                                  test(!(nextflag & SEARCH_SAVE_BUFF)))))
+                                  test(!(nextflag & SEARCH_SAVE_BUFF)), 0)))
       goto err;
     keypos=buff+(keypos-old_buff);
     maxpos=buff+(maxpos-old_buff);
@@ -174,8 +181,9 @@ err:
         /* ret_pos point to where find or bigger key starts */
         /* ARGSUSED */
 
-int _ma_bin_search(MARIA_HA *info, register MARIA_KEYDEF *keyinfo, uchar *page,
-                   uchar *key, uint key_len, uint comp_flag, uchar **ret_pos,
+int _ma_bin_search(MARIA_HA *info, register MARIA_KEYDEF *keyinfo,
+                   uchar *page, const uchar *key, uint key_len,
+                   uint comp_flag, uchar **ret_pos,
                    uchar *buff __attribute__((unused)), my_bool *last_key)
 {
   int flag;
@@ -209,7 +217,7 @@ int _ma_bin_search(MARIA_HA *info, register MARIA_KEYDEF *keyinfo, uchar *page,
                     (uchar*) key, key_len, comp_flag, not_used);
   if (flag < 0)
     start++;                    /* point at next, bigger key */
-  *ret_pos=page+(uint) start*totlength;
+  *ret_pos= (char*) (page+(uint) start*totlength);
   *last_key= end == save_end;
   DBUG_PRINT("exit",("flag: %d  keypos: %d",flag,start));
   DBUG_RETURN(flag);
@@ -242,13 +250,14 @@ int _ma_bin_search(MARIA_HA *info, register MARIA_KEYDEF *keyinfo, uchar *page,
     < 0         Not found.
 */
 
-int _ma_seq_search(MARIA_HA *info, register MARIA_KEYDEF *keyinfo, uchar *page,
-                   uchar *key, uint key_len, uint comp_flag, uchar **ret_pos,
+int _ma_seq_search(MARIA_HA *info, register MARIA_KEYDEF *keyinfo,
+                   uchar *page, const uchar *key, uint key_len,
+                   uint comp_flag, uchar **ret_pos,
                    uchar *buff, my_bool *last_key)
 {
   int flag;
   uint nod_flag, length, used_length, not_used[2];
-  uchar t_buff[HA_MAX_KEY_BUFF],*end;
+  uchar t_buff[HA_MAX_KEY_BUFF], *end;
   DBUG_ENTER("_ma_seq_search");
 
   LINT_INIT(flag);
@@ -257,7 +266,7 @@ int _ma_seq_search(MARIA_HA *info, register MARIA_KEYDEF *keyinfo, uchar *page,
   _ma_get_used_and_nod(info, page, used_length, nod_flag);
   end= page + used_length;
   page+= info->s->keypage_header + nod_flag;
-  *ret_pos=page;
+  *ret_pos= (uchar*) page;
   t_buff[0]=0;                                  /* Avoid bugs */
   while (page < end)
   {
@@ -290,8 +299,9 @@ int _ma_seq_search(MARIA_HA *info, register MARIA_KEYDEF *keyinfo, uchar *page,
 
 
 int _ma_prefix_search(MARIA_HA *info, register MARIA_KEYDEF *keyinfo,
-                      uchar *page, uchar *key, uint key_len, uint nextflag,
-                      uchar **ret_pos, uchar *buff, my_bool *last_key)
+                      uchar *page, const uchar *key, uint key_len,
+                      uint nextflag, uchar **ret_pos, uchar *buff,
+                      my_bool *last_key)
 {
   /*
     my_flag is raw comparison result to be changed according to
@@ -303,10 +313,11 @@ int _ma_prefix_search(MARIA_HA *info, register MARIA_KEYDEF *keyinfo,
   uint prefix_len,suffix_len;
   int key_len_skip, seg_len_pack, key_len_left;
   uchar *end;
-  uchar *kseg, *vseg, *saved_vseg, *saved_from;
+  uchar *vseg, *saved_vseg, *saved_from;
   uchar *sort_order= keyinfo->seg->charset->sort_order;
   uchar tt_buff[HA_MAX_KEY_BUFF+2], *t_buff=tt_buff+2;
   uchar  *saved_to;
+  const uchar *kseg;
   uint  saved_length=0, saved_prefix_len=0;
   uint  length_pack;
   DBUG_ENTER("_ma_prefix_search");
@@ -435,7 +446,7 @@ int _ma_prefix_search(MARIA_HA *info, register MARIA_KEYDEF *keyinfo,
     {
       /* We have to compare. But we can still skip part of the key */
       uint  left;
-      uchar *k= kseg+prefix_len;
+      const uchar *k= kseg+prefix_len;
 
       /*
         If prefix_len > cmplen then we are in the end-space comparison
@@ -481,7 +492,7 @@ int _ma_prefix_search(MARIA_HA *info, register MARIA_KEYDEF *keyinfo,
 	  else
 	  {
 	    /* We have to compare k and vseg as if they were space extended */
-	    uchar *k_end= k+ (cmplen - len);
+	    const uchar *k_end= k+ (cmplen - len);
 	    for ( ; k < k_end && *k == ' '; k++) ;
 	    if (k == k_end)
 	      goto cmp_rest;		/* should never happen */
@@ -631,8 +642,8 @@ void _ma_kpointer(register MARIA_HA *info, register uchar *buff, my_off_t pos)
 
         /* Calc pos to a data-record from a key */
 
-
-my_off_t _ma_dpos(MARIA_HA *info, uint nod_flag, const uchar *after_key)
+MARIA_RECORD_POS _ma_dpos(MARIA_HA *info, uint nod_flag,
+                          const uchar *after_key)
 {
   my_off_t pos;
   after_key-=(nod_flag + info->s->rec_reflength);
@@ -654,15 +665,16 @@ my_off_t _ma_dpos(MARIA_HA *info, uint nod_flag, const uchar *after_key)
   default:
     pos=0L;                                     /* Shut compiler up */
   }
-  return ((info->s->data_file_type == STATIC_RECORD) ?
-          pos * info->s->base.pack_reclength : pos);
+  return info->s->keypos_to_recpos(info, pos);
 }
 
 
 /* Calc position from a record pointer ( in delete link chain ) */
 
-my_off_t _ma_rec_pos(MARIA_SHARE *s, uchar *ptr)
+MARIA_RECORD_POS _ma_rec_pos(MARIA_HA *info, uchar *ptr)
 {
+  MARIA_SHARE *s= info->s;
+
   my_off_t pos;
   switch (s->rec_reflength) {
 #if SIZEOF_OFF_T > 4
@@ -711,18 +723,16 @@ my_off_t _ma_rec_pos(MARIA_SHARE *s, uchar *ptr)
     break;
   default: abort();                             /* Impossible */
   }
-  return ((s->data_file_type == STATIC_RECORD) ?
-          pos * s->base.pack_reclength : pos);
+  return (*s->keypos_to_recpos)(info, pos);
 }
 
 
-        /* save position to record */
+/* save position to record */
 
 void _ma_dpointer(MARIA_HA *info, uchar *buff, my_off_t pos)
 {
-  if (info->s->data_file_type == STATIC_RECORD &&
-      pos != HA_OFFSET_ERROR)
-    pos/= info->s->base.pack_reclength;
+  if (pos != HA_OFFSET_ERROR)
+    pos= (*info->s->recpos_to_keypos)(info, pos);
 
   switch (info->s->rec_reflength) {
 #if SIZEOF_OFF_T > 4
@@ -748,16 +758,53 @@ void _ma_dpointer(MARIA_HA *info, uchar *buff, my_off_t pos)
 } /* _ma_dpointer */
 
 
-        /* Get key from key-block */
-        /* page points at previous key; its advanced to point at next key */
-        /* key should contain previous key */
-        /* Returns length of found key + pointers */
-        /* nod_flag is a flag if we are on nod */
+my_off_t _ma_static_keypos_to_recpos(MARIA_HA *info, my_off_t pos)
+{
+  return pos * info->s->base.pack_reclength;
+}
+
+
+my_off_t _ma_static_recpos_to_keypos(MARIA_HA *info, my_off_t pos)
+{
+  return pos / info->s->base.pack_reclength;
+}
+
+my_off_t _ma_transparent_recpos(MARIA_HA *info __attribute__((unused)),
+                                my_off_t pos)
+{
+  return pos;
+}
+
+my_off_t _ma_transaction_keypos_to_recpos(MARIA_HA *info
+                                          __attribute__((unused)),
+                                          my_off_t pos)
+{
+  /* We need one bit to store if there is transid's after position */
+  return pos >> 1;
+}
+
+my_off_t _ma_transaction_recpos_to_keypos(MARIA_HA *info
+                                          __attribute__((unused)),
+                                          my_off_t pos)
+{
+  return pos << 1;
+}
+
+/*
+  @brief Get key from key-block
+
+  @param  nod_flag   Is set to nod length if we on nod
+  @param page        Points at previous key; Its advanced to point at next key
+  @param key         Should contain previous key
+
+  @notes
+    Same as _ma_get_key but used with fixed length keys
 
-        /* same as _ma_get_key but used with fixed length keys */
+  @retval  Returns length of found key + pointers
+ */
 
 uint _ma_get_static_key(register MARIA_KEYDEF *keyinfo, uint nod_flag,
-                       register uchar **page, register uchar *key)
+                       register uchar **page, uchar *key)
 {
   memcpy((uchar*) key,(uchar*) *page,
          (size_t) (keyinfo->keylength+nod_flag));
@@ -1290,8 +1337,9 @@ int _ma_search_next(register MARIA_HA *info, register MARIA_KEYDEF *keyinfo,
 
   if (info->keyread_buff_used)
   {
-    if (!_ma_fetch_keypage(info,keyinfo,info->last_search_keypage,
-                           DFLT_INIT_HITS,info->keyread_buff,0))
+    if (!_ma_fetch_keypage(info, keyinfo, info->last_search_keypage,
+                           PAGECACHE_LOCK_LEFT_UNLOCKED,
+                           DFLT_INIT_HITS, info->keyread_buff, 0, 0))
       DBUG_RETURN(-1);
     info->keyread_buff_used=0;
   }
@@ -1360,8 +1408,8 @@ int _ma_search_first(register MARIA_HA *info, register MARIA_KEYDEF *keyinfo,
 
   do
   {
-    if (!_ma_fetch_keypage(info,keyinfo,pos,DFLT_INIT_HITS,
-                           info->keyread_buff,0))
+    if (!_ma_fetch_keypage(info, keyinfo, pos, PAGECACHE_LOCK_LEFT_UNLOCKED,
+                           DFLT_INIT_HITS, info->keyread_buff, 0, 0))
     {
       info->cur_row.lastpos= HA_OFFSET_ERROR;
       DBUG_RETURN(-1);
@@ -1409,7 +1457,8 @@ int _ma_search_last(register MARIA_HA *info, register MARIA_KEYDEF *keyinfo,
   do
   {
     uint used_length;
-    if (!_ma_fetch_keypage(info,keyinfo,pos,DFLT_INIT_HITS,buff,0))
+    if (!_ma_fetch_keypage(info, keyinfo, pos, PAGECACHE_LOCK_LEFT_UNLOCKED,
+                           DFLT_INIT_HITS, buff, 0, 0))
     {
       info->cur_row.lastpos= HA_OFFSET_ERROR;
       DBUG_RETURN(-1);
@@ -1865,7 +1914,8 @@ void _ma_store_static_key(MARIA_KEYDEF *keyinfo __attribute__((unused)),
                           register uchar *key_pos,
                           register MARIA_KEY_PARAM *s_temp)
 {
-  memcpy((uchar*) key_pos,(uchar*) s_temp->key,(size_t) s_temp->totlength);
+  memcpy(key_pos, s_temp->key,(size_t) s_temp->totlength);
+  s_temp->changed_length= s_temp->totlength;
 }
 
 
@@ -1881,9 +1931,7 @@ void _ma_store_var_pack_key(MARIA_KEYDEF *keyinfo  __attribute__((unused)),
                             register MARIA_KEY_PARAM *s_temp)
 {
   uint length;
-  uchar *start;
-
-  start=key_pos;
+  uchar *org_key_pos= key_pos;
 
   if (s_temp->ref_length)
   {
@@ -1898,12 +1946,13 @@ void _ma_store_var_pack_key(MARIA_KEYDEF *keyinfo  __attribute__((unused)),
     /* Not packed against previous key */
     store_pack_length(s_temp->pack_marker == 128,key_pos,s_temp->key_length);
   }
-  bmove((uchar*) key_pos,(uchar*) s_temp->key,
-        (length=s_temp->totlength-(uint) (key_pos-start)));
+  bmove(key_pos, s_temp->key,
+        (length= s_temp->totlength - (uint) (key_pos-org_key_pos)));
+
+  key_pos+= length;
 
   if (!s_temp->next_key_pos)                    /* No following key */
-    return;
-  key_pos+=length;
+    goto end;
 
   if (s_temp->prev_length)
   {
@@ -1921,19 +1970,25 @@ void _ma_store_var_pack_key(MARIA_KEYDEF *keyinfo  __attribute__((unused)),
                         s_temp->n_length);
     }
     memcpy(key_pos, s_temp->prev_key, s_temp->prev_length);
+    key_pos+= s_temp->prev_length;
   }
   else if (s_temp->n_ref_length)
   {
     store_pack_length(s_temp->pack_marker == 128,key_pos,s_temp->n_ref_length);
-    if (s_temp->n_ref_length == s_temp->pack_marker)
-      return;                                   /* Identical key */
-    store_key_length(key_pos,s_temp->n_length);
+    if (s_temp->n_ref_length != s_temp->pack_marker)
+    {
+      /* Not identical key */
+      store_key_length_inc(key_pos,s_temp->n_length);
+    }
   }
   else
   {
     s_temp->n_length+= s_temp->store_not_null;
     store_pack_length(s_temp->pack_marker == 128,key_pos,s_temp->n_length);
   }
+
+end:
+  s_temp->changed_length= (uint) (key_pos - org_key_pos);
 }
 
 
@@ -1943,17 +1998,21 @@ void _ma_store_bin_pack_key(MARIA_KEYDEF *keyinfo  __attribute__((unused)),
                             register uchar *key_pos,
                             register MARIA_KEY_PARAM *s_temp)
 {
+  uchar *org_key_pos= key_pos;
+  size_t length= s_temp->totlength - s_temp->ref_length;
+
   store_key_length_inc(key_pos,s_temp->ref_length);
-  memcpy((char*) key_pos,(char*) s_temp->key+s_temp->ref_length,
-          (size_t) s_temp->totlength-s_temp->ref_length);
+  memcpy(key_pos, s_temp->key+s_temp->ref_length, length);
+  key_pos+= length;
 
   if (s_temp->next_key_pos)
   {
-    key_pos+=(uint) (s_temp->totlength-s_temp->ref_length);
     store_key_length_inc(key_pos,s_temp->n_ref_length);
     if (s_temp->prev_length)                    /* If we must extend key */
     {
       memcpy(key_pos,s_temp->prev_key,s_temp->prev_length);
+      key_pos+= s_temp->prev_length;
     }
   }
+  s_temp->changed_length= (uint) (key_pos - org_key_pos);
 }