diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-21 21:34:09 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-21 21:34:09 +0300 |
| commit | b29eb4e2824c84171173584fc54e76808d9b212e (patch) | |
| tree | 63328d860825b94df5a596176facc73f38e1ed0d /include | |
| parent | 2bbfec92520ba698c78408ee98d9a661b367c904 (diff) | |
| parent | 7c10a8981ce3f5eff59e0f3a73e4f0ad176f8c90 (diff) | |
| download | mariadb-git-b29eb4e2824c84171173584fc54e76808d9b212e.tar.gz | |
Auto-merge from mysql-next-mr.
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_base.h | 1 | ||||
| -rw-r--r-- | include/mysql_com.h | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/my_base.h b/include/my_base.h index b9d0bb48480..7766d4165a2 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -273,6 +273,7 @@ enum ha_base_keytype { #define HA_SPACE_PACK_USED 4 /* Test for if SPACE_PACK used */ #define HA_VAR_LENGTH_KEY 8 #define HA_NULL_PART_KEY 64 +#define HA_USES_COMMENT 4096 #define HA_USES_PARSER 16384 /* Fulltext index uses [pre]parser */ #define HA_USES_BLOCK_SIZE ((uint) 32768) #define HA_SORT_ALLOWS_SAME 512 /* Intern bit when sorting records */ diff --git a/include/mysql_com.h b/include/mysql_com.h index 3f1ac948423..e4e34141d43 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -33,6 +33,14 @@ #define SQLSTATE_LENGTH 5 /* + Maximum length of comments +*/ +#define TABLE_COMMENT_INLINE_MAXLEN 180 /* pre 6.0: 60 characters */ +#define TABLE_COMMENT_MAXLEN 2048 +#define COLUMN_COMMENT_MAXLEN 1024 +#define INDEX_COMMENT_MAXLEN 1024 + +/* USER_HOST_BUFF_SIZE -- length of string buffer, that is enough to contain username and hostname parts of the user identifier with trailing zero in MySQL standard format: |