summaryrefslogtreecommitdiff
path: root/sql/table.h
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2014-08-04 10:05:51 -0700
committerIgor Babaev <igor@askmonty.org>2014-08-04 10:05:51 -0700
commit20fff8e5bd41aeb8b8c0295dabc3096ba3620099 (patch)
tree49ffb1bb35f663580e82c6db5b8f53655c854141 /sql/table.h
parent681fbcaf9255e1aa9f4ef458f8ef69f1a31eade2 (diff)
parentf735822720b5e004d0f9cc3f490242c154cfbbac (diff)
downloadmariadb-git-20fff8e5bd41aeb8b8c0295dabc3096ba3620099.tar.gz
Merge.
Diffstat (limited to 'sql/table.h')
-rw-r--r--sql/table.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/table.h b/sql/table.h
index 8875ee26afb..598e376409e 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -986,6 +986,8 @@ struct st_table {
inline bool needs_reopen_or_name_lock()
{ return s->version != refresh_version; }
bool alloc_keys(uint key_count);
+ bool check_tmp_key(uint key, uint key_parts,
+ uint (*next_field_no) (uchar *), uchar *arg);
bool add_tmp_key(uint key, uint key_parts,
uint (*next_field_no) (uchar *), uchar *arg,
bool unique);