diff options
author | unknown <tsmith/tim@siva.hindu.god> | 2006-12-26 16:49:10 -0700 |
---|---|---|
committer | unknown <tsmith/tim@siva.hindu.god> | 2006-12-26 16:49:10 -0700 |
commit | 6e84e11da5f4d9168005f48c90fd169047a9e950 (patch) | |
tree | e6bcbe8baaed6b27ac43fd5aa816ebe6f1e949f8 /include/config-win.h | |
parent | 4dabfa5de70c59c4f7ea1e4a33224c5a3f798d66 (diff) | |
parent | e87d593ae1598c4e93da59ba249bb01a649c5772 (diff) | |
download | mariadb-git-6e84e11da5f4d9168005f48c90fd169047a9e950.tar.gz |
Merge siva.hindu.god:/usr/home/tim/m/bk/g51
into siva.hindu.god:/usr/home/tim/m/bk/tmp/mrg51-dec26
Makefile.am:
Auto merged
client/mysqlbinlog.cc:
Auto merged
configure.in:
Auto merged
client/mysqltest.c:
Auto merged
include/config-win.h:
Auto merged
include/my_global.h:
Auto merged
include/my_pthread.h:
Auto merged
include/mysql.h:
Auto merged
include/typelib.h:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/type_timestamp.result:
Auto merged
mysql-test/r/warnings.result:
Auto merged
mysys/default.c:
Auto merged
mysys/my_wincond.c:
Auto merged
mysys/typelib.c:
Auto merged
server-tools/instance-manager/Makefile.am:
Auto merged
server-tools/instance-manager/guardian.cc:
Auto merged
server-tools/instance-manager/instance.cc:
Auto merged
sql/field.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/net_serv.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/share/charsets/hebrew.xml:
Auto merged
sql/sql_show.cc:
Auto merged
storage/federated/ha_federated.cc:
Auto merged
strings/conf_to_src.c:
Auto merged
vio/viossl.c:
Auto merged
sql/field.h:
Manual merge
sql/log_event.cc:
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 edecf8d2fc8..a3286e78b3b 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -248,7 +248,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 |