diff options
| author | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2008-03-28 12:14:27 +0200 |
|---|---|---|
| committer | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2008-03-28 12:14:27 +0200 |
| commit | 73dc0f356b57cd9c40a11d23777d5f4a41362d63 (patch) | |
| tree | 08ecfa85ad2a82409ad7feb221fbe2f63208803d /include/config-win.h | |
| parent | b04e344ad60efbe897cd0444d06693fb34ca9993 (diff) | |
| parent | 7157544dd689723c160407fa34079f4584affe7d (diff) | |
| download | mariadb-git-73dc0f356b57cd9c40a11d23777d5f4a41362d63.tar.gz | |
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
include/my_global.h:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/unireg.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/myisam/mi_dynrec.c:
Auto merged
storage/myisam/mi_open.c:
Auto merged
storage/myisammrg/ha_myisammrg.cc:
Auto merged
include/config-win.h:
Manual merge between main 5.1 and 5.1 marvel.
mysql-test/r/change_user.result:
Manual merge between main 5.1 and 5.1 marvel.
mysql-test/t/change_user.test:
Manual merge between main 5.1 and 5.1 marvel.
sql/sql_plugin.cc:
Manual merge between main 5.1 and 5.1 marvel.
Diffstat (limited to 'include/config-win.h')
| -rw-r--r-- | include/config-win.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/config-win.h b/include/config-win.h index 7211dd59c84..cc2b2767663 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -255,9 +255,11 @@ inline double ulonglong2double(ulonglong value) #define tell(A) _telli64(A) #endif - #define STACK_DIRECTION -1 +/* Difference between GetSystemTimeAsFileTime() and now() */ +#define OFFSET_TO_EPOCH ULL(116444736000000000) + #define HAVE_PERROR #define HAVE_VFPRINT #define HAVE_RENAME /* Have rename() as function */ |