diff options
| author | unknown <tsmith/tim@siva.hindu.god> | 2006-12-14 12:56:57 -0700 |
|---|---|---|
| committer | unknown <tsmith/tim@siva.hindu.god> | 2006-12-14 12:56:57 -0700 |
| commit | cdaa91f78ed384d31de0edcbc6f537add20183c2 (patch) | |
| tree | aef99a9511fae1eeaeeab94ed72121cb9753ce46 /include/config-win.h | |
| parent | 501f92474e27c427ae971b736401f4368e93b36d (diff) | |
| parent | 931dcc8a8328698397e7bd194eb1a7041e0d1970 (diff) | |
| download | mariadb-git-cdaa91f78ed384d31de0edcbc6f537add20183c2.tar.gz | |
Merge siva.hindu.god:/usr/home/tim/m/bk/50
into siva.hindu.god:/usr/home/tim/m/bk/51
client/mysqltest.c:
Auto merged
include/config-win.h:
Auto merged
include/my_global.h:
Auto merged
mysql-test/r/type_ranges.result:
Auto merged
mysql-test/r/type_timestamp.result:
Auto merged
server-tools/instance-manager/guardian.cc:
Auto merged
server-tools/instance-manager/instance.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
include/my_pthread.h:
Manual merge.
mysql-test/r/archive.result:
Manual merge.
mysql-test/t/archive.test:
Manual merge.
Diffstat (limited to 'include/config-win.h')
| -rw-r--r-- | include/config-win.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/config-win.h b/include/config-win.h index 5290cf83896..86b2a7cca39 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -249,7 +249,6 @@ inline double ulonglong2double(ulonglong value) #define tell(A) _telli64(A) #endif -#define set_timespec(ABSTIME,SEC) { (ABSTIME).tv_sec=time((time_t*)0) + (time_t) (SEC); (ABSTIME).tv_nsec=0; } #define STACK_DIRECTION -1 |