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/unireg.h | |
| parent | f8f65accf99821386ad2cffdf0c3f473e8f33064 (diff) | |
| parent | 20f3f4a273202ef539314acbbdbb67ab91376ab6 (diff) | |
| download | mariadb-git-2954ed1ec977dab2e6594343455d100d56051473.tar.gz | |
Merge 5.3->5.5.
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 f8317a89c8c..950cfc2cc31 100644 --- a/sql/unireg.h +++ b/sql/unireg.h @@ -162,10 +162,7 @@ typedef struct st_ha_create_information HA_CREATE_INFO; #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 */ |