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/event_parse_data.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/event_parse_data.cc')
| -rw-r--r-- | sql/event_parse_data.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/event_parse_data.cc b/sql/event_parse_data.cc index 6c123c8e641..6fa0c25508e 100644 --- a/sql/event_parse_data.cc +++ b/sql/event_parse_data.cc @@ -497,9 +497,9 @@ Event_parse_data::check_parse_data(THD *thd) { bool ret; DBUG_ENTER("Event_parse_data::check_parse_data"); - DBUG_PRINT("info", ("execute_at: 0x%lx expr=0x%lx starts=0x%lx ends=0x%lx", - (long) item_execute_at, (long) item_expression, - (long) item_starts, (long) item_ends)); + DBUG_PRINT("info", ("execute_at: %p expr=%p starts=%p ends=%p", + item_execute_at, item_expression, + item_starts, item_ends)); init_name(thd, identifier); @@ -532,9 +532,9 @@ Event_parse_data::init_definer(THD *thd) size_t definer_user_len= thd->lex->definer->user.length; size_t definer_host_len= thd->lex->definer->host.length; - DBUG_PRINT("info",("init definer_user thd->mem_root: 0x%lx " - "definer_user: 0x%lx", (long) thd->mem_root, - (long) definer_user)); + DBUG_PRINT("info",("init definer_user thd->mem_root: %p " + "definer_user: %p", thd->mem_root, + definer_user)); /* + 1 for @ */ DBUG_PRINT("info",("init definer as whole")); |