summaryrefslogtreecommitdiff
path: root/sql/parse_file.cc
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/parse_file.cc
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/parse_file.cc')
-rw-r--r--sql/parse_file.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/parse_file.cc b/sql/parse_file.cc
index 1cd294c1c7a..8f3e26d5e03 100644
--- a/sql/parse_file.cc
+++ b/sql/parse_file.cc
@@ -258,9 +258,9 @@ sql_create_definition_file(const LEX_STRING *dir, const LEX_STRING *file_name,
int path_end;
File_option *param;
DBUG_ENTER("sql_create_definition_file");
- DBUG_PRINT("enter", ("Dir: %s, file: %s, base 0x%lx",
+ DBUG_PRINT("enter", ("Dir: %s, file: %s, base %p",
dir ? dir->str : "",
- file_name->str, (ulong) base));
+ file_name->str, base));
if (dir)
{