diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-06-24 09:10:11 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-06-24 09:10:11 -0700 |
| commit | 2954ed1ec977dab2e6594343455d100d56051473 (patch) | |
| tree | 71bfa7a627ca5633dba3fa0bb9d8e21de7589c88 /sql/field.h | |
| parent | f8f65accf99821386ad2cffdf0c3f473e8f33064 (diff) | |
| parent | 20f3f4a273202ef539314acbbdbb67ab91376ab6 (diff) | |
| download | mariadb-git-2954ed1ec977dab2e6594343455d100d56051473.tar.gz | |
Merge 5.3->5.5.
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/field.h b/sql/field.h index dbb2e030f74..3838c924419 100644 --- a/sql/field.h +++ b/sql/field.h @@ -2244,6 +2244,10 @@ public: { return (flags & (BINCMP_FLAG | BINARY_FLAG)) != 0; } + uint virtual_col_expr_maxlen() + { + return 255 - FRM_VCOL_HEADER_SIZE(interval != NULL); + } private: const String empty_set_string; }; |