diff options
| author | Igor Babaev <igor@askmonty.org> | 2010-09-23 08:10:53 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2010-09-23 08:10:53 -0700 |
| commit | b969df8bbdc6acbaf1506b52346d24306e84a48c (patch) | |
| tree | b0b9eaa82a121c87f17487c57926bd9968d3ef20 /sql/field.h | |
| parent | cfbd9270243e4b429cdc26e8554bcc99690f2422 (diff) | |
| parent | 709a0a131021135e9fb7a2095fcfcbc223dfb126 (diff) | |
| download | mariadb-git-b969df8bbdc6acbaf1506b52346d24306e84a48c.tar.gz | |
Merge of the mwl106 tree into the latest 5.3 tree.
Resolved conflicts. Adjusted some test results
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 9b31cbc7b70..4dbeceade7c 100644 --- a/sql/field.h +++ b/sql/field.h @@ -592,6 +592,9 @@ public: DBUG_ASSERT(0); return GEOM_GEOMETRY; } + + key_map get_possible_keys(); + /* Hash value */ virtual void hash(ulong *nr, ulong *nr2); friend bool reopen_table(THD *,struct st_table *,bool); |