diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-03-06 18:41:32 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-03-06 18:41:32 +0100 |
| commit | 5f510a91759823e6be19e6bac74acb0b76cbdaa7 (patch) | |
| tree | 3c53a13f0135dfc139c8806f3be8a7d00d313b9e /sql/table.h | |
| parent | e13459a11eb5938b54b88c7a1529491df6dd3b49 (diff) | |
| parent | 17a37796e1947e2227824416d297a746a1dc6c26 (diff) | |
| download | mariadb-git-5f510a91759823e6be19e6bac74acb0b76cbdaa7.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/table.h b/sql/table.h index ad00ca5ed69..c63f648f9d0 100644 --- a/sql/table.h +++ b/sql/table.h @@ -1340,7 +1340,7 @@ public: bool add_tmp_key(uint key, uint key_parts, uint (*next_field_no) (uchar *), uchar *arg, bool unique); - void create_key_part_by_field(KEY *keyinfo, KEY_PART_INFO *key_part_info, + void create_key_part_by_field(KEY_PART_INFO *key_part_info, Field *field, uint fieldnr); void use_index(int key_to_save); void set_table_map(table_map map_arg, uint tablenr_arg) |