mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 18:41:56 +01:00
Merge pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug4445.1
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug4445.2
This commit is contained in:
commit
25ff6a0938
2 changed files with 16 additions and 9 deletions
|
@ -31,18 +31,25 @@ functions */
|
||||||
|
|
||||||
#define HAVE_SMEM 1
|
#define HAVE_SMEM 1
|
||||||
|
|
||||||
#if defined(__NT__)
|
#if defined(_WIN64) || defined(WIN64)
|
||||||
#define SYSTEM_TYPE "NT"
|
#define SYSTEM_TYPE "Win64"
|
||||||
#elif defined(__WIN2000__)
|
#elif defined(_WIN32) || defined(WIN32)
|
||||||
#define SYSTEM_TYPE "WIN2000"
|
#define SYSTEM_TYPE "Win32"
|
||||||
#else
|
#else
|
||||||
#define SYSTEM_TYPE "Win95/Win98"
|
#define SYSTEM_TYPE "Windows"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(_WIN64) || defined(WIN64)
|
#if defined(_M_IA64)
|
||||||
#define MACHINE_TYPE "ia64" /* Define to machine type name */
|
#define MACHINE_TYPE "ia64"
|
||||||
|
#elif defined(_M_IX86)
|
||||||
|
#define MACHINE_TYPE "ia32"
|
||||||
|
#elif defined(_M_ALPHA)
|
||||||
|
#define MACHINE_TYPE "axp"
|
||||||
#else
|
#else
|
||||||
#define MACHINE_TYPE "i32" /* Define to machine type name */
|
#define MACHINE_TYPE "unknown" /* Define to machine type name */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if !(defined(_WIN64) || defined(WIN64))
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
#define _WIN32 /* Compatible with old source */
|
#define _WIN32 /* Compatible with old source */
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -602,7 +602,7 @@ innobase_mysql_tmpfile(void)
|
||||||
{
|
{
|
||||||
char filename[FN_REFLEN];
|
char filename[FN_REFLEN];
|
||||||
int fd2 = -1;
|
int fd2 = -1;
|
||||||
File fd = create_temp_file(filename, NullS, "ib",
|
File fd = create_temp_file(filename, mysql_tmpdir, "ib",
|
||||||
#ifdef __WIN__
|
#ifdef __WIN__
|
||||||
O_BINARY | O_TRUNC | O_SEQUENTIAL |
|
O_BINARY | O_TRUNC | O_SEQUENTIAL |
|
||||||
O_TEMPORARY | O_SHORT_LIVED |
|
O_TEMPORARY | O_SHORT_LIVED |
|
||||||
|
|
Loading…
Add table
Reference in a new issue