summaryrefslogtreecommitdiff
path: root/sql/mysql_priv.h
diff options
context:
space:
mode:
authormonty@nosik.monty.fi <>2006-11-21 23:12:45 +0200
committermonty@nosik.monty.fi <>2006-11-21 23:12:45 +0200
commit38a92caeb77c6b22eeac985530cfbfdc890c792d (patch)
tree92c5d6bff5c91f7ab015fea75f2a0f3f14accbfa /sql/mysql_priv.h
parent55b666441e624b3875e29f1b8a30961cbcb081f6 (diff)
parentf6682e2743d6b3cff53a6e6b1499b28f10fb3b92 (diff)
downloadmariadb-git-38a92caeb77c6b22eeac985530cfbfdc890c792d.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r--sql/mysql_priv.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index e30da1f2f0b..356ff64d2e9 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -1434,7 +1434,8 @@ void print_plan(JOIN* join,uint idx, double record_count, double read_time,
#endif
void mysql_print_status();
/* key.cc */
-int find_ref_key(KEY *key, uint key_count, Field *field, uint *key_length);
+int find_ref_key(KEY *key, uint key_count, byte *record, Field *field,
+ uint *key_length);
void key_copy(byte *to_key, byte *from_record, KEY *key_info, uint key_length);
void key_restore(byte *to_record, byte *from_key, KEY *key_info,
uint key_length);