diff options
| author | unknown <reggie@big_geek.> | 2006-05-08 15:15:05 -0500 |
|---|---|---|
| committer | unknown <reggie@big_geek.> | 2006-05-08 15:15:05 -0500 |
| commit | 4f908f248e148fc015f3f82450a003b88bdca98d (patch) | |
| tree | 45e25c571bea2101f73fff090266209606f600ae /mysys/my_init.c | |
| parent | 94c6f6dc4888166b3677f38b534502156ef50d49 (diff) | |
| parent | ec82432941f7f6ef3d60b8d578883633dcaa6f26 (diff) | |
| download | mariadb-git-4f908f248e148fc015f3f82450a003b88bdca98d.tar.gz | |
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into big_geek.:C:/Work/mysql/mysql-5.1
include/config-win.h:
Auto merged
include/m_string.h:
Auto merged
include/my_base.h:
Auto merged
include/my_sys.h:
Auto merged
include/my_tree.h:
Auto merged
mysys/mf_keycache.c:
Auto merged
mysys/my_init.c:
Auto merged
mysys/my_open.c:
Auto merged
mysys/my_access.c:
adjusted defines from merge
Diffstat (limited to 'mysys/my_init.c')
| -rw-r--r-- | mysys/my_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index 4d7299c7cb1..be08f615253 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -181,7 +181,7 @@ Voluntary context switches %ld, Involuntary context switches %ld\n", rus.ru_msgsnd, rus.ru_msgrcv, rus.ru_nsignals, rus.ru_nvcsw, rus.ru_nivcsw); #endif -#if ( defined(MSDOS) || defined(__NETWARE__) ) && !defined(__WIN__) +#if defined(__NETWARE__) && !defined(__WIN__) fprintf(info_file,"\nRun time: %.1f\n",(double) clock()/CLOCKS_PER_SEC); #endif #if defined(SAFEMALLOC) |