diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-06-23 15:00:05 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-06-23 15:00:05 -0700 |
| commit | 20f3f4a273202ef539314acbbdbb67ab91376ab6 (patch) | |
| tree | 4081cb30864a2cdf9184bdc8c31216d2c7ce2947 /sql/unireg.h | |
| parent | e7bfda3b3cc59ba3fe4fe7e7e4307704a464f97f (diff) | |
| parent | d9c3a3e39e4c5a6f060b7bbc1646ca74c123fbab (diff) | |
| download | mariadb-git-20f3f4a273202ef539314acbbdbb67ab91376ab6.tar.gz | |
Merge 5.2->5.3
Diffstat (limited to 'sql/unireg.h')
| -rw-r--r-- | sql/unireg.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/unireg.h b/sql/unireg.h index 4d9062df7d9..01aac50670a 100644 --- a/sql/unireg.h +++ b/sql/unireg.h @@ -217,10 +217,7 @@ #define DEFAULT_KEY_CACHE_NAME "default" /* The length of the header part for each virtual column in the .frm file */ -#define FRM_VCOL_HEADER_SIZE 3 - -/* Maximum length of the defining expression for a virtual columns */ -#define VIRTUAL_COLUMN_EXPRESSION_MAXLEN 255 - FRM_VCOL_HEADER_SIZE +#define FRM_VCOL_HEADER_SIZE(b) (3 + test(b)) /* Include prototypes for unireg */ |