database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1

Browse Source 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
This commit is contained in:
tsmith@quadxeon.mysql.com
2007-06-05 23:06:43 +02:00
parent 016bff8adc 76b580b84e
commit 0ca0984f59
98 changed files with 2219 additions and 734 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/field.h
View File

@ -749,7 +749,7 @@ public:
void sort_string(uchar *buff,uint length);
uint32 pack_length() const { return 4; }
void sql_type(String &str) const;
uint32 max_display_length() { return 11; }
uint32 max_display_length() { return MY_INT32_NUM_DECIMAL_DIGITS; }
};
@ -1173,6 +1173,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(uchar *ptr_arg,