diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-01-14 18:51:00 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-01-14 18:51:00 +0200 |
| commit | d121e6630519a66eec7c953ee0eae623f592ce87 (patch) | |
| tree | d0e61d2ccd45fdbd82d57737ebb45ec388aee20a /include/my_pthread.h | |
| parent | e4535de11fe8eaba8ee5013b9bd5fe3b4b713b55 (diff) | |
| download | mariadb-git-d121e6630519a66eec7c953ee0eae623f592ce87.tar.gz | |
Fix for compiler warnings on windows
Fix wrong cast of time()
include/my_pthread.h:
Safety fix that also removes compiler warnings
sql/handler.h:
Changed timestamp columns to be of type time_t
storage/maria/ma_check.c:
Removed wrong cast
storage/maria/ma_create.c:
Removed wrong cast
storage/myisam/mi_check.c:
Removed wrong cast
storage/myisam/mi_create.c:
Removed wrong cast
storage/xtradb/handler/ha_innodb.cc:
Removed compiler warning on windows
Diffstat (limited to 'include/my_pthread.h')
| -rw-r--r-- | include/my_pthread.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 98d843f54d1..d7a5a30bd73 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -543,9 +543,9 @@ void safe_mutex_free_deadlock_data(safe_mutex_t *mp); #else #define my_pthread_mutex_init(A,B,C,D) pthread_mutex_init((A),(B)) #define my_pthread_mutex_lock(A,B) pthread_mutex_lock(A) -#define safe_mutex_assert_owner(mp) -#define safe_mutex_assert_not_owner(mp) -#define safe_mutex_free_deadlock_data(mp) +#define safe_mutex_assert_owner(mp) do {} while(0) +#define safe_mutex_assert_not_owner(mp) do {} while(0) +#define safe_mutex_free_deadlock_data(mp) do {} while(0) #endif /* SAFE_MUTEX */ #if defined(MY_PTHREAD_FASTMUTEX) && !defined(SAFE_MUTEX) |