diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-03-08 23:47:20 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-03-08 23:47:20 +0400 |
| commit | ec8c38a82ec1bb00f681a3f6662bd5c76ebb7c75 (patch) | |
| tree | b3a7cc7930787be4474ac8abf1663ae92abacba3 /sql/sql_string.h | |
| parent | 47b7ffb396bd283bd4196194311ba39ed9692421 (diff) | |
| parent | 5da6bd7b959af4a9755556afedde8f34d95c679a (diff) | |
| download | mariadb-git-ec8c38a82ec1bb00f681a3f6662bd5c76ebb7c75.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'sql/sql_string.h')
| -rw-r--r-- | sql/sql_string.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h index 8062e2d465d..0a930554d8a 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -3,7 +3,7 @@ /* Copyright (c) 2000, 2013, Oracle and/or its affiliates. - Copyright (c) 2008, 2013, Monty Program Ab. + Copyright (c) 2008, 2017, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -97,9 +97,9 @@ public: Convert a string between character sets. "dstcs" and "srccs" cannot be &my_charset_bin. */ - uint convert_fix(CHARSET_INFO *dstcs, char *dst, uint dst_length, - CHARSET_INFO *srccs, const char *src, uint src_length, - uint nchars) + size_t convert_fix(CHARSET_INFO *dstcs, char *dst, uint dst_length, + CHARSET_INFO *srccs, const char *src, uint src_length, + uint nchars) { return my_convert_fix(dstcs, dst, dst_length, srccs, src, src_length, nchars, this, this); @@ -677,7 +677,7 @@ public: { DBUG_ASSERT(Alloced_length >= (str_length + net_length_size(length))); char *pos= (char *) net_store_length((uchar *)(Ptr + str_length), length); - str_length= pos - Ptr; + str_length= uint32(pos - Ptr); } void q_net_store_data(const uchar *from, size_t length) { |