diff options
author | unknown <ibabaev@bk-internal.mysql.com> | 2007-05-28 00:05:38 +0200 |
---|---|---|
committer | unknown <ibabaev@bk-internal.mysql.com> | 2007-05-28 00:05:38 +0200 |
commit | 11dd353e12de970d93a0304ea3e6e43df1126907 (patch) | |
tree | 88e9d6e9af319de1b0c833c9bb011ed5025ac543 /sql/field.h | |
parent | 06297270880ca0f0023c66ca90291665ec3aacc2 (diff) | |
parent | 5f99cf963ea4138fd7adb70ec4a9add55388c281 (diff) | |
download | mariadb-git-11dd353e12de970d93a0304ea3e6e43df1126907.tar.gz |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
client/mysqldump.c:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
sql/field.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/my_decimal.h:
Auto merged
sql/sql_base.cc:
Auto merged
Diffstat (limited to 'sql/field.h')
-rw-r--r-- | sql/field.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/field.h b/sql/field.h index 78aa12ad200..997ae1f2cd4 100644 --- a/sql/field.h +++ b/sql/field.h @@ -1108,6 +1108,11 @@ public: class Field_varstring :public Field_longstr { public: + /* + The maximum space available in a Field_varstring, in bytes. See + length_bytes. + */ + static const uint MAX_SIZE= UINT_MAX16; /* Store number of bytes used to store length (1 or 2) */ uint32 length_bytes; Field_varstring(char *ptr_arg, |