Commit 4bab858f authored by dfischer/mysqldev@mysql.com/production.mysql.com's avatar dfischer/mysqldev@mysql.com/production.mysql.com
Browse files

field.cc, field.h: 

  i5 compatibility
parent 0e98bed9

sql/field.cc

+1 −0
Original line number Diff line number Diff line
@@ -6270,6 +6270,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)

{

sql/field.h

+1 −1
Original line number Diff line number Diff line
@@ -1116,7 +1116,7 @@ class Field_varstring :public Field_longstr { 
    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(char *ptr_arg,