diff options
| author | tsmith@sita.local <> | 2007-07-09 03:27:03 -0600 |
|---|---|---|
| committer | tsmith@sita.local <> | 2007-07-09 03:27:03 -0600 |
| commit | 5f12f35c3424127f8b80c6b6ecc658c24650ea8e (patch) | |
| tree | a96c6f8f663f3241acd88553098532553c33ed17 /sql/field.h | |
| parent | b37c24c439282ed2497534b1515cde1fdf32057e (diff) | |
| parent | eac626bde6dfa170254290d2fb0c73f9dd49d06d (diff) | |
| download | mariadb-git-5f12f35c3424127f8b80c6b6ecc658c24650ea8e.tar.gz | |
Merge sita.local:/Users/tsmith/m/bk/51
into sita.local:/Users/tsmith/m/bk/maint/51
This merge requires a post-merge fix to remove rpl_udf from
suite/rpl/t/disabled.def.
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.h b/sql/field.h index ef76cb47d36..8bf087c7ebd 100644 --- a/sql/field.h +++ b/sql/field.h @@ -1185,7 +1185,7 @@ public: The maximum space available in a Field_varstring, in bytes. See length_bytes. */ - static const uint MAX_SIZE= UINT_MAX16; + static const uint MAX_SIZE; /* Store number of bytes used to store length (1 or 2) */ uint32 length_bytes; Field_varstring(uchar *ptr_arg, |