diff options
author | joerg@trift2. <> | 2007-06-25 13:22:34 +0200 |
---|---|---|
committer | joerg@trift2. <> | 2007-06-25 13:22:34 +0200 |
commit | 79677b756efa3ddfb2c835145f27d2cebc948a0e (patch) | |
tree | 359a2ac002dbb318463dc391366279f9314db81e /sql/field.h | |
parent | a8d5779448d03d3258adc4078d45a20d0c96ffc6 (diff) | |
parent | c4b53b218c71aff3410ec4358dfec2b9d0e1e1b4 (diff) | |
download | mariadb-git-79677b756efa3ddfb2c835145f27d2cebc948a0e.tar.gz |
Merge trift2.:/MySQL/M50/clone-5.0
into trift2.:/MySQL/M51/push-5.1
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 a0fe0f2e57e..e67609dbcb2 100644 --- a/sql/field.h +++ b/sql/field.h @@ -1183,7 +1183,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, |