diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-03-23 11:26:50 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-03-23 11:26:50 +0100 |
| commit | 2f1ee8fc47af30557d89bfedd2b09562bedc024f (patch) | |
| tree | b7116f292340e676d8d042283c070857e940cb76 /mysys/my_static.c | |
| parent | 70491343c3bc0add4347e6460a2e3a861430e91a (diff) | |
| parent | ab1ac1278a9d6d8b5dd193d2f024b69237946596 (diff) | |
| download | mariadb-git-2f1ee8fc47af30557d89bfedd2b09562bedc024f.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
mysys/my_static.c:
Auto merged
mysys/mf_tempfile.c:
Use remote
Diffstat (limited to 'mysys/my_static.c')
| -rw-r--r-- | mysys/my_static.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/mysys/my_static.c b/mysys/my_static.c index 95521c49ab7..42dd9d71490 100644 --- a/mysys/my_static.c +++ b/mysys/my_static.c @@ -69,11 +69,6 @@ my_bool my_use_large_pages= 0; uint my_large_page_size= 0; #endif - /* from my_tempnam */ -#if !defined(HAVE_TEMPNAM) || defined(HPUX11) -int _my_tempnam_used=0; -#endif - /* from safe_malloc */ uint sf_malloc_prehunc=0, /* If you have problem with core- */ sf_malloc_endhunc=0, /* dump when malloc-message.... */ |