diff options
| author | Sergei Golubchik <serg@mysql.com> | 2009-01-15 22:27:36 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mysql.com> | 2009-01-15 22:27:36 +0100 |
| commit | 9c96fde1206f254d0dd25dbe2cc1706c44e4bdea (patch) | |
| tree | fdc0957f7f6b91f43a88bc18e6c37c7fd94fa911 /include/my_pthread.h | |
| parent | e01f6c8971c5598ea4868bb62bf6eb81a3bab945 (diff) | |
| download | mariadb-git-9c96fde1206f254d0dd25dbe2cc1706c44e4bdea.tar.gz | |
post-review fixes
include/atomic/generic-msvc.h:
prevent possible compiler warnings
include/lf.h:
comments, better definition for LF_HASH_OVERHEAD
include/maria.h:
define MARIA_CANNOT_ROLLBACK here
include/my_pthread.h:
avoid possible name clash
include/waiting_threads.h:
comments, const, move WT_RESOURCE to waiting_threads.c
mysql-test/suite/maria/r/maria_notembedded.result:
new test
mysql-test/suite/maria/t/maria_notembedded.test:
new test - 5-way deadlock
mysys/lf_hash.c:
better definition for LF_HASH_OVERHEAD
mysys/my_static.c:
comment
mysys/my_thr_init.c:
casts
mysys/waiting_threads.c:
comments, asserts, etc
server-tools/instance-manager/parse.cc:
fix my_init_dynamic_array() to follow new calling conventions
sql/mysqld.cc:
call wt_init after set_proper_floating_point_mode
sql/sql_class.h:
comment
storage/maria/ha_maria.cc:
move MARIA_CANNOT_ROLLBACK to a common header
storage/maria/ma_commit.c:
comment
storage/maria/ma_write.c:
comments, check for HA_ERR_FOUND_DUPP_KEY
storage/maria/trnman.c:
comments, assert
storage/maria/trnman.h:
comments
storage/maria/unittest/trnman-t.c:
be paranoid
unittest/mysys/lf-t.c:
comments
unittest/mysys/waiting_threads-t.c:
comments, safety, memory leak
Diffstat (limited to 'include/my_pthread.h')
| -rw-r--r-- | include/my_pthread.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 1596495a40f..538457a523a 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (C) 2000-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -430,19 +430,19 @@ int my_pthread_mutex_trylock(pthread_mutex_t *mutex); /* adapt for two different flavors of struct timespec */ #ifdef HAVE_TIMESPEC_TS_SEC -#define TV_sec ts_sec -#define TV_nsec ts_nsec +#define MY_tv_sec ts_sec +#define MY_tv_nsec ts_nsec #else -#define TV_sec tv_sec -#define TV_nsec tv_nsec +#define MY_tv_sec tv_sec +#define MY_tv_nsec tv_nsec #endif /* HAVE_TIMESPEC_TS_SEC */ #ifndef set_timespec_time_nsec #define set_timespec_time_nsec(ABSTIME,TIME,NSEC) do { \ ulonglong nsec= (NSEC); \ ulonglong now= (TIME) + (nsec/100); \ - (ABSTIME).TV_sec= (now / ULL(10000000)); \ - (ABSTIME).TV_nsec= (now % ULL(10000000) * 100 + (nsec % 100)); \ + (ABSTIME).MY_tv_sec= (now / ULL(10000000)); \ + (ABSTIME).MY_tv_nsec= (now % ULL(10000000) * 100 + (nsec % 100)); \ } while(0) #endif /* !set_timespec_time_nsec */ |