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/debug_sync.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/debug_sync.cc')
| -rw-r--r-- | sql/debug_sync.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/debug_sync.cc b/sql/debug_sync.cc index ab022c770b8..4a4a93757ef 100644 --- a/sql/debug_sync.cc +++ b/sql/debug_sync.cc @@ -681,8 +681,8 @@ static st_debug_sync_action *debug_sync_get_action(THD *thd, } DBUG_ASSERT(action >= ds_control->ds_action); DBUG_ASSERT(action < ds_control->ds_action + ds_control->ds_active); - DBUG_PRINT("debug_sync", ("action: 0x%lx array: 0x%lx count: %u", - (long) action, (long) ds_control->ds_action, + DBUG_PRINT("debug_sync", ("action: %p array: %p count: %u", + action, ds_control->ds_action, ds_control->ds_active)); DBUG_RETURN(action); |