Merge mariadb-5.5 -> 10.0-base.

7 files changed, 29 insertions, 12 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 d71d049f69d..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 */
 
@@ -848,6 +847,7 @@ int STDCALL mysql_close_start(MYSQL *sock);
 int STDCALL mysql_close_cont(MYSQL *sock, int status);
 my_socket STDCALL mysql_get_socket(const MYSQL *mysql);
 unsigned int STDCALL mysql_get_timeout_value(const MYSQL *mysql);
+unsigned int STDCALL mysql_get_timeout_value_ms(const MYSQL *mysql);
 
 /* status return codes */
 #define MYSQL_NO_DATA        100
diff --git a/include/mysql.h.pp b/include/mysql.h.pp
index ce577146581..48ce79046ff 100644
--- a/include/mysql.h.pp
+++ b/include/mysql.h.pp
@@ -729,3 +729,4 @@ int mysql_close_start(MYSQL *sock);
 int mysql_close_cont(MYSQL *sock, int status);
 my_socket mysql_get_socket(const MYSQL *mysql);
 unsigned int mysql_get_timeout_value(const MYSQL *mysql);
+unsigned int mysql_get_timeout_value_ms(const MYSQL *mysql);
diff --git a/include/mysql_com.h b/include/mysql_com.h
index 7fdd2c8d646..46a55e42e50 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/thread_pool_priv.h b/include/thread_pool_priv.h
index 4060cf51733..78526894e21 100644
--- a/include/thread_pool_priv.h
+++ b/include/thread_pool_priv.h
@@ -36,6 +36,7 @@
 #include <debug_sync.h>
 #include <sql_profile.h>
 #include <table.h>
+#include <sql_list.h>
 
 /* Needed to get access to scheduler variables */
 void* thd_get_scheduler_data(THD *thd);
@@ -56,9 +57,14 @@ void thd_unlock_data(THD *thd);
 bool thd_is_transaction_active(THD *thd);
 int thd_connection_has_data(THD *thd);
 void thd_set_net_read_write(THD *thd, uint val);
+uint thd_get_net_read_write(THD *thd);
 void thd_set_mysys_var(THD *thd, st_my_thread_var *mysys_var);
+ulong  thd_get_net_wait_timeout(THD *thd);
 my_socket thd_get_fd(THD *thd);
 
+THD *first_global_thread();
+THD *next_global_thread(THD *thd);
+
 /* Print to the MySQL error log */
 void sql_print_error(const char *format, ...);
 
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 739aeb4ede8..01139677b7d 100644
--- a/include/welcome_copyright_notice.h
+++ b/include/welcome_copyright_notice.h
@@ -1,4 +1,5 @@
-/* Copyright (c) 2010, 2011, 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
@@ -16,11 +17,14 @@
 #ifndef _welcome_copyright_notice_h_
 #define _welcome_copyright_notice_h_
 
+#define COPYRIGHT_NOTICE_CURRENT_YEAR "2012"
+
 /*
   This define specifies copyright notice which is displayed by every MySQL
   program on start, or on help screen.
 */
-#define ORACLE_WELCOME_COPYRIGHT_NOTICE(years) \
-  "Copyright (c) " years ", Oracle, Monty Program Ab and others.\n"
+#define ORACLE_WELCOME_COPYRIGHT_NOTICE(first_year) \
+  "Copyright (c) " first_year ", " COPYRIGHT_NOTICE_CURRENT_YEAR \
+   ", Oracle, Monty Program Ab and others.\n"
 
 #endif /* _welcome_copyright_notice_h_ */