Merge with 5.5

5 files changed, 19 insertions, 28 deletions

diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 6404074c8c9..a90238dbd42 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -25,6 +25,7 @@ SET(HEADERS
   mysql.h 
   mysql_com.h
   mysql_time.h 
+  ma_dyncol.h
   my_list.h
   my_alloc.h
   typelib.h 
@@ -33,6 +34,7 @@ SET(HEADERS
   my_sys.h 
   my_xml.h
   mysql_embed.h
+  my_decimal_limits.h
   my_pthread.h
   decimal.h
   errmsg.h
diff --git a/include/my_base.h b/include/my_base.h
index dacceaa0aeb..bf05d49db7d 100644
--- a/include/my_base.h
+++ b/include/my_base.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates.
+/* Copyright (c) 2000, 2012, Oracle and/or its affiliates.
    Copyright (c) 1995, 2012 Monty Program Ab
 
    This program is free software; you can redistribute it and/or modify
@@ -11,8 +11,9 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+
 
 /* This file includes constants used with all databases */
 
@@ -460,11 +461,12 @@ enum ha_base_keytype {
 #define HA_ERR_INDEX_COL_TOO_LONG 179    /* Index column length exceeds limit */
 #define HA_ERR_INDEX_CORRUPT      180    /* Index corrupted */
 #define HA_ERR_UNDO_REC_TOO_BIG   181    /* Undo log record too big */
-#define HA_FTS_INVALID_DOCID      182	 /* Invalid InnoDB Doc ID */
-#define HA_ERR_ROW_NOT_VISIBLE    183
-#define HA_ERR_ABORTED_BY_USER    184
-#define HA_ERR_DISK_FULL          185
-#define HA_ERR_LAST               185    /* Copy of last error nr */
+#define HA_ERR_TABLE_IN_FK_CHECK  182    /* Table being used in foreign key check */
+#define HA_FTS_INVALID_DOCID      183	 /* Invalid InnoDB Doc ID */
+#define HA_ERR_ROW_NOT_VISIBLE    184
+#define HA_ERR_ABORTED_BY_USER    185
+#define HA_ERR_DISK_FULL          186
+#define HA_ERR_LAST               186    /* Copy of last error nr */
 
 /* Number of different errors */
 #define HA_ERR_ERRORS            (HA_ERR_LAST - HA_ERR_FIRST + 1)
diff --git a/include/my_global.h b/include/my_global.h
index 8170ce381af..a5fa57dbfe3 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -1429,6 +1429,10 @@ static inline char *dlerror(void)
 /* Length of decimal number represented by INT64. */
 #define MY_INT64_NUM_DECIMAL_DIGITS 21
 
+#ifdef __cplusplus
+#include <limits> /* should be included before min/max macros */
+#endif
+
 /* Define some useful general macros (should be done after all headers). */
 #if !defined(max)
 #define max(a, b)	((a) > (b) ? (a) : (b))
diff --git a/include/probes_mysql.h b/include/probes_mysql.h
index cc47c59b62d..6d44b972cb3 100644
--- a/include/probes_mysql.h
+++ b/include/probes_mysql.h
@@ -18,28 +18,8 @@
 
 #define PROBES_MYSQL_H
 
-
 #if defined(HAVE_DTRACE) && !defined(DISABLE_DTRACE)
-
-#ifdef __linux__
-/* 
-  On Linux, generated probes header may include C++ header
-  <limits> which conflicts with min and max macros from my_global.h .
-  To fix, temporarily undefine the macros.
-*/
-#pragma push_macro("min")
-#pragma push_macro("max")
-#undef min
-#undef max
-#endif
-
 #include "probes_mysql_dtrace.h"
-
-#ifdef __linux__
-#pragma pop_macro("min")
-#pragma pop_macro("max")
-#endif
-
 #else  /* no dtrace */
 #include "probes_mysql_nodtrace.h"
 #endif
diff --git a/include/violite.h b/include/violite.h
index c8d459d931b..a026038bb0e 100644
--- a/include/violite.h
+++ b/include/violite.h
@@ -59,6 +59,9 @@ Vio* vio_new_win32shared_memory(HANDLE handle_file_map,
 #define HANDLE void *
 #endif /* __WIN__ */
 
+/* backport from 5.6 where it is part of PSI, not vio_*() */
+int	mysql_socket_shutdown(my_socket mysql_socket, int how);
+
 void	vio_delete(Vio* vio);
 int	vio_close(Vio* vio);
 void    vio_reset(Vio* vio, enum enum_vio_type type,