diff options
author | Marko Mäkelä <marko.makela@oracle.com> | 2012-10-16 14:35:19 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@oracle.com> | 2012-10-16 14:35:19 +0300 |
commit | bb371b649d022328976ebaa2d5930e080c72b88f (patch) | |
tree | 84cbeb667216cecbe08badd2271cd204ddc8023d /storage/innobase/include | |
parent | 04c7730006748a32ef3f7069670699452013cf52 (diff) | |
parent | aec624762b0719c43a5149c228f36daa405b82cf (diff) | |
download | mariadb-git-bb371b649d022328976ebaa2d5930e080c72b88f.tar.gz |
Merge mysql-5.1 to mysql-5.5.
Diffstat (limited to 'storage/innobase/include')
-rw-r--r-- | storage/innobase/include/dict0dict.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/storage/innobase/include/dict0dict.h b/storage/innobase/include/dict0dict.h index b609bce9d41..54af14313c4 100644 --- a/storage/innobase/include/dict0dict.h +++ b/storage/innobase/include/dict0dict.h @@ -910,6 +910,18 @@ dict_index_get_nth_col_pos( const dict_index_t* index, /*!< in: index */ ulint n); /*!< in: column number */ /********************************************************************//** +Looks for column n in an index. +@return position in internal representation of the index; +ULINT_UNDEFINED if not contained */ +UNIV_INTERN +ulint +dict_index_get_nth_col_or_prefix_pos( +/*=================================*/ + const dict_index_t* index, /*!< in: index */ + ulint n, /*!< in: column number */ + ibool inc_prefix); /*!< in: TRUE=consider + column prefixes too */ +/********************************************************************//** Returns TRUE if the index contains a column or a prefix of that column. @return TRUE if contains the column or its prefix */ UNIV_INTERN |