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/mysql_com.h | |
| 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/mysql_com.h')
| -rw-r--r-- | include/mysql_com.h | 5 |
1 files changed, 2 insertions, 3 deletions
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 */ |