diff options
| author | unknown <knielsen@knielsen-hq.org> | 2012-12-18 15:01:58 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2012-12-18 15:01:58 +0100 |
| commit | 701419b02f12688188a7d4183523e0f5ee9ae09a (patch) | |
| tree | 9cad9901bbf188c5ab30aeb31f10c71f61921312 /include | |
| parent | 4923d19b7c3c4c034f70ac1411837afa75c4b6ad (diff) | |
| parent | 6c3de76ad5cb8683ab8b049e0bbba670115d304a (diff) | |
| download | mariadb-git-701419b02f12688188a7d4183523e0f5ee9ae09a.tar.gz | |
Merge MariaDB 10.0-base to MariaDB 10.0
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 | 5 | ||||
| -rw-r--r-- | include/welcome_copyright_notice.h | 3 |
4 files changed, 12 insertions, 10 deletions
diff --git a/include/my_base.h b/include/my_base.h index bf05d49db7d..b711c8bef13 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -283,6 +283,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 046d093dc47..c761938c39b 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 /* MY_GLOBAL_INCLUDED */ diff --git a/include/mysql_com.h b/include/mysql_com.h index f02f5baab09..b5b4dc585b8 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" @@ -128,6 +125,8 @@ enum enum_server_command reserved by MySQL Cluster */ #define FIELD_FLAGS_COLUMN_FORMAT 24 /* Field column format, bit 24-25, reserved by MySQL Cluster */ +#define HAS_EXPLICIT_VALUE (1 << 26) /* An INSERT/UPDATE operation supplied + an explicit default value */ #define REFRESH_GRANT 1 /* Refresh grant tables */ #define REFRESH_LOG 2 /* Start on new log file */ 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 |