summaryrefslogtreecommitdiff
path: root/sql/sql_string.h
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2017-09-19 17:45:17 +0000
committerVladislav Vaintroub <wlad@mariadb.com>2017-09-28 17:20:46 +0000
commiteba44874ca9fc317696630cb371623142289fa99 (patch)
treef67cd5dbcaf102abef2fb26f76357d14feaded04 /sql/sql_string.h
parentde7c2e5e545df90fc9814c60a8a5a8d20f22b2c3 (diff)
downloadmariadb-git-eba44874ca9fc317696630cb371623142289fa99.tar.gz
MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT.
- Fix win64 pointer truncation warnings (usually coming from misusing 0x%lx and long cast in DBUG) - Also fix printf-format warnings Make the above mentioned warnings fatal. - fix pthread_join on Windows to set return value.
Diffstat (limited to 'sql/sql_string.h')
-rw-r--r--sql/sql_string.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h
index 9a9fff8522c..1310819d2e3 100644
--- a/sql/sql_string.h
+++ b/sql/sql_string.h
@@ -466,8 +466,8 @@ public:
}
bool append(const String &s);
bool append(const char *s);
- bool append(const LEX_STRING *ls) { return append(ls->str, ls->length); }
- bool append(const LEX_CSTRING *ls) { return append(ls->str, ls->length); }
+ bool append(const LEX_STRING *ls) { return append(ls->str, (uint32)ls->length); }
+ bool append(const LEX_CSTRING *ls) { return append(ls->str, (uint32)ls->length); }
bool append(const char *s, uint32 arg_length);
bool append(const char *s, uint32 arg_length, CHARSET_INFO *cs);
bool append_ulonglong(ulonglong val);
@@ -634,7 +634,7 @@ public:
}
bool append_for_single_quote(const char *st)
{
- return append_for_single_quote(st, strlen(st));
+ return append_for_single_quote(st, (uint)strlen(st));
}
/* Swap two string objects. Efficient way to exchange data without memcpy. */