diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-09-19 17:45:17 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-09-28 17:20:46 +0000 |
| commit | eba44874ca9fc317696630cb371623142289fa99 (patch) | |
| tree | f67cd5dbcaf102abef2fb26f76357d14feaded04 /sql/strfunc.cc | |
| parent | de7c2e5e545df90fc9814c60a8a5a8d20f22b2c3 (diff) | |
| download | mariadb-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/strfunc.cc')
| -rw-r--r-- | sql/strfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/strfunc.cc b/sql/strfunc.cc index bf5fe9d6f00..4928e939e27 100644 --- a/sql/strfunc.cc +++ b/sql/strfunc.cc @@ -158,7 +158,7 @@ uint find_type2(const TYPELIB *typelib, const char *x, uint length, int pos; const char *j; DBUG_ENTER("find_type2"); - DBUG_PRINT("enter",("x: '%.*s' lib: 0x%lx", length, x, (long) typelib)); + DBUG_PRINT("enter",("x: '%.*s' lib: %p", length, x, typelib)); if (!typelib->count) { |