← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/innobase/os/os0file.c

Removed dead variable, sorted authors file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/os/os0file.c
454
454
 
455
455
#undef USE_FILE_LOCK
456
456
#define USE_FILE_LOCK
457
 
#if defined(UNIV_HOTBACKUP) || defined(__WIN__) 
 
457
#if defined(UNIV_HOTBACKUP) || defined(__WIN__) || defined(__NETWARE__)
458
458
/* InnoDB Hot Backup does not lock the data files.
459
459
 * On Windows, mandatory locking is used.
460
460
 */
510
510
        }
511
511
}
512
512
 
513
 
#if !defined(UNIV_HOTBACKUP) 
 
513
#if !defined(UNIV_HOTBACKUP) && !defined(__NETWARE__)
514
514
/*************************************************************************
515
515
Creates a temporary file that will be deleted on close.
516
516
This function is defined in ha_innodb.cc. */
519
519
innobase_mysql_tmpfile(void);
520
520
/*========================*/
521
521
                        /* out: temporary file descriptor, or < 0 on error */
522
 
#endif /* !UNIV_HOTBACKUP */
 
522
#endif /* !UNIV_HOTBACKUP && !__NETWARE__ */
523
523
 
524
524
/***************************************************************************
525
525
Creates a temporary file.  This function is like tmpfile(3), but
537
537
 
538
538
        return(NULL);
539
539
#else
 
540
# ifdef __NETWARE__
 
541
        FILE*   file    = tmpfile();
 
542
# else /* __NETWARE__ */
540
543
        FILE*   file    = NULL;
541
544
        int     fd      = innobase_mysql_tmpfile();
542
545
 
543
546
        if (fd >= 0) {
544
547
                file = fdopen(fd, "w+b");
545
548
        }
 
549
# endif /* __NETWARE__ */
546
550
 
547
551
        if (!file) {
548
552
                ut_print_timestamp(stderr);
549
553
                fprintf(stderr,
550
554
                        "  InnoDB: Error: unable to create temporary file;"
551
555
                        " errno: %d\n", errno);
 
556
# ifndef __NETWARE__
552
557
                if (fd >= 0) {
553
558
                        close(fd);
554
559
                }
 
560
# endif /* !__NETWARE__ */
555
561
        }
556
562
 
557
563
        return(file);
1111
1117
static void
1112
1118
os_file_set_nocache(
1113
1119
/*================*/
1114
 
        int             fd,/* in: file descriptor to alter */
1115
 
        const char*     file_name,/* in: used in the diagnostic
1116
 
                                        message */
1117
 
        const char*     operation_name)/* in: used in the
1118
 
                                        diagnostic message,
 
1120
        int             fd,             /* in: file descriptor to alter */
 
1121
        const char*     file_name,      /* in: used in the diagnostic message */
 
1122
        const char*     operation_name) /* in: used in the diagnostic message,
1119
1123
                                        we call os_file_set_nocache()
1120
1124
                                        immediately after opening or creating
1121
1125
                                        a file, so this is either "open" or
1149
1153
                                "see MySQL Bug#26662\n");
1150
1154
                }
1151
1155
        }
1152
 
#else
1153
 
  (void)fd;
1154
 
  (void)file_name;
1155
 
  (void)operation_name;
1156
1156
#endif
1157
1157
}
1158
1158