summaryrefslogtreecommitdiff
path: root/sql/field.h
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2012-06-23 15:00:05 -0700
committerIgor Babaev <igor@askmonty.org>2012-06-23 15:00:05 -0700
commit20f3f4a273202ef539314acbbdbb67ab91376ab6 (patch)
tree4081cb30864a2cdf9184bdc8c31216d2c7ce2947 /sql/field.h
parente7bfda3b3cc59ba3fe4fe7e7e4307704a464f97f (diff)
parentd9c3a3e39e4c5a6f060b7bbc1646ca74c123fbab (diff)
downloadmariadb-git-20f3f4a273202ef539314acbbdbb67ab91376ab6.tar.gz
Merge 5.2->5.3
Diffstat (limited to 'sql/field.h')
-rw-r--r--sql/field.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/field.h b/sql/field.h
index d83980c2a29..208f1e381f5 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -2217,6 +2217,10 @@ public:
{
return (flags & (BINCMP_FLAG | BINARY_FLAG)) != 0;
}
+ uint virtual_col_expr_maxlen()
+ {
+ return 255 - FRM_VCOL_HEADER_SIZE(interval != NULL);
+ }
};