diff options
author | Igor Babaev <igor@askmonty.org> | 2011-06-04 19:56:06 -0700 |
---|---|---|
committer | Igor Babaev <igor@askmonty.org> | 2011-06-04 19:56:06 -0700 |
commit | f03a3ee54fb8b5aeeba590677f48b54a57ab45cf (patch) | |
tree | afb1235c5417019a563b1c1d64443f3b890d05df /sql/field.h | |
parent | f0f2ec3086000a22e83ce9ca33d59a3347784e0c (diff) | |
parent | 35c35858f859f23c23a414cdb21fdfe39d5de11c (diff) | |
download | mariadb-git-f03a3ee54fb8b5aeeba590677f48b54a57ab45cf.tar.gz |
Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed.
Resolved all conflicts and failures.
Diffstat (limited to 'sql/field.h')
-rw-r--r-- | sql/field.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/field.h b/sql/field.h index f5dd5d5ea3f..e31beda23e1 100644 --- a/sql/field.h +++ b/sql/field.h @@ -577,6 +577,9 @@ public: DBUG_ASSERT(0); return GEOM_GEOMETRY; } + + key_map get_possible_keys(); + /* Hash value */ virtual void hash(ulong *nr, ulong *nr2); |