Commit 7ccb97cc authored by unknown's avatar unknown

Merge chilla.local:/home/mydev/mysql-5.0-bug22384

into  chilla.local:/home/mydev/mysql-5.1-bug22384


storage/myisam/mi_delete.c:
  Auto merged
parents e50bb605 8daabf3b
...@@ -446,7 +446,7 @@ static int del(register MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *key, ...@@ -446,7 +446,7 @@ static int del(register MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *key,
else else
{ {
DBUG_PRINT("test",("Inserting of key when deleting")); DBUG_PRINT("test",("Inserting of key when deleting"));
if (_mi_get_last_key(info,keyinfo,leaf_buff,keybuff,endpos, if (!_mi_get_last_key(info,keyinfo,leaf_buff,keybuff,endpos,
&tmp)) &tmp))
goto err; goto err;
ret_value=_mi_insert(info,keyinfo,key,leaf_buff,endpos,keybuff, ret_value=_mi_insert(info,keyinfo,key,leaf_buff,endpos,keybuff,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment