References: MDEV-4572 - merge with mariaDB 5.5.31

bzr merge lp:maria/5.5 -rtag:mariadb-5.5.31

Text conflict in cmake/cpack_rpm.cmake
Text conflict in debian/dist/Debian/control
Text conflict in debian/dist/Ubuntu/control
Text conflict in sql/CMakeLists.txt
Conflict adding file sql/db.opt.  Moved existing file to sql/db.opt.moved.
Conflict adding file sql/db.opt.moved.  Moved existing file to sql/db.opt.moved.moved.
Text conflict in sql/mysqld.cc
Text conflict in support-files/mysql.spec.sh
8 conflicts encountered.

25 files changed, 205 insertions, 93 deletions

diff --git a/include/atomic/x86-gcc.h b/include/atomic/x86-gcc.h
index 2238347d419..173e32e790c 100644
--- a/include/atomic/x86-gcc.h
+++ b/include/atomic/x86-gcc.h
@@ -124,10 +124,10 @@
   asm volatile ("push %%ebx;"                                     \
                 "movl (%%ecx), %%ebx;"                            \
                 "movl 4(%%ecx), %%ecx;"                           \
-                LOCK_prefix "; cmpxchg8b %0;"                     \
+                LOCK_prefix "; cmpxchg8b (%%esi);"                \
                 "setz %2; pop %%ebx"                              \
-                : "=m" (*a), "+A" (*cmp), "=c" (ret)              \
-                : "c" (&set), "m" (*a)                            \
+                : "+S" (a), "+A" (*cmp), "=c" (ret)               \
+                : "c" (&set)                                      \
                 : "memory", "esp")
 #endif
 
diff --git a/include/base64.h b/include/base64.h
index 4ac0aa72ad8..e19da8762cb 100644
--- a/include/base64.h
+++ b/include/base64.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2006 MySQL AB
+   Use is subject to license terms
 
    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
diff --git a/include/ft_global.h b/include/ft_global.h
index 8a1069d6e62..73726018d0a 100644
--- a/include/ft_global.h
+++ b/include/ft_global.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000-2007 MySQL AB, 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2000-2005, 2007 MySQL AB, 2009 Sun Microsystems, Inc.
    Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/include/m_ctype.h b/include/m_ctype.h
index 969cb0058ac..001884afe81 100644
--- a/include/m_ctype.h
+++ b/include/m_ctype.h
@@ -1,5 +1,4 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates.
+/* Copyright (c) 2000, 2013, Oracle and/or its affiliates.
 
    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
@@ -172,6 +171,8 @@ enum my_lex_states
 struct charset_info_st;
 
 
+extern int (*my_string_stack_guard)(int);
+
 /* See strings/CHARSET_INFO.txt for information about this structure  */
 struct my_collation_handler_st
 {
diff --git a/include/m_string.h b/include/m_string.h
index 9efa0376942..1f59fd06084 100644
--- a/include/m_string.h
+++ b/include/m_string.h
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2011, Oracle and/or its affiliates.
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates.
 
    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
@@ -108,6 +108,15 @@ extern  char *strcend(const char *, pchar);
 extern	char *strfill(char * s,size_t len,pchar fill);
 extern	char *strmake(char *dst,const char *src,size_t length);
 
+#if !defined(__GNUC__) || (__GNUC__ < 4)
+#define strmake_buf(D,S)        strmake(D, S, sizeof(D) - 1)
+#else
+#define strmake_buf(D,S) ({                             \
+  compile_time_assert(sizeof(D) != sizeof(char*));      \
+  strmake(D, S, sizeof(D) - 1);                         \
+  })
+#endif
+
 #ifndef strmov
 extern	char *strmov(char *dst,const char *src);
 #endif
diff --git a/include/my_global.h b/include/my_global.h
index 09a3a0a6efd..fcfc052d191 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -390,7 +390,8 @@ C_MODE_END
 #define compile_time_assert(X)                                  \
   do                                                            \
   {                                                             \
-    typedef char compile_time_assert[(X) ? 1 : -1];             \
+    typedef char compile_time_assert[(X) ? 1 : -1]              \
+                                       __attribute__((unused)); \
   } while(0)
 #endif
 
diff --git a/include/my_md5.h b/include/my_md5.h
index 782bef8a27a..7328661eb71 100644
--- a/include/my_md5.h
+++ b/include/my_md5.h
@@ -1,7 +1,8 @@
 #ifndef MY_MD5_INCLUDED
 #define MY_MD5_INCLUDED
 
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2001, 2007 MySQL AB, 2009 Sun Microsystems, Inc.
+   Use is subject to license terms
 
    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
diff --git a/include/my_sys.h b/include/my_sys.h
index f0f5d7666fc..2281d014c85 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000, 2013, Oracle and/or its affiliates.
+   Copyright (c) 2010, 2013, 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
diff --git a/include/my_user.h b/include/my_user.h
index 44eebf1551d..067425a2b47 100644
--- a/include/my_user.h
+++ b/include/my_user.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2005 MySQL AB
+/* Copyright (c) 2005-2007 MySQL AB
+   Use is subject to license terms
 
  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
diff --git a/include/my_xml.h b/include/my_xml.h
index 6a453ee90be..e97232c7039 100644
--- a/include/my_xml.h
+++ b/include/my_xml.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2002, 2003, 2005, 2007 MySQL AB
+   Use is subject to license terms
 
    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
diff --git a/include/myisamchk.h b/include/myisamchk.h
index 0ee03c03c49..19c2bf47ddb 100644
--- a/include/myisamchk.h
+++ b/include/myisamchk.h
@@ -31,27 +31,27 @@
 #define T_AUTO_REPAIR           2		/* QQ to be removed */
 #define T_BACKUP_DATA           4
 #define T_CALC_CHECKSUM         8
-#define T_CHECK                 16		/* QQ to be removed */
-#define T_CHECK_ONLY_CHANGED    32		/* QQ to be removed */
+#define T_CHECK                 16
+#define T_CHECK_ONLY_CHANGED    32
 #define T_CREATE_MISSING_KEYS   64
 #define T_DESCRIPT              128
 #define T_DONT_CHECK_CHECKSUM   256
 #define T_EXTEND                512
-#define T_FAST                  (1L << 10)	/* QQ to be removed */
-#define T_FORCE_CREATE          (1L << 11)	/* QQ to be removed */
+#define T_FAST                  (1L << 10)
+#define T_FORCE_CREATE          (1L << 11)
 #define T_FORCE_UNIQUENESS      (1L << 12)
 #define T_INFO                  (1L << 13)
 #define T_MEDIUM                (1L << 14)
-#define T_QUICK                 (1L << 15)	/* QQ to be removed */
-#define T_READONLY              (1L << 16)	/* QQ to be removed */
+#define T_QUICK                 (1L << 15)
+#define T_READONLY              (1L << 16)
 #define T_REP                   (1L << 17)
-#define T_REP_BY_SORT           (1L << 18)	/* QQ to be removed */
-#define T_REP_PARALLEL          (1L << 19)	/* QQ to be removed */
+#define T_REP_BY_SORT           (1L << 18)
+#define T_REP_PARALLEL          (1L << 19)
 #define T_RETRY_WITHOUT_QUICK   (1L << 20)
 #define T_SAFE_REPAIR           (1L << 21)
 #define T_SILENT                (1L << 22)
-#define T_SORT_INDEX            (1L << 23)	/* QQ to be removed */
-#define T_SORT_RECORDS          (1L << 24)	/* QQ to be removed */
+#define T_SORT_INDEX            (1L << 23)
+#define T_SORT_RECORDS          (1L << 24)
 #define T_STATISTICS            (1L << 25)
 #define T_UNPACK                (1L << 26)
 #define T_UPDATE_STATE          (1L << 27)
diff --git a/include/myisampack.h b/include/myisampack.h
index a065de378d8..0795455dc3e 100644
--- a/include/myisampack.h
+++ b/include/myisampack.h
@@ -1,7 +1,7 @@
 #ifndef MYISAMPACK_INCLUDED
 #define MYISAMPACK_INCLUDED
 
-/* Copyright (c) 2000-2002, 2004, 2006 MySQL AB, 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2000-2002, 2004 MySQL AB, 2009 Sun Microsystems, Inc.
    Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/include/mysql.h b/include/mysql.h
index fa62026b44a..4d1fa437407 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -1,5 +1,6 @@
 /*
-   Copyright (c) 2000, 2011, Oracle and/or its affiliates.
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates.
+   Copyright (c) 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
diff --git a/include/mysql/plugin_audit.h b/include/mysql/plugin_audit.h
index eee32a9e523..86b6dea5668 100644
--- a/include/mysql/plugin_audit.h
+++ b/include/mysql/plugin_audit.h
@@ -25,7 +25,7 @@
 
 #define MYSQL_AUDIT_CLASS_MASK_SIZE 1
 
-#define MYSQL_AUDIT_INTERFACE_VERSION 0x0300
+#define MYSQL_AUDIT_INTERFACE_VERSION 0x0301
 
 
 /*************************************************************************
@@ -97,6 +97,50 @@ struct mysql_event_connection
   unsigned int database_length;
 };
 
+/*
+  AUDIT CLASS : TABLE
+  
+  LOCK occurs when a connection "locks" (this does not necessarily mean a table
+  lock and also happens for row-locking engines) the table at the beginning of
+  a statement. This event is generated at the beginning of every statement for
+  every affected table, unless there's a LOCK TABLES statement in effect (in
+  which case it is generated once for LOCK TABLES and then is suppressed until
+  the tables are unlocked).
+
+  CREATE/DROP/RENAME occur when a table is created, dropped, or renamed.
+*/
+
+#define MYSQL_AUDIT_TABLE_CLASS 15
+#define MYSQL_AUDIT_TABLE_CLASSMASK (1 << MYSQL_AUDIT_TABLE_CLASS)
+#define MYSQL_AUDIT_TABLE_LOCK   0
+#define MYSQL_AUDIT_TABLE_CREATE 1
+#define MYSQL_AUDIT_TABLE_DROP   2
+#define MYSQL_AUDIT_TABLE_RENAME 3
+#define MYSQL_AUDIT_TABLE_ALTER  4
+
+struct mysql_event_table
+{
+  unsigned int event_subclass;
+  unsigned long thread_id;
+  const char *user;
+  const char *priv_user;
+  const char *priv_host;
+  const char *external_user;
+  const char *proxy_user;
+  const char *host;
+  const char *ip;
+  const char *database;
+  unsigned int database_length;
+  const char *table;
+  unsigned int table_length;
+  /* for MYSQL_AUDIT_TABLE_LOCK, true if read-only, false if read/write */
+  int read_only;
+  /* for MYSQL_AUDIT_TABLE_RENAME */
+  const char *new_database;
+  unsigned int new_database_length;
+  const char *new_table;
+  unsigned int new_table_length;
+};
 
 /*************************************************************************
   Here we define the descriptor structure, that is referred from
diff --git a/include/mysql/plugin_audit.h.pp b/include/mysql/plugin_audit.h.pp
index f19d5fe797c..cb8435a1ec7 100644
--- a/include/mysql/plugin_audit.h.pp
+++ b/include/mysql/plugin_audit.h.pp
@@ -279,6 +279,27 @@ struct mysql_event_connection
   const char *database;
   unsigned int database_length;
 };
+struct mysql_event_table
+{
+  unsigned int event_subclass;
+  unsigned long thread_id;
+  const char *user;
+  const char *priv_user;
+  const char *priv_host;
+  const char *external_user;
+  const char *proxy_user;
+  const char *host;
+  const char *ip;
+  const char *database;
+  unsigned int database_length;
+  const char *table;
+  unsigned int table_length;
+  int read_only;
+  const char *new_database;
+  unsigned int new_database_length;
+  const char *new_table;
+  unsigned int new_table_length;
+};
 struct st_mysql_audit
 {
   int interface_version;
diff --git a/include/mysql/plugin_auth.h b/include/mysql/plugin_auth.h
index 75e7fba5266..156fb386aae 100644
--- a/include/mysql/plugin_auth.h
+++ b/include/mysql/plugin_auth.h
@@ -27,7 +27,7 @@
 
 #include <mysql/plugin.h>
 
-#define MYSQL_AUTHENTICATION_INTERFACE_VERSION 0x0100
+#define MYSQL_AUTHENTICATION_INTERFACE_VERSION 0x0200
 
 #include <mysql/plugin_auth_common.h>
 
@@ -78,7 +78,7 @@ typedef struct st_mysql_server_auth_info
     Not used by the server.
     Available through the @@EXTERNAL_USER variable.
   */  
-  char external_user[512];
+  char external_user[MYSQL_USERNAME_LENGTH+1];
 
   /**
     This only affects the "Authentication failed. Password used: %s"
diff --git a/include/mysql/plugin_auth.h.pp b/include/mysql/plugin_auth.h.pp
index 23153198a7d..55b6055ef2f 100644
--- a/include/mysql/plugin_auth.h.pp
+++ b/include/mysql/plugin_auth.h.pp
@@ -266,8 +266,8 @@ typedef struct st_mysql_server_auth_info
   unsigned int user_name_length;
   const char *auth_string;
   unsigned long auth_string_length;
-  char authenticated_as[48 +1];
-  char external_user[512];
+  char authenticated_as[512 +1];
+  char external_user[512 +1];
   int password_used;
   const char *host_or_ip;
   unsigned int host_or_ip_length;
diff --git a/include/mysql/plugin_auth_common.h b/include/mysql/plugin_auth_common.h
index 820d299bf88..c0b61730d0d 100644
--- a/include/mysql/plugin_auth_common.h
+++ b/include/mysql/plugin_auth_common.h
@@ -28,7 +28,7 @@
 #define MYSQL_PLUGIN_AUTH_COMMON_INCLUDED
 
 /** the max allowed length for a user name */
-#define MYSQL_USERNAME_LENGTH 48
+#define MYSQL_USERNAME_LENGTH 512
 
 /**
   return values of the plugin authenticate_user() method.
diff --git a/include/mysql/service_my_snprintf.h b/include/mysql/service_my_snprintf.h
index a7fd3e8a2c6..d4ce97076e6 100644
--- a/include/mysql/service_my_snprintf.h
+++ b/include/mysql/service_my_snprintf.h
@@ -1,5 +1,5 @@
 #ifndef MYSQL_SERVICE_MY_SNPRINTF_INCLUDED
-/* Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 
    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
diff --git a/include/mysql_com.h b/include/mysql_com.h
index c0f350d2bcf..fdd75556033 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -24,7 +24,7 @@
 #define HOSTNAME_LENGTH 60
 #define SYSTEM_CHARSET_MBMAXLEN 3
 #define NAME_CHAR_LEN	64              /* Field/table name length */
-#define USERNAME_CHAR_LENGTH 16
+#define USERNAME_CHAR_LENGTH 128
 #define NAME_LEN                (NAME_CHAR_LEN*SYSTEM_CHARSET_MBMAXLEN)
 #define USERNAME_LENGTH         (USERNAME_CHAR_LENGTH*SYSTEM_CHARSET_MBMAXLEN)
 
@@ -34,6 +34,31 @@
 #define MYSQL50_TABLE_NAME_PREFIX_LENGTH  (sizeof(MYSQL50_TABLE_NAME_PREFIX)-1)
 #define SAFE_NAME_LEN (NAME_LEN + MYSQL50_TABLE_NAME_PREFIX_LENGTH)
 
+/*
+  MDEV-4088
+
+  MySQL (and MariaDB 5.x before the fix) was using the first character of the
+  server version string (as sent in the first handshake protocol packet) to
+  decide on the replication event formats. And for 10.x the first character
+  is "1", which the slave thought comes from some ancient 1.x version
+  (ignoring the fact that the first ever MySQL version was 3.x).
+
+  To support replication to these old clients, we fake the version in the
+  first handshake protocol packet to start from "5.5.5-" (for example,
+  it might be "5.5.5-10.0.1-MariaDB-debug-log".
+
+  On the client side we remove this fake version prefix to restore the
+  correct server version. The version "5.5.5" did not support
+  pluggable authentication, so any version starting from "5.5.5-" and
+  claiming to support pluggable auth, must be using this fake prefix.
+*/
+#ifdef EMBEDDED_LIBRARY
+#define RPL_VERSION_HACK ""
+#else
+/* this version must be the one that *does not* support pluggable auth */
+#define RPL_VERSION_HACK "5.5.5-"
+#endif
+
 #define SERVER_VERSION_LENGTH 60
 #define SQLSTATE_LENGTH 5
 #define LIST_PROCESS_HOST_LEN 64
diff --git a/include/mysql_time.h b/include/mysql_time.h
index 0a3f17a81fb..c92267232a1 100644
--- a/include/mysql_time.h
+++ b/include/mysql_time.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, 2006 MySQL AB
+   Use is subject to license terms
 
  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
diff --git a/include/mysql_version.h.in b/include/mysql_version.h.in
index 18c61040c22..56b2fe50ec0 100644
--- a/include/mysql_version.h.in
+++ b/include/mysql_version.h.in
@@ -1,4 +1,5 @@
-/* Copyright Abandoned 1996, 1999, 2001 MySQL AB
+/* Copyright (c) 1996, 1999-2004, 2007 MySQL AB
+   Use is subject to license terms
    This file is public domain and comes with NO WARRANTY of any kind */
 
 /* Version numbers for protocol & mysqld */
diff --git a/include/probes_mysql_nodtrace.h b/include/probes_mysql_nodtrace.h
index bc3b65a00e5..a84bf7726c3 100644
--- a/include/probes_mysql_nodtrace.h
+++ b/include/probes_mysql_nodtrace.h
@@ -6,121 +6,124 @@
 #define	_PROBES_MYSQL_D
 
 #ifdef	__cplusplus
+#define MYSQL_PROBES_FALSE false
 extern "C" {
+#else
+#define MYSQL_PROBES_FALSE 0
 #endif
 
 #define	MYSQL_CONNECTION_START(arg0, arg1, arg2)
-#define	MYSQL_CONNECTION_START_ENABLED() (0)
+#define	MYSQL_CONNECTION_START_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_CONNECTION_DONE(arg0, arg1)
-#define	MYSQL_CONNECTION_DONE_ENABLED() (0)
+#define	MYSQL_CONNECTION_DONE_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_COMMAND_START(arg0, arg1, arg2, arg3)
-#define	MYSQL_COMMAND_START_ENABLED() (0)
+#define	MYSQL_COMMAND_START_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_COMMAND_DONE(arg0)
-#define	MYSQL_COMMAND_DONE_ENABLED() (0)
+#define	MYSQL_COMMAND_DONE_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_QUERY_START(arg0, arg1, arg2, arg3, arg4)
-#define	MYSQL_QUERY_START_ENABLED() (0)
+#define	MYSQL_QUERY_START_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_QUERY_DONE(arg0)
-#define	MYSQL_QUERY_DONE_ENABLED() (0)
+#define	MYSQL_QUERY_DONE_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_QUERY_PARSE_START(arg0)
-#define	MYSQL_QUERY_PARSE_START_ENABLED() (0)
+#define	MYSQL_QUERY_PARSE_START_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_QUERY_PARSE_DONE(arg0)
-#define	MYSQL_QUERY_PARSE_DONE_ENABLED() (0)
+#define	MYSQL_QUERY_PARSE_DONE_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_QUERY_CACHE_HIT(arg0, arg1)
-#define	MYSQL_QUERY_CACHE_HIT_ENABLED() (0)
+#define	MYSQL_QUERY_CACHE_HIT_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_QUERY_CACHE_MISS(arg0)
-#define	MYSQL_QUERY_CACHE_MISS_ENABLED() (0)
+#define	MYSQL_QUERY_CACHE_MISS_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_QUERY_EXEC_START(arg0, arg1, arg2, arg3, arg4, arg5)
-#define	MYSQL_QUERY_EXEC_START_ENABLED() (0)
+#define	MYSQL_QUERY_EXEC_START_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_QUERY_EXEC_DONE(arg0)
-#define	MYSQL_QUERY_EXEC_DONE_ENABLED() (0)
+#define	MYSQL_QUERY_EXEC_DONE_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_INSERT_ROW_START(arg0, arg1)
-#define	MYSQL_INSERT_ROW_START_ENABLED() (0)
+#define	MYSQL_INSERT_ROW_START_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_INSERT_ROW_DONE(arg0)
-#define	MYSQL_INSERT_ROW_DONE_ENABLED() (0)
+#define	MYSQL_INSERT_ROW_DONE_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_UPDATE_ROW_START(arg0, arg1)
-#define	MYSQL_UPDATE_ROW_START_ENABLED() (0)
+#define	MYSQL_UPDATE_ROW_START_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_UPDATE_ROW_DONE(arg0)
-#define	MYSQL_UPDATE_ROW_DONE_ENABLED() (0)
+#define	MYSQL_UPDATE_ROW_DONE_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_DELETE_ROW_START(arg0, arg1)
-#define	MYSQL_DELETE_ROW_START_ENABLED() (0)
+#define	MYSQL_DELETE_ROW_START_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_DELETE_ROW_DONE(arg0)
-#define	MYSQL_DELETE_ROW_DONE_ENABLED() (0)
+#define	MYSQL_DELETE_ROW_DONE_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_READ_ROW_START(arg0, arg1, arg2)
-#define	MYSQL_READ_ROW_START_ENABLED() (0)
+#define	MYSQL_READ_ROW_START_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_READ_ROW_DONE(arg0)
-#define	MYSQL_READ_ROW_DONE_ENABLED() (0)
+#define	MYSQL_READ_ROW_DONE_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_INDEX_READ_ROW_START(arg0, arg1)
-#define	MYSQL_INDEX_READ_ROW_START_ENABLED() (0)
+#define	MYSQL_INDEX_READ_ROW_START_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_INDEX_READ_ROW_DONE(arg0)
-#define	MYSQL_INDEX_READ_ROW_DONE_ENABLED() (0)
+#define	MYSQL_INDEX_READ_ROW_DONE_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_HANDLER_RDLOCK_START(arg0, arg1)
-#define	MYSQL_HANDLER_RDLOCK_START_ENABLED() (0)
+#define	MYSQL_HANDLER_RDLOCK_START_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_HANDLER_WRLOCK_START(arg0, arg1)
-#define	MYSQL_HANDLER_WRLOCK_START_ENABLED() (0)
+#define	MYSQL_HANDLER_WRLOCK_START_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_HANDLER_UNLOCK_START(arg0, arg1)
-#define	MYSQL_HANDLER_UNLOCK_START_ENABLED() (0)
+#define	MYSQL_HANDLER_UNLOCK_START_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_HANDLER_RDLOCK_DONE(arg0)
-#define	MYSQL_HANDLER_RDLOCK_DONE_ENABLED() (0)
+#define	MYSQL_HANDLER_RDLOCK_DONE_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_HANDLER_WRLOCK_DONE(arg0)
-#define	MYSQL_HANDLER_WRLOCK_DONE_ENABLED() (0)
+#define	MYSQL_HANDLER_WRLOCK_DONE_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_HANDLER_UNLOCK_DONE(arg0)
-#define	MYSQL_HANDLER_UNLOCK_DONE_ENABLED() (0)
+#define	MYSQL_HANDLER_UNLOCK_DONE_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_FILESORT_START(arg0, arg1)
-#define	MYSQL_FILESORT_START_ENABLED() (0)
+#define	MYSQL_FILESORT_START_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_FILESORT_DONE(arg0, arg1)
-#define	MYSQL_FILESORT_DONE_ENABLED() (0)
+#define	MYSQL_FILESORT_DONE_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_SELECT_START(arg0)
-#define	MYSQL_SELECT_START_ENABLED() (0)
+#define	MYSQL_SELECT_START_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_SELECT_DONE(arg0, arg1)
-#define	MYSQL_SELECT_DONE_ENABLED() (0)
+#define	MYSQL_SELECT_DONE_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_INSERT_START(arg0)
-#define	MYSQL_INSERT_START_ENABLED() (0)
+#define	MYSQL_INSERT_START_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_INSERT_DONE(arg0, arg1)
-#define	MYSQL_INSERT_DONE_ENABLED() (0)
+#define	MYSQL_INSERT_DONE_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_INSERT_SELECT_START(arg0)
-#define	MYSQL_INSERT_SELECT_START_ENABLED() (0)
+#define	MYSQL_INSERT_SELECT_START_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_INSERT_SELECT_DONE(arg0, arg1)
-#define	MYSQL_INSERT_SELECT_DONE_ENABLED() (0)
+#define	MYSQL_INSERT_SELECT_DONE_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_UPDATE_START(arg0)
-#define	MYSQL_UPDATE_START_ENABLED() (0)
+#define	MYSQL_UPDATE_START_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_UPDATE_DONE(arg0, arg1, arg2)
-#define	MYSQL_UPDATE_DONE_ENABLED() (0)
+#define	MYSQL_UPDATE_DONE_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_MULTI_UPDATE_START(arg0)
-#define	MYSQL_MULTI_UPDATE_START_ENABLED() (0)
+#define	MYSQL_MULTI_UPDATE_START_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_MULTI_UPDATE_DONE(arg0, arg1, arg2)
-#define	MYSQL_MULTI_UPDATE_DONE_ENABLED() (0)
+#define	MYSQL_MULTI_UPDATE_DONE_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_DELETE_START(arg0)
-#define	MYSQL_DELETE_START_ENABLED() (0)
+#define	MYSQL_DELETE_START_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_DELETE_DONE(arg0, arg1)
-#define	MYSQL_DELETE_DONE_ENABLED() (0)
+#define	MYSQL_DELETE_DONE_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_MULTI_DELETE_START(arg0)
-#define	MYSQL_MULTI_DELETE_START_ENABLED() (0)
+#define	MYSQL_MULTI_DELETE_START_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_MULTI_DELETE_DONE(arg0, arg1)
-#define	MYSQL_MULTI_DELETE_DONE_ENABLED() (0)
+#define	MYSQL_MULTI_DELETE_DONE_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_NET_READ_START()
-#define	MYSQL_NET_READ_START_ENABLED() (0)
+#define	MYSQL_NET_READ_START_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_NET_READ_DONE(arg0, arg1)
-#define	MYSQL_NET_READ_DONE_ENABLED() (0)
+#define	MYSQL_NET_READ_DONE_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_NET_WRITE_START(arg0)
-#define	MYSQL_NET_WRITE_START_ENABLED() (0)
+#define	MYSQL_NET_WRITE_START_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_NET_WRITE_DONE(arg0)
-#define	MYSQL_NET_WRITE_DONE_ENABLED() (0)
+#define	MYSQL_NET_WRITE_DONE_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_KEYCACHE_READ_START(arg0, arg1, arg2, arg3)
-#define	MYSQL_KEYCACHE_READ_START_ENABLED() (0)
+#define	MYSQL_KEYCACHE_READ_START_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_KEYCACHE_READ_BLOCK(arg0)
-#define	MYSQL_KEYCACHE_READ_BLOCK_ENABLED() (0)
+#define	MYSQL_KEYCACHE_READ_BLOCK_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_KEYCACHE_READ_HIT()
-#define	MYSQL_KEYCACHE_READ_HIT_ENABLED() (0)
+#define	MYSQL_KEYCACHE_READ_HIT_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_KEYCACHE_READ_MISS()
-#define	MYSQL_KEYCACHE_READ_MISS_ENABLED() (0)
+#define	MYSQL_KEYCACHE_READ_MISS_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_KEYCACHE_READ_DONE(arg0, arg1)
-#define	MYSQL_KEYCACHE_READ_DONE_ENABLED() (0)
+#define	MYSQL_KEYCACHE_READ_DONE_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_KEYCACHE_WRITE_START(arg0, arg1, arg2, arg3)
-#define	MYSQL_KEYCACHE_WRITE_START_ENABLED() (0)
+#define	MYSQL_KEYCACHE_WRITE_START_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_KEYCACHE_WRITE_BLOCK(arg0)
-#define	MYSQL_KEYCACHE_WRITE_BLOCK_ENABLED() (0)
+#define	MYSQL_KEYCACHE_WRITE_BLOCK_ENABLED() (MYSQL_PROBES_FALSE)
 #define	MYSQL_KEYCACHE_WRITE_DONE(arg0, arg1)
-#define	MYSQL_KEYCACHE_WRITE_DONE_ENABLED() (0)
+#define	MYSQL_KEYCACHE_WRITE_DONE_ENABLED() (MYSQL_PROBES_FALSE)
 
 #ifdef  __cplusplus
 }
diff --git a/include/thread_pool_priv.h b/include/thread_pool_priv.h
index 84c7faa2e2b..9a9c65af6da 100644
--- a/include/thread_pool_priv.h
+++ b/include/thread_pool_priv.h
@@ -1,6 +1,6 @@
 #error don't use
 /*
-  Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 
   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
diff --git a/include/welcome_copyright_notice.h b/include/welcome_copyright_notice.h
index 9878ab1c07d..302f623e377 100644
--- a/include/welcome_copyright_notice.h
+++ b/include/welcome_copyright_notice.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, 2013, 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