summaryrefslogtreecommitdiff
path: root/sql/sql_string.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-04-29 17:39:48 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2018-04-29 17:53:21 +0300
commitb2c47400349fcd2a8d5d43bb711f1bfbb48c8485 (patch)
treed7dbb4c08c05a1e034eb8019545b9d1a7a8e6d7d /sql/sql_string.h
parentbaa5a43d8cb2f747eeb70d394a362fb5f3fdd194 (diff)
downloadmariadb-git-b2c47400349fcd2a8d5d43bb711f1bfbb48c8485.tar.gz
Fix some -Wsign-conversion
InnoDB was using int64_t instead of ha_rows (unsigned 64-bit).
Diffstat (limited to 'sql/sql_string.h')
-rw-r--r--sql/sql_string.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h
index 37531429f8d..afbfa157a2b 100644
--- a/sql/sql_string.h
+++ b/sql/sql_string.h
@@ -628,7 +628,7 @@ public:
{
char *buff= Ptr + str_length;
char *end= ll2str(i, buff, radix, 0);
- str_length+= (int) (end-buff);
+ str_length+= uint32(end-buff);
}
/* Inline (general) functions used by the protocol functions */