database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into  xiphis.org:/opt2/tmp/autopush/mysql-5.0-fixbuild
This commit is contained in:
unknown
2006-08-15 10:31:39 -07:00
parent 0cd51b1afd 600f11552a
commit 088f59a9f9
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/field.cc
View File

@@ -6412,7 +6412,7 @@ void Field_varstring::sql_type(String &res) const
}
uint Field_varstring::data_length(const char *from)
uint32 Field_varstring::data_length(const char *from)
{
return length_bytes == 1 ? (uint) (uchar) *ptr : uint2korr(ptr);
}

2
sql/field.h
View File

@@ -1107,7 +1107,7 @@ public:
int key_cmp(const byte *str, uint length);
uint packed_col_length(const char *to, uint length);
uint max_packed_col_length(uint max_length);
uint data_length(const char *from);
uint32 data_length(const char *from);
uint size_of() const { return sizeof(*this); }
enum_field_types real_type() const { return MYSQL_TYPE_VARCHAR; }
bool has_charset(void) const