summaryrefslogtreecommitdiff
path: root/sql/key.cc
diff options
context:
space:
mode:
authormonty@donna.mysql.fi <>2001-03-06 15:24:08 +0200
committermonty@donna.mysql.fi <>2001-03-06 15:24:08 +0200
commitbda3e099358ddcad825c1231f2a0f14697abd59c (patch)
tree54c7bf220f9e21e9f04e2ff2e8a018cf4e33e837 /sql/key.cc
parent7b275cf2ec780057c004726d9d96fda8447b1287 (diff)
downloadmariadb-git-bda3e099358ddcad825c1231f2a0f14697abd59c.tar.gz
Merged some functions and removed some unused client functions.
Remember UNION for ALTER TABLE Added test for if we are supporting transactions. Don't allow REPLACE to replace a row when we have generated an auto_increment key Fixed bug when using BLOB keys Fixed bug in SET @variable=user.
Diffstat (limited to 'sql/key.cc')
-rw-r--r--sql/key.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/key.cc b/sql/key.cc
index 87595fda06d..80a33bc45d3 100644
--- a/sql/key.cc
+++ b/sql/key.cc
@@ -76,7 +76,7 @@ void key_copy(byte *key,TABLE *table,uint idx,uint key_length)
KEY_PART_INFO *key_part;
if (key_length == 0)
- key_length=key_info->key_length+key_info->extra_length;
+ key_length=key_info->key_length;
for (key_part=key_info->key_part;
(int) key_length > 0 ;
key_part++)
@@ -122,7 +122,7 @@ void key_restore(TABLE *table,byte *key,uint idx,uint key_length)
{
if (idx == (uint) -1)
return;
- key_length=key_info->key_length+key_info->extra_length;
+ key_length=key_info->key_length;
}
for (key_part=key_info->key_part;
(int) key_length > 0 ;