diff options
| author | unknown <joerg@trift2.> | 2007-06-25 13:22:34 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-06-25 13:22:34 +0200 |
| commit | 7c434896b4f9de96d1da4c830ff729cdf8da9216 (patch) | |
| tree | 359a2ac002dbb318463dc391366279f9314db81e /sql | |
| parent | e34641b3cece714b861c7130f245659342f583ba (diff) | |
| parent | f8034d36ba5670e72374d61ca4901a71adbd6d9f (diff) | |
| download | mariadb-git-7c434896b4f9de96d1da4c830ff729cdf8da9216.tar.gz | |
Merge trift2.:/MySQL/M50/clone-5.0
into trift2.:/MySQL/M51/push-5.1
configure.in:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
server-tools/instance-manager/listener.cc:
C++ fix of 5.0 is not needed, 5.1 has a different approach.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/field.cc | 1 | ||||
| -rw-r--r-- | sql/field.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index 55a93ed46d6..d06d94af3a7 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -6457,6 +6457,7 @@ Field *Field_string::new_field(MEM_ROOT *root, struct st_table *new_table, is 2. ****************************************************************************/ +const uint Field_varstring::MAX_SIZE= UINT_MAX16; int Field_varstring::store(const char *from,uint length,CHARSET_INFO *cs) { 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, |