diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-11-30 13:36:29 +0200 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-11-30 13:36:29 +0200 |
| commit | 4df29fef362389f3fe64da4880af7050396baa94 (patch) | |
| tree | 473488ed8a09fc3cc857fbfa1872013cfeaf8c52 /include | |
| parent | fc6cd855e9dd1b89a45f6584b3bd21ddc1f60607 (diff) | |
| parent | 7c5f62a313d7dd3047ed29f4007c73b53541c482 (diff) | |
| download | mariadb-git-4df29fef362389f3fe64da4880af7050396baa94.tar.gz | |
References: lp:1066784 - Merged with MariaDB 5.5.28a
bzr merge -r tag:mariadb-5.5.28a lp:maria/5.5
...no conflicts
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_base.h | 3 | ||||
| -rw-r--r-- | include/mysql.h | 11 | ||||
| -rw-r--r-- | include/mysql_com.h | 3 | ||||
| -rw-r--r-- | include/violite.h | 6 | ||||
| -rw-r--r-- | include/welcome_copyright_notice.h | 3 |
5 files changed, 16 insertions, 10 deletions
diff --git a/include/my_base.h b/include/my_base.h index 905e4535360..e072bb7e2b1 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -282,6 +282,9 @@ enum ha_base_keytype { #define HA_USES_BLOCK_SIZE ((uint) 32768) #define HA_SORT_ALLOWS_SAME 512 /* Intern bit when sorting records */ +/* This flag can be used only in KEY::ext_key_flags */ +#define HA_EXT_NOSAME 131072 + /* These flags can be added to key-seg-flag */ #define HA_SPACE_PACK 1 /* Pack space in key-seg */ diff --git a/include/mysql.h b/include/mysql.h index 1fc164f62b2..fa62026b44a 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -47,9 +47,6 @@ extern "C" { #ifndef MYSQL_ABI_CHECK #include <sys/types.h> #endif -#ifdef __LCC__ -#include <winsock2.h> /* For windows */ -#endif typedef char my_bool; #if (defined(_WIN32) || defined(_WIN64)) && !defined(__WIN__) #define __WIN__ @@ -61,11 +58,13 @@ typedef char my_bool; #endif #ifndef my_socket_defined -#ifdef __WIN__ -#define my_socket SOCKET +#if defined (_WIN64) +#define my_socket unsigned long long +#elif defined (_WIN32) +#define my_socket unsigned int #else typedef int my_socket; -#endif /* __WIN__ */ +#endif /* _WIN64 */ #endif /* my_socket_defined */ #endif /* _global_h */ diff --git a/include/mysql_com.h b/include/mysql_com.h index 0988d20f97f..6e8a2b23de0 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -57,9 +57,6 @@ #define LOCAL_HOST "localhost" #define LOCAL_HOST_NAMEDPIPE "." -#ifdef _WIN32 -#include <ws2tcpip.h> -#endif #if defined(__WIN__) && !defined( _CUSTOMCONFIG_) #define MYSQL_NAMEDPIPE "MySQL" diff --git a/include/violite.h b/include/violite.h index 18df848d8b8..14c99e8d8fe 100644 --- a/include/violite.h +++ b/include/violite.h @@ -177,6 +177,12 @@ void vio_end(void); #endif /* !defined(DONT_MAP_VIO) */ #ifdef _WIN32 + +/* shutdown(2) flags */ +#ifndef SHUT_RD +#define SHUT_RD SD_BOTH +#endif + /* Set thread id for io cancellation (required on Windows XP only, and should to be removed if XP is no more supported) diff --git a/include/welcome_copyright_notice.h b/include/welcome_copyright_notice.h index adb7b9f9c20..01139677b7d 100644 --- a/include/welcome_copyright_notice.h +++ b/include/welcome_copyright_notice.h @@ -1,4 +1,5 @@ -/* Copyright (c) 2010, 2012, Oracle and/or its affiliates. +/* Copyright (c) 2011, 2012, Oracle and/or its affiliates. + Copyright (c) 2011, 2012, Monty Program Ab This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by |