summaryrefslogtreecommitdiff
path: root/sql/field.cc
diff options
context:
space:
mode:
authorunknown <acurtis/antony@xiphis.org/ltantony.xiphis.org>2006-08-15 01:54:14 -0700
committerunknown <acurtis/antony@xiphis.org/ltantony.xiphis.org>2006-08-15 01:54:14 -0700
commit600f11552ac6c32dad940524cbe9fa483d17acd3 (patch)
tree5a2c55899602b56ff46635a225ca384d11d81833 /sql/field.cc
parent131f9a71d101db6551176cf7dff0528395fa751a (diff)
downloadmariadb-git-600f11552ac6c32dad940524cbe9fa483d17acd3.tar.gz
fix windows build
Diffstat (limited to 'sql/field.cc')
-rw-r--r--sql/field.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc
index 8395b8c6145..4fea6a085bb 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -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);
}