Merge lp:~akopytov/percona-xtrabackup/rebase-2.2-on-mysql-5.6.14 into lp:percona-xtrabackup/2.2

[Alexey Kopytov]

    Implementation of
    https://blueprints.launchpad.net/percona-xtrabackup/+spec/rebase-2.2-on-mysql-5.6.14

    Merged MysQL 5.6.14.

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.2-param/62/

[Alexey Kopytov (akopytov)]

compact_compressed failures is most likely an upstream bug. Reported as bug #1255476 for further investigation.

review: Approve

[Laurynas Biveinis (laurynas-biveinis)]

I have not reviewed the whole diff (80000 lines; 13000 lines for
InnoDB) for any possible XtraBackup issues. I have reviewed a diff
of diffs between this MP diff and MySQL 5.6.11-5.6.14 diff only.

review: Approve

=== modified file 'BUILD/SETUP.sh'
--- BUILD/SETUP.sh	2013-02-26 05:45:28 +0000
+++ BUILD/SETUP.sh	2013-11-27 10:38:56 +0000
@@ -14,8 +14,8 @@
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA
 
 ########################################################################
 

=== modified file 'BUILD/compile-pentium'
--- BUILD/compile-pentium	2013-02-26 05:45:28 +0000
+++ BUILD/compile-pentium	2013-11-27 10:38:56 +0000
@@ -13,7 +13,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 path=`dirname $0`
 cmake $path/.. -DWITH_DEBUG=0

=== modified file 'BUILD/compile-pentium-debug-max-no-ndb'
--- BUILD/compile-pentium-debug-max-no-ndb	2013-02-26 05:45:28 +0000
+++ BUILD/compile-pentium-debug-max-no-ndb	2013-11-27 10:38:56 +0000
@@ -13,7 +13,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 path=`dirname $0`
 cmake $path/.. -DWITH_DEBUG=1 -DWITH_NDBCLUSTER=0

=== modified file 'BUILD/compile-pentium-gcov'
--- BUILD/compile-pentium-gcov	2012-03-23 09:29:43 +0000
+++ BUILD/compile-pentium-gcov	2013-11-27 10:38:56 +0000
@@ -13,7 +13,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 path=`dirname $0`
 cmake $path/.. -DWITH_DEBUG=1 -DENABLE_GCOV=ON 

=== modified file 'BUILD/compile-pentium-gprof'
--- BUILD/compile-pentium-gprof	2012-03-23 09:29:43 +0000
+++ BUILD/compile-pentium-gprof	2013-11-27 10:38:56 +0000
@@ -13,7 +13,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 path=`dirname $0`
 cmake $path/.. -DWITH_DEBUG=0 -DENABLE_GPROF=ON 

=== modified file 'BUILD/compile-pentium-valgrind-max-no-ndb'
--- BUILD/compile-pentium-valgrind-max-no-ndb	2012-03-23 09:29:43 +0000
+++ BUILD/compile-pentium-valgrind-max-no-ndb	2013-11-27 10:38:56 +0000
@@ -14,8 +14,8 @@
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA
 
 path=`dirname $0`
 cmake $path/.. -DWITH_DEBUG=1 -DWITH_VALGRIND=1 \

=== modified file 'BUILD/compile-pentium64'
--- BUILD/compile-pentium64	2012-03-23 09:29:43 +0000
+++ BUILD/compile-pentium64	2013-11-27 10:38:56 +0000
@@ -14,8 +14,8 @@
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA
 
 path=`dirname $0`
 cmake $path/.. -DCMAKE_CXX_FLAGS=-m64 -DCMAKE_C_FLAGS=-m64 

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-11-27 10:38:46 +0000
+++ CMakeLists.txt	2013-11-27 10:38:56 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2013, 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
@@ -335,8 +335,8 @@
 MYSQL_CHECK_ZLIB_WITH_COMPRESS()
 # Add bundled yassl/taocrypt or system openssl.
 MYSQL_CHECK_SSL()
-# Add readline or libedit.
-MYSQL_CHECK_READLINE()
+# Add system/bundled editline.
+MYSQL_CHECK_EDITLINE()
 # Add libevent
 MYSQL_CHECK_LIBEVENT()
 
@@ -388,6 +388,10 @@
   ADD_SUBDIRECTORY(unittest/examples)
   ADD_SUBDIRECTORY(unittest/mytap)
   ADD_SUBDIRECTORY(unittest/mytap/t)
+  # Visual Studio 11 needs this extra flag in order to compile gmock.
+  IF(WIN32)
+    ADD_DEFINITIONS( /D _VARIADIC_MAX=10 )
+  ENDIF()
   ADD_SUBDIRECTORY(unittest/gunit)
 ENDIF()
 

=== modified file 'Docs/mysql.info'
--- Docs/mysql.info	2007-11-02 11:29:13 +0000
+++ Docs/mysql.info	2013-11-27 10:38:56 +0000
@@ -1,4 +1,3 @@
 
 The MySQL Reference Manual is available in various formats on
-http://dev.mysql.com/doc; if you're interested in the DocBook XML
-sources go to http://svn.mysql.com.
+http://dev.mysql.com/doc.

=== modified file 'INSTALL-SOURCE'
--- INSTALL-SOURCE	2012-03-22 15:16:11 +0000
+++ INSTALL-SOURCE	2013-11-27 10:38:56 +0000
@@ -4,5 +4,4 @@
   http://dev.mysql.com/doc/refman/5.5/en/source-installation.html
 
 The MySQL Reference Manual is also available in various formats on
-http://dev.mysql.com/doc; if you're interested in the DocBook XML
-sources go to http://svn.mysql.com.
+http://dev.mysql.com/doc.

=== modified file 'INSTALL-WIN-SOURCE'
--- INSTALL-WIN-SOURCE	2012-03-22 15:16:11 +0000
+++ INSTALL-WIN-SOURCE	2013-11-27 10:38:56 +0000
@@ -5,5 +5,4 @@
   http://dev.mysql.com/doc/refman/5.5/en/source-installation.html
 
 The MySQL Reference Manual is also available in various formats on
-http://dev.mysql.com/doc; if you're interested in the DocBook XML
-sources go to http://svn.mysql.com.
+http://dev.mysql.com/doc.

=== modified file 'README'
--- README	2013-01-01 02:38:33 +0000
+++ README	2013-11-27 10:38:56 +0000
@@ -1,56 +1,56 @@
-MySQL Server 5.6
-
-This is a release of MySQL, a dual-license SQL database server.
-For the avoidance of doubt, this particular copy of the software 
-is released under the version 2 of the GNU General Public License. 
-MySQL is brought to you by Oracle.
-
-Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
-
-License information can be found in the COPYING file.
-
-MySQL FOSS License Exception
-We want free and open source software applications under certain
-licenses to be able to use specified GPL-licensed MySQL client
-libraries despite the fact that not all such FOSS licenses are
-compatible with version 2 of the GNU General Public License.  
-Therefore there are special exceptions to the terms and conditions 
-of the GPLv2 as applied to these client libraries, which are 
-identified and described in more detail in the FOSS License 
-Exception at 
-<http://www.mysql.com/about/legal/licensing/foss-exception.html>.
-
-This distribution may include materials developed by third
-parties. For license and attribution notices for these
-materials, please refer to the documentation that accompanies
-this distribution (see the "Licenses for Third-Party Components"
-appendix) or view the online documentation at 
-<http://dev.mysql.com/doc/>.
-
-GPLv2 Disclaimer
-For the avoidance of doubt, except that if any license choice
-other than GPL or LGPL is available it will apply instead, 
-Oracle elects to use only the General Public License version 2 
-(GPLv2) at this time for any software where a choice of GPL 
-license versions is made available with the language indicating 
-that GPLv2 or any later version may be used, or where a choice 
-of which version of the GPL is applied is otherwise unspecified.
-
-For further information about MySQL or additional documentation, 
-see:
-- The latest information about MySQL: http://www.mysql.com
-- The current MySQL documentation: http://dev.mysql.com/doc
-
-Some Reference Manual sections of special interest:
-- If you are migrating from an older version of MySQL, please 
-  read the "Upgrading from..." section.
-- To see what MySQL can do, take a look at the features section.
-- For installation instructions, see the Installing and Upgrading
-  chapter.
-- For the new features/bugfix history, see the MySQL Change History 
-  appendix.
-
-You can browse the MySQL Reference Manual online or download it 
-in any of several formats at the URL given earlier in this file.
-Source distributions include a local copy of the manual in the
-Docs directory.
+MySQL Server 5.6
+
+This is a release of MySQL, a dual-license SQL database server.
+For the avoidance of doubt, this particular copy of the software 
+is released under the version 2 of the GNU General Public License. 
+MySQL is brought to you by Oracle.
+
+Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+
+License information can be found in the COPYING file.
+
+MySQL FOSS License Exception
+We want free and open source software applications under certain
+licenses to be able to use specified GPL-licensed MySQL client
+libraries despite the fact that not all such FOSS licenses are
+compatible with version 2 of the GNU General Public License.  
+Therefore there are special exceptions to the terms and conditions 
+of the GPLv2 as applied to these client libraries, which are 
+identified and described in more detail in the FOSS License 
+Exception at 
+<http://www.mysql.com/about/legal/licensing/foss-exception.html>.
+
+This distribution may include materials developed by third
+parties. For license and attribution notices for these
+materials, please refer to the documentation that accompanies
+this distribution (see the "Licenses for Third-Party Components"
+appendix) or view the online documentation at 
+<http://dev.mysql.com/doc/>.
+
+GPLv2 Disclaimer
+For the avoidance of doubt, except that if any license choice
+other than GPL or LGPL is available it will apply instead, 
+Oracle elects to use only the General Public License version 2 
+(GPLv2) at this time for any software where a choice of GPL 
+license versions is made available with the language indicating 
+that GPLv2 or any later version may be used, or where a choice 
+of which version of the GPL is applied is otherwise unspecified.
+
+For further information about MySQL or additional documentation, 
+see:
+- The latest information about MySQL: http://www.mysql.com
+- The current MySQL documentation: http://dev.mysql.com/doc
+
+Some Reference Manual sections of special interest:
+- If you are migrating from an older version of MySQL, please 
+  read the "Upgrading from..." section.
+- To see what MySQL can do, take a look at the features section.
+- For installation instructions, see the Installing and Upgrading
+  chapter.
+- For the new features/bugfix history, see the MySQL Change History 
+  appendix.
+
+You can browse the MySQL Reference Manual online or download it 
+in any of several formats at the URL given earlier in this file.
+Source distributions include a local copy of the manual in the
+Docs directory.

=== modified file 'VERSION'
--- VERSION	2013-01-08 06:31:14 +0000
+++ VERSION	2013-11-27 10:38:56 +0000
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=6
-MYSQL_VERSION_PATCH=11
+MYSQL_VERSION_PATCH=14
 MYSQL_VERSION_EXTRA=

=== modified file 'client/CMakeLists.txt'
--- client/CMakeLists.txt	2012-09-05 08:29:51 +0000
+++ client/CMakeLists.txt	2013-11-27 10:38:56 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2013, 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
@@ -22,7 +22,7 @@
   ${CMAKE_SOURCE_DIR}/regex
   ${CMAKE_SOURCE_DIR}/sql
   ${CMAKE_SOURCE_DIR}/strings
-  ${READLINE_INCLUDE_DIR}
+  ${EDITLINE_INCLUDE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
 )
 
@@ -30,13 +30,11 @@
 ## We will need libeay32.dll and ssleay32.dll when running client executables.
 COPY_OPENSSL_DLLS(copy_openssl_client)
 
-
-ADD_DEFINITIONS(${READLINE_DEFINES})
 ADD_DEFINITIONS(${SSL_DEFINES})
 MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc)
 TARGET_LINK_LIBRARIES(mysql mysqlclient)
 IF(UNIX)
-  TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY})
+  TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
 ENDIF(UNIX)
 
 MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)

=== modified file 'client/completion_hash.h'
--- client/completion_hash.h	2013-02-26 05:45:28 +0000
+++ client/completion_hash.h	2013-11-27 10:38:56 +0000
@@ -13,8 +13,8 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA */
 
 #ifndef _HASH_
 #define _HASH_

=== modified file 'client/echo.c'
--- client/echo.c	2013-02-26 05:45:28 +0000
+++ client/echo.c	2013-11-27 10:38:56 +0000
@@ -12,7 +12,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 /*
   echo is a replacement for the "echo" command builtin to cmd.exe

=== modified file 'client/mysql.cc'
--- client/mysql.cc	2013-02-28 13:55:23 +0000
+++ client/mysql.cc	2013-11-27 10:38:56 +0000
@@ -97,7 +97,7 @@
 #if defined(__WIN__)
 #include <conio.h>
 #else
-#include <readline/readline.h>
+#include <readline.h>
 #define HAVE_READLINE
 #define USE_POPEN
 #endif
@@ -164,6 +164,7 @@
 static char *opt_bind_addr = NULL;
 static int connect_flag=CLIENT_INTERACTIVE;
 static my_bool opt_binary_mode= FALSE;
+static my_bool opt_connect_expired_password= FALSE;
 static char *current_host,*current_db,*current_user=0,*opt_password=0,
             *current_prompt=0, *delimiter_str= 0,
             *default_charset= (char*) MYSQL_AUTODETECT_CHARSET_NAME,
@@ -1769,6 +1770,11 @@
    &opt_server_public_key, &opt_server_public_key, 0,
    GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #endif
+  {"connect-expired-password", 0,
+   "Notify the server that this client is prepared to handle expired "
+   "password sandbox mode.",
+   &opt_connect_expired_password, &opt_connect_expired_password, 0, GET_BOOL,
+   NO_ARG, 0, 0, 0, 0, 0, 0},
   { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
 
@@ -2038,7 +2044,7 @@
   String buffer;
 #endif
 
-  char	*line;
+  char	*line= NULL;
   char	in_string=0;
   ulong line_number=0;
   bool ml_comment= 0;  
@@ -2124,6 +2130,13 @@
 #else
       if (opt_outfile)
 	fputs(prompt, OUTFILE);
+      /*
+        free the previous entered line.
+        Note: my_free() cannot be used here as the memory was allocated under
+        the readline/libedit library.
+      */
+      if (line)
+        free(line);
       line= readline(prompt);
 #endif /* defined(__WIN__) */
 
@@ -2183,6 +2196,14 @@
 #if defined(__WIN__)
   buffer.free();
   tmpbuf.free();
+#else
+  if (interactive)
+    /*
+      free the last entered line.
+      Note: my_free() cannot be used here as the memory was allocated under
+      the readline/libedit library.
+    */
+    free(line);
 #endif
 
   /*
@@ -2995,7 +3016,7 @@
   for (i= 0; i < histignore_patterns.elements; i++)
   {
     tmp= dynamic_element(&histignore_patterns, i, LEX_STRING *);
-    if ((rc= charset_info->coll->wildcmp(&my_charset_latin1,
+    if ((rc= charset_info->coll->wildcmp(charset_info,
                                          string, string + strlen(string),
                                          tmp->str, tmp->str + tmp->length,
                                          wild_prefix, wild_one,
@@ -3389,6 +3410,8 @@
   do
   {
     char *pos;
+    bool batchmode= (status.batch && verbose <= 1) ? TRUE : FALSE;
+    buff[0]= 0;
 
     if (quick)
     {
@@ -3441,9 +3464,10 @@
 	  print_tab_data(result);
 	else
 	  print_table_data(result);
-	sprintf(buff,"%ld %s in set",
-		(long) mysql_num_rows(result),
-		(long) mysql_num_rows(result) == 1 ? "row" : "rows");
+        if( !batchmode )
+	  sprintf(buff,"%lld %s in set",
+	          mysql_num_rows(result),
+		  mysql_num_rows(result) == 1LL ? "row" : "rows");
 	end_pager();
         if (mysql_errno(&mysql))
           error= put_error(&mysql);
@@ -3451,13 +3475,13 @@
     }
     else if (mysql_affected_rows(&mysql) == ~(ulonglong) 0)
       strmov(buff,"Query OK");
-    else
-      sprintf(buff,"Query OK, %ld %s affected",
-	      (long) mysql_affected_rows(&mysql),
-	      (long) mysql_affected_rows(&mysql) == 1 ? "row" : "rows");
+    else if( !batchmode )
+      sprintf(buff,"Query OK, %lld %s affected",
+	      mysql_affected_rows(&mysql),
+	      mysql_affected_rows(&mysql) == 1LL ? "row" : "rows");
 
     pos=strend(buff);
-    if ((warnings= mysql_warning_count(&mysql)))
+    if ((warnings= mysql_warning_count(&mysql)) && !batchmode)
     {
       *pos++= ',';
       *pos++= ' ';
@@ -4685,7 +4709,8 @@
 sql_real_connect(char *host,char *database,char *user,char *password,
 		 uint silent)
 {
-  my_bool interactive= status.batch ? FALSE : TRUE;
+  my_bool handle_expired= (opt_connect_expired_password || !status.batch) ?
+    TRUE : FALSE;
 
   if (connected)
   {
@@ -4777,7 +4802,7 @@
   mysql_options(&mysql, MYSQL_OPT_CONNECT_ATTR_RESET, 0);
   mysql_options4(&mysql, MYSQL_OPT_CONNECT_ATTR_ADD, 
                  "program_name", "mysql");
-  mysql_options(&mysql, MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS, &interactive);
+  mysql_options(&mysql, MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS, &handle_expired);
 
   if (!mysql_real_connect(&mysql, host, user, password,
                           database, opt_mysql_port, opt_mysql_unix_port,

=== modified file 'client/mysql_plugin.c'
--- client/mysql_plugin.c	2013-02-26 05:45:28 +0000
+++ client/mysql_plugin.c	2013-11-27 10:38:56 +0000
@@ -12,7 +12,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 */
 
 #include <m_string.h>

=== modified file 'client/mysql_upgrade.c'
--- client/mysql_upgrade.c	2013-02-13 13:11:37 +0000
+++ client/mysql_upgrade.c	2013-11-27 10:38:56 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2013, 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
@@ -40,7 +40,7 @@
 static char mysqlcheck_path[FN_REFLEN];
 
 static my_bool opt_force, opt_verbose, debug_info_flag, debug_check_flag,
-               opt_systables_only;
+               opt_systables_only, opt_version_check;
 static uint my_end_arg= 0;
 static char *opt_user= (char*)"root";
 
@@ -129,6 +129,12 @@
    "Base name of shared memory.", 0,
    0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #endif
+  {"version-check", 'k', "Run this program only if its \'server version\' "
+   "matches the version of the server to which it's connecting, (enabled by "
+   "default); use --skip-version-check to avoid this check. Note: the \'server "
+   "version\' of the program is the version of the MySQL server with which it "
+   "was built/distributed.", &opt_version_check, &opt_version_check, 0,
+   GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
   {"socket", 'S', "The socket file to use for connection.",
    0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #include <sslopt-longopts.h>
@@ -286,6 +292,7 @@
             my_progname, optid == 'b' ? "basedir" : "datadir");
     /* FALLTHROUGH */
 
+  case 'k':                                     /* --version-check */
   case 'v': /* --verbose   */
   case 'f': /* --force     */
   case 's':                                     /* --upgrade-system-tables */
@@ -552,6 +559,8 @@
 static int extract_variable_from_show(DYNAMIC_STRING* ds, char* value)
 {
   char *value_start, *value_end;
+  size_t len;
+
   /*
     The query returns "datadir\t<datadir>\n", skip past
     the tab
@@ -564,7 +573,9 @@
   if ((value_end= strchr(value_start, '\n')) == NULL)
     return 1; /* Unexpected result */
 
-  strncpy(value, value_start, MY_MIN(FN_REFLEN, value_end - value_start));
+  len= (size_t) MY_MIN(FN_REFLEN, value_end-value_start);
+  strncpy(value, value_start, len);
+  value[len]= '\0';
   return 0;
 }
 
@@ -891,6 +902,55 @@
 };
 
 
+/* Convert the specified version string into the numeric format. */
+static ulong STDCALL calc_server_version(char *some_version)
+{
+  uint major, minor, version;
+  char *point= some_version, *end_point;
+  major=   (uint) strtoul(point, &end_point, 10);   point=end_point+1;
+  minor=   (uint) strtoul(point, &end_point, 10);   point=end_point+1;
+  version= (uint) strtoul(point, &end_point, 10);
+  return (ulong) major * 10000L + (ulong)(minor * 100 + version);
+}
+
+/**
+  Check if the server version matches with the server version mysql_upgrade
+  was compiled with.
+
+  @return 0 match successful
+          1 failed
+*/
+static int check_version_match(void)
+{
+  DYNAMIC_STRING ds_version;
+  char version_str[NAME_CHAR_LEN + 1];
+
+  if (init_dynamic_string(&ds_version, NULL, NAME_CHAR_LEN, NAME_CHAR_LEN))
+    die("Out of memory");
+
+  if (run_query("show variables like 'version'",
+                &ds_version, FALSE) ||
+      extract_variable_from_show(&ds_version, version_str))
+  {
+    dynstr_free(&ds_version);
+    return 1;                                   /* Query failed */
+  }
+
+  dynstr_free(&ds_version);
+
+  if (calc_server_version((char *) version_str) != MYSQL_VERSION_ID)
+  {
+    fprintf(stderr, "Error: Server version (%s) does not match with the "
+            "version of\nthe server (%s) with which this program was built/"
+            "distributed. You can\nuse --skip-version-check to skip this "
+            "check.\n", version_str, MYSQL_SERVER_VERSION);
+    return 1;
+  }
+  else
+    return 0;
+}
+
+
 int main(int argc, char **argv)
 {
   char self_name[FN_REFLEN];
@@ -957,6 +1017,9 @@
     die(NULL);
   }
 
+  if (opt_version_check && check_version_match())
+    die("Upgrade failed");
+
   /*
     Run "mysqlcheck" and "mysql_fix_privilege_tables.sql"
     First run mysqlcheck on the system database.

=== modified file 'client/mysqlbinlog.cc'
--- client/mysqlbinlog.cc	2013-02-11 15:52:40 +0000
+++ client/mysqlbinlog.cc	2013-11-27 10:38:56 +0000
@@ -187,6 +187,10 @@
             *opt_exclude_gtids_str= NULL;
 static my_bool opt_skip_gtids= 0;
 static bool filter_based_on_gtids= false;
+
+static bool in_transaction= false;
+static bool seen_gtids= false;
+
 static Exit_status dump_local_log_entries(PRINT_EVENT_INFO *print_event_info,
                                           const char* logname);
 static Exit_status dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info,
@@ -745,6 +749,60 @@
        filtered= filtered || opt_skip_gtids;
     }
     break;
+    /* Skip previous gtids if --skip-gtids is set. */
+    case PREVIOUS_GTIDS_LOG_EVENT:
+      filtered= opt_skip_gtids;
+    break;
+
+    /*
+      Transaction boundaries reset the global filtering flag.
+
+      Since in the relay log a transaction can span multiple
+      log files, we do not reset filter_based_on_gtids flag when
+      processing control events (they can appear in the middle
+      of a transaction). But then, if:
+
+        FILE1: ... GTID BEGIN QUERY QUERY COMMIT ROTATE
+        FILE2: FD BEGIN QUERY QUERY COMMIT
+
+      Events on the second file would not be outputted, even
+      though they should.
+    */
+    case XID_EVENT:
+      filtered= filter_based_on_gtids;
+      filter_based_on_gtids= false;
+    break;
+    case QUERY_EVENT:
+      filtered= filter_based_on_gtids;
+      if (((Query_log_event *)ev)->ends_group())
+        filter_based_on_gtids= false;
+    break;
+
+    /*
+      Never skip STOP, FD, ROTATE, IGNORABLE or INCIDENT events.
+      SLAVE_EVENT and START_EVENT_V3 are there for completion.
+
+      Although in the binlog transactions do not span multiple
+      log files, in the relay-log, that can happen. As such,
+      we need to explicitly state that we do not filter these
+      events, because there is a chance that they appear in the
+      middle of a filtered transaction, e.g.:
+
+         FILE1: ... GTID BEGIN QUERY QUERY ROTATE
+         FILE2: FD QUERY QUERY COMMIT GTID BEGIN ...
+
+      In this case, ROTATE and FD events should be processed and
+      outputted.
+    */
+    case START_EVENT_V3: /* for completion */
+    case SLAVE_EVENT: /* for completion */
+    case STOP_EVENT:
+    case FORMAT_DESCRIPTION_EVENT:
+    case ROTATE_EVENT:
+    case IGNORABLE_LOG_EVENT:
+    case INCIDENT_EVENT:
+      filtered= false;
+    break;
     default:
       filtered= filter_based_on_gtids;
     break;
@@ -842,7 +900,9 @@
       bool parent_query_skips=
           !((Query_log_event*) ev)->is_trans_keyword() &&
            shall_skip_database(((Query_log_event*) ev)->db);
-           
+      bool ends_group= ((Query_log_event*) ev)->ends_group();
+      bool starts_group= ((Query_log_event*) ev)->starts_group();
+
       for (uint i= 0; i < buff_ev.elements; i++) 
       {
         buff_event_info pop_event_array= *dynamic_element(&buff_ev, i, buff_event_info *);
@@ -865,12 +925,28 @@
           statements in the Query_log_event, we still need to handle DDL,
           which causes a commit itself.
         */
-        print_event_info->skipped_event_in_transaction= true;
+
+        if (seen_gtids && !in_transaction && !starts_group && !ends_group)
+        {
+          /*
+            For DDLs, print the COMMIT right away. 
+          */
+          fprintf(result_file, "COMMIT /* added by mysqlbinlog */%s\n", print_event_info->delimiter);
+          print_event_info->skipped_event_in_transaction= false;
+          in_transaction= false;
+        }
+        else
+          print_event_info->skipped_event_in_transaction= true;
         goto end;
       }
 
-      if (((Query_log_event*) ev)->ends_group())
+      if (ends_group)
+      {
+        in_transaction= false;
         print_event_info->skipped_event_in_transaction= false;
+      }
+      else if (starts_group)
+        in_transaction= true;
 
       ev->print(result_file, print_event_info);
       if (head->error == -1)
@@ -1113,9 +1189,13 @@
       bool skip_event= (ignored_map != NULL);
       /*
         end of statement check:
-           i) destroy/free ignored maps
-          ii) if skip event, flush cache now
-      */
+        i) destroy/free ignored maps
+        ii) if skip event
+              a) set the unflushed_events flag to false
+              b) since we are skipping the last event,
+                 append END-MARKER(') to body cache (if required)
+              c) flush cache now
+       */
       if (stmt_end)
       {
         /*
@@ -1134,11 +1214,22 @@
            event was not skipped).
         */
         if (skip_event)
+        {
+          // set the unflushed_events flag to false
+          print_event_info->have_unflushed_events= FALSE;
+
+          // append END-MARKER(') with delimiter
+          IO_CACHE *const body_cache= &print_event_info->body_cache;
+          if (my_b_tell(body_cache))
+            my_b_printf(body_cache, "'%s\n", print_event_info->delimiter);
+
+          // flush cache
           if ((copy_event_cache_to_file_and_reinit(&print_event_info->head_cache,
                                                    result_file, stop_never /* flush result_file */) ||
               copy_event_cache_to_file_and_reinit(&print_event_info->body_cache,
                                                   result_file, stop_never /* flush result_file */)))
             goto err;
+        }
       }
 
       /* skip the event check */
@@ -1188,8 +1279,10 @@
       }
       break;
     }
+    case ANONYMOUS_GTID_LOG_EVENT:
     case GTID_LOG_EVENT:
     {
+      seen_gtids= true;
       if (print_event_info->skipped_event_in_transaction == true)
         fprintf(result_file, "COMMIT /* added by mysqlbinlog */%s\n", print_event_info->delimiter);
       print_event_info->skipped_event_in_transaction= false;
@@ -1201,12 +1294,40 @@
     }
     case XID_EVENT:
     {
+      in_transaction= false;
       print_event_info->skipped_event_in_transaction= false;
       ev->print(result_file, print_event_info);
       if (head->error == -1)
         goto err;
       break;
     }
+    case ROTATE_EVENT:
+    {
+      Rotate_log_event *rev= (Rotate_log_event *) ev;
+      /* no transaction context, gtids seen and not a fake rotate */
+      if (seen_gtids)
+      {
+        /*   
+          Fake rotate events have 'when' set to zero. @c fake_rotate_event(...).
+        */
+        bool is_fake= (rev->when.tv_sec == 0);
+        if (!in_transaction && !is_fake)
+        {
+          /*
+            If processing multiple files, we must reset this flag,
+            since there may be no gtids on the next one.
+          */
+          seen_gtids= false;
+          fprintf(result_file, "SET @@SESSION.GTID_NEXT= 'AUTOMATIC' "
+                               "/* added by mysqlbinlog */ %s\n", 
+                               print_event_info->delimiter);
+        }
+      }
+      ev->print(result_file, print_event_info);
+      if (head->error == -1)
+        goto err;
+      break;
+    }
     case PREVIOUS_GTIDS_LOG_EVENT:
       if (one_database && !opt_skip_gtids)
         warning("The option --database has been used. It may filter "
@@ -2135,6 +2256,11 @@
             */
             continue;
           }
+          /*
+             Reset the value of '# at pos' field shown against first event of
+             next binlog file (fake rotate) picked by mysqlbinlog --to-last-log
+         */
+          old_off= start_position_mot;
           len= 1; // fake Rotate, so don't increment old_off
         }
       }
@@ -2843,3 +2969,4 @@
 #include "uuid.cc"
 #include "rpl_gtid_set.cc"
 #include "rpl_gtid_specification.cc"
+#include "rpl_tblmap.cc"

=== modified file 'client/mysqldump.c'
--- client/mysqldump.c	2013-02-26 05:45:28 +0000
+++ client/mysqldump.c	2013-11-27 10:38:56 +0000
@@ -12,7 +12,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 */
 
 /* mysqldump.c  - Dump a tables contents and format to an ASCII file
@@ -84,14 +84,6 @@
 #define IGNORE_DATA 0x01 /* don't dump data for this table */
 #define IGNORE_INSERT_DELAYED 0x02 /* table doesn't support INSERT DELAYED */
 
-/* general_log or slow_log tables under mysql database */
-static inline my_bool general_log_or_slow_log_tables(const char *db, 
-                                                     const char *table)
-{
-  return (strcmp(db, "mysql") == 0) &&
-         ((strcmp(table, "general_log") == 0) ||
-          (strcmp(table, "slow_log") == 0));
-}
 
 static void add_load_option(DYNAMIC_STRING *str, const char *option,
                              const char *option_value);
@@ -2457,6 +2449,15 @@
   DBUG_RETURN(0);
 }
 
+/* general_log or slow_log tables under mysql database */
+static inline my_bool general_log_or_slow_log_tables(const char *db,
+                                                     const char *table)
+{
+  return (!my_strcasecmp(charset_info, db, "mysql")) &&
+          (!my_strcasecmp(charset_info, table, "general_log") ||
+           !my_strcasecmp(charset_info, table, "slow_log"));
+}
+
 /*
   get_table_structure -- retrievs database structure, prints out corresponding
   CREATE statement and fills out insert_pat if the table is the type we will
@@ -4379,7 +4380,8 @@
   char table_buff[NAME_LEN*2+3];
   char hash_key[2*NAME_LEN+2];  /* "db.tablename" */
   char *afterdot;
-  int using_mysql_db= my_strcasecmp(&my_charset_latin1, database, "mysql");
+  my_bool general_log_table_exists= 0, slow_log_table_exists=0;
+  int using_mysql_db= !my_strcasecmp(charset_info, database, "mysql");
   DBUG_ENTER("dump_all_tables_in_db");
 
   afterdot= strmov(hash_key, database);
@@ -4390,22 +4392,6 @@
   if (opt_xml)
     print_xml_tag(md_result_file, "", "\n", "database", "name=", database, NullS);
 
-  if (strcmp(database, "mysql") == 0)
-  {
-    char table_type[NAME_LEN];
-    char ignore_flag;
-    uint num_fields;
-    num_fields= get_table_structure((char *) "general_log", 
-                                    database, table_type, &ignore_flag);
-    if (num_fields == 0)
-      verbose_msg("-- Warning: get_table_structure() failed with some internal "
-                  "error for 'general_log' table\n");
-    num_fields= get_table_structure((char *) "slow_log", 
-                                    database, table_type, &ignore_flag);
-    if (num_fields == 0)
-      verbose_msg("-- Warning: get_table_structure() failed with some internal "
-                  "error for 'slow_log' table\n");
-  }
   if (lock_tables)
   {
     DYNAMIC_STRING query;
@@ -4451,6 +4437,26 @@
         }
       }
     }
+    else
+    {
+      /*
+        If general_log and slow_log exists in the 'mysql' database,
+         we should dump the table structure. But we cannot
+         call get_table_structure() here as 'LOCK TABLES' query got executed
+         above on the session and that 'LOCK TABLES' query does not contain
+         'general_log' and 'slow_log' tables. (you cannot acquire lock
+         on log tables). Hence mark the existence of these log tables here and
+         after 'UNLOCK TABLES' query is executed on the session, get the table
+         structure from server and dump it in the file.
+      */
+      if (using_mysql_db)
+      {
+        if (!my_strcasecmp(charset_info, table, "general_log"))
+          general_log_table_exists= 1;
+        else if (!my_strcasecmp(charset_info, table, "slow_log"))
+          slow_log_table_exists= 1;
+      }
+    }
   }
   if (opt_events && mysql_get_server_version(mysql) >= 50106)
   {
@@ -4469,7 +4475,26 @@
   }
   if (lock_tables)
     (void) mysql_query_with_error_report(mysql, 0, "UNLOCK TABLES");
-  if (flush_privileges && using_mysql_db == 0)
+  if (using_mysql_db)
+  {
+    char table_type[NAME_LEN];
+    char ignore_flag;
+    if (general_log_table_exists)
+    {
+      if (!get_table_structure((char *) "general_log",
+                               database, table_type, &ignore_flag) )
+        verbose_msg("-- Warning: get_table_structure() failed with some internal "
+                    "error for 'general_log' table\n");
+    }
+    if (slow_log_table_exists)
+    {
+      if (!get_table_structure((char *) "slow_log",
+                               database, table_type, &ignore_flag) )
+        verbose_msg("-- Warning: get_table_structure() failed with some internal "
+                    "error for 'slow_log' table\n");
+    }
+  }
+  if (flush_privileges && using_mysql_db)
   {
     fprintf(md_result_file,"\n--\n-- Flush Grant Tables \n--\n");
     fprintf(md_result_file,"\n/*! FLUSH PRIVILEGES */;\n");
@@ -4841,7 +4866,7 @@
         if (row[1])
           fprintf(md_result_file, "MASTER_HOST='%s', ", row[1]);
         if (row[3])
-          fprintf(md_result_file, "MASTER_PORT='%s', ", row[3]);
+          fprintf(md_result_file, "MASTER_PORT=%s, ", row[3]);
       }
       fprintf(md_result_file,
               "MASTER_LOG_FILE='%s', MASTER_LOG_POS=%s;\n", row[9], row[21]);
@@ -5362,18 +5387,28 @@
   MYSQL_RES  *gtid_mode_res;
   MYSQL_ROW  gtid_mode_row;
   char       *gtid_mode_val= 0;
+  char buf[32], query[64];
 
   if (opt_set_gtid_purged_mode == SET_GTID_PURGED_OFF)
     return FALSE;  /* nothing to be done */
 
+  /*
+    Check if the server has the knowledge of GTIDs(pre mysql-5.6)
+    or if the gtid_mode is ON or OFF.
+  */
+  my_snprintf(query, sizeof(query), "SHOW VARIABLES LIKE %s",
+              quote_for_like("gtid_mode", buf));
 
-  /* check if gtid_mode is ON or OFF */
-  if (mysql_query_with_error_report(mysql_con, &gtid_mode_res,
-                                    "SELECT @@GTID_MODE"))
+  if (mysql_query_with_error_report(mysql_con, &gtid_mode_res, query))
     return TRUE;
 
   gtid_mode_row = mysql_fetch_row(gtid_mode_res);
-  gtid_mode_val = (char*)gtid_mode_row[0];
+
+  /*
+     gtid_mode_row is NULL for pre 5.6 versions. For versions >= 5.6,
+     get the gtid_mode value from the second column.
+  */
+  gtid_mode_val = gtid_mode_row ? (char*)gtid_mode_row[1] : NULL;
 
   if (gtid_mode_val && strcmp(gtid_mode_val, "OFF"))
   {

=== modified file 'client/mysqltest.cc'
--- client/mysqltest.cc	2013-02-12 10:38:59 +0000
+++ client/mysqltest.cc	2013-11-27 10:38:56 +0000
@@ -1583,6 +1583,7 @@
       else
         p++;
     }
+
     /* Output any chars that migh be left */
     dynstr_append_mem(ds, start, p-start);
   }
@@ -3407,8 +3408,12 @@
   /* Set default wild chars for wild_compare, is changed in embedded mode */
   set_wild_chars(1);
   
+  uint length;
+  /* Storing the length of the path to the file, so it can be reused */
+  length= ds_file_to_remove.length;
   for (i= 0; i < (uint) dir_info->number_off_files; i++)
   {
+    ds_file_to_remove.length= length;
     file= dir_info->dir_entry + i;
     /* Remove only regular files, i.e. no directories etc. */
     /* if (!MY_S_ISREG(file->mystat->st_mode)) */
@@ -3418,8 +3423,10 @@
     if (ds_wild.length &&
         wild_compare(file->name, ds_wild.str, 0))
       continue;
-    ds_file_to_remove.length= ds_directory.length + 1;
-    ds_file_to_remove.str[ds_directory.length + 1]= 0;
+    /* Not required as the var ds_file_to_remove.length already has the
+       length in canonnicalized form */
+    /* ds_file_to_remove.length= ds_directory.length + 1;
+    ds_file_to_remove.str[ds_directory.length + 1]= 0; */
     dynstr_append(&ds_file_to_remove, file->name);
     DBUG_PRINT("info", ("removing file: %s", ds_file_to_remove.str));
     error= my_delete(ds_file_to_remove.str, MYF(0)) != 0;

=== modified file 'client/sql_string.h'
--- client/sql_string.h	2012-10-23 06:38:31 +0000
+++ client/sql_string.h	2013-11-27 10:38:56 +0000
@@ -1,7 +1,7 @@
 #ifndef CLIENT_SQL_STRING_INCLUDED
 #define CLIENT_SQL_STRING_INCLUDED
 
-/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2013, 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
@@ -231,6 +231,7 @@
       DBUG_ASSERT(!s.uses_buffer_owned_by(this));
       free();
       Ptr=s.Ptr ; str_length=s.str_length ; Alloced_length=s.Alloced_length;
+      str_charset=s.str_charset;
       alloced=0;
     }
     return *this;

=== modified file 'cmake/build_configurations/compiler_options.cmake'
--- cmake/build_configurations/compiler_options.cmake	2012-04-02 14:31:07 +0000
+++ cmake/build_configurations/compiler_options.cmake	2013-11-27 10:38:56 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 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
@@ -11,7 +11,7 @@
 # 
 # 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  02111-1307  USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 IF(SIZEOF_VOIDP EQUAL 4)
   SET(32BIT 1)

=== modified file 'cmake/build_configurations/feature_set.cmake'
--- cmake/build_configurations/feature_set.cmake	2012-03-21 14:30:53 +0000
+++ cmake/build_configurations/feature_set.cmake	2013-11-27 10:38:56 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 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
@@ -11,7 +11,7 @@
 # 
 # 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  02111-1307  USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 SET(FEATURE_SET "community" CACHE STRING 
 " Selection of features. Options are

=== modified file 'cmake/build_configurations/mysql_release.cmake'
--- cmake/build_configurations/mysql_release.cmake	2013-02-26 05:45:28 +0000
+++ cmake/build_configurations/mysql_release.cmake	2013-11-27 10:38:56 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, 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
@@ -33,7 +33,6 @@
 
 IF(UNIX)
   SET(WITH_EXTRA_CHARSETS all CACHE STRING "")
-  OPTION(WITH_LIBEDIT  "" ON)
 
   OPTION(WITH_PIC "" ON) # Why?
 

=== modified file 'cmake/dtrace.cmake'
--- cmake/dtrace.cmake	2013-02-14 10:33:04 +0000
+++ cmake/dtrace.cmake	2013-11-27 10:38:56 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2013, 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
@@ -157,7 +157,7 @@
   FOREACH(lib ${libs})
     GET_TARGET_PROPERTY(libtype ${lib} TYPE)
     IF(libtype MATCHES STATIC_LIBRARY)
-      SET(static_libs ${static_lics} ${lib})
+      SET(static_libs ${static_libs} ${lib})
     ENDIF()
   ENDFOREACH()
 

=== modified file 'cmake/install_macros.cmake'
--- cmake/install_macros.cmake	2013-02-26 05:45:28 +0000
+++ cmake/install_macros.cmake	2013-11-27 10:38:56 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2013, 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
@@ -111,28 +111,28 @@
 ENDFUNCTION()
 
 # Install symbolic link to CMake target. 
-# the link is created in the same directory as target
-# and extension will be the same as for target file.
-MACRO(INSTALL_SYMLINK linkname target destination component)
+# We do 'cd path; ln -s target_name link_name'
+# We also add an INSTALL target for "${path}/${link_name}"
+MACRO(INSTALL_SYMLINK target target_name link_name destination component)
 IF(UNIX)
   GET_TARGET_PROPERTY(location ${target} LOCATION)
   GET_FILENAME_COMPONENT(path ${location} PATH)
-  GET_FILENAME_COMPONENT(name ${location} NAME)
-  SET(output ${path}/${linkname})
+
+  SET(output ${path}/${link_name})
   ADD_CUSTOM_COMMAND(
     OUTPUT ${output}
     COMMAND ${CMAKE_COMMAND} ARGS -E remove -f ${output}
     COMMAND ${CMAKE_COMMAND} ARGS -E create_symlink 
-      ${name} 
-      ${linkname}
+      ${target_name} 
+      ${link_name}
     WORKING_DIRECTORY ${path}
     DEPENDS ${target}
     )
   
-  ADD_CUSTOM_TARGET(symlink_${linkname}
+  ADD_CUSTOM_TARGET(symlink_${link_name}
     ALL
     DEPENDS ${output})
-  SET_TARGET_PROPERTIES(symlink_${linkname} PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+  SET_TARGET_PROPERTIES(symlink_${link_name} PROPERTIES CLEAN_DIRECT_OUTPUT 1)
   IF(CMAKE_GENERATOR MATCHES "Xcode")
     # For Xcode, replace project config with install config
     STRING(REPLACE "${CMAKE_CFG_INTDIR}" 

=== modified file 'cmake/mysql_version.cmake'
--- cmake/mysql_version.cmake	2013-11-27 10:38:46 +0000
+++ cmake/mysql_version.cmake	2013-11-27 10:38:56 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2013, 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
@@ -18,6 +18,7 @@
 #
 
 SET(SHARED_LIB_MAJOR_VERSION "18")
+SET(SHARED_LIB_MINOR_VERSION "1")
 SET(PROTOCOL_VERSION "10")
 SET(DOT_FRM_VERSION "6")
 

=== modified file 'cmake/os/WindowsCache.cmake'
--- cmake/os/WindowsCache.cmake	2011-07-03 23:56:47 +0000
+++ cmake/os/WindowsCache.cmake	2013-11-27 10:38:56 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, 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
@@ -116,7 +116,7 @@
 SET(HAVE_LRAND48 CACHE  INTERNAL "")
 SET(HAVE_LSTAT CACHE  INTERNAL "")
 SET(HAVE_MADVISE CACHE  INTERNAL "")
-SET(HAVE_MALLINFO CACHE  INTERNAL "")
+SET(HAVE_MALLOC_INFO CACHE  INTERNAL "")
 SET(HAVE_MALLOC_H 1 CACHE  INTERNAL "")
 SET(HAVE_MEMALIGN CACHE  INTERNAL "")
 SET(HAVE_MEMCPY 1 CACHE  INTERNAL "")
@@ -145,6 +145,7 @@
 SET(HAVE_PREAD CACHE  INTERNAL "")
 SET(HAVE_PRINTSTACK CACHE  INTERNAL "")
 SET(HAVE_PTHREAD_ATTR_CREATE CACHE  INTERNAL "")
+SET(HAVE_PTHREAD_ATTR_GETGUARDSIZE CACHE INTERNAL "")
 SET(HAVE_PTHREAD_ATTR_GETSTACKSIZE CACHE  INTERNAL "")
 SET(HAVE_PTHREAD_ATTR_SETSCOPE CACHE  INTERNAL "")
 SET(HAVE_PTHREAD_ATTR_SETSTACKSIZE CACHE  INTERNAL "")

=== modified file 'cmake/package_name.cmake'
--- cmake/package_name.cmake	2013-11-27 10:38:46 +0000
+++ cmake/package_name.cmake	2013-11-27 10:38:56 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, 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
@@ -82,12 +82,20 @@
         MATH(EXPR VER  "${VER} -4")
         SET(DEFAULT_PLATFORM "osx10.${VER}")
       ENDIF()
-      LIST(LENGTH CMAKE_OSX_ARCHITECTURES LEN)
-      IF(LEN GREATER 1)
-        SET(DEFAULT_MACHINE "universal")
+
+      IF(CMAKE_OSX_ARCHITECTURES)
+        LIST(LENGTH CMAKE_OSX_ARCHITECTURES LEN)
+        IF(LEN GREATER 1)
+          SET(DEFAULT_MACHINE "universal")
+        ELSE()
+          SET(DEFAULT_MACHINE "${CMAKE_OSX_ARCHITECTURES}")
+        ENDIF()
       ELSE()
-        SET(DEFAULT_MACHINE "${CMAKE_OSX_ARCHITECTURES}")
+        IF(64BIT)
+          SET(DEFAULT_MACHINE "x86_64")
+        ENDIF()
       ENDIF()
+
       IF(DEFAULT_MACHINE MATCHES "i386")
         SET(DEFAULT_MACHINE "x86")
       ENDIF()

=== modified file 'cmake/readline.cmake'
--- cmake/readline.cmake	2013-02-26 05:45:28 +0000
+++ cmake/readline.cmake	2013-11-27 10:38:56 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2013, 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
@@ -13,6 +13,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
 
+# cmake -DWITH_EDITLINE=system|bundled
+# bundled is the default
+
 MACRO (MYSQL_CHECK_MULTIBYTE)
   CHECK_INCLUDE_FILE(wctype.h HAVE_WCTYPE_H)
   CHECK_INCLUDE_FILE(wchar.h HAVE_WCHAR_H)
@@ -117,85 +120,93 @@
  ENDIF()
 ENDMACRO()
 
-MACRO (MYSQL_USE_BUNDLED_LIBEDIT)
+MACRO (MYSQL_USE_BUNDLED_EDITLINE)
   SET(USE_LIBEDIT_INTERFACE 1)
   SET(HAVE_HIST_ENTRY 1)
-  SET(READLINE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/cmd-line-utils/libedit)
-  SET(READLINE_LIBRARY edit)
+  SET(EDITLINE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/cmd-line-utils/libedit/editline)
+  SET(EDITLINE_LIBRARY edit)
   FIND_CURSES()
   ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/cmd-line-utils/libedit)
 ENDMACRO()
 
-MACRO (FIND_SYSTEM_LIBEDIT name)
-  
-  FIND_PATH(${name}_INCLUDE_DIR readline/readline.h ) 
-  FIND_LIBRARY(${name}_LIBRARY NAMES ${name})
-  MARK_AS_ADVANCED(${name}_INCLUDE_DIR  ${name}_LIBRARY)
+MACRO (FIND_SYSTEM_EDITLINE)
+  FIND_PATH(FOUND_EDITLINE_READLINE
+    NAMES editline/readline.h
+  )
+  IF(FOUND_EDITLINE_READLINE)
+    SET(EDITLINE_INCLUDE_DIR "${FOUND_EDITLINE_READLINE}/editline")
+  ELSE()
+    # Different path on FreeBSD
+    FIND_PATH(FOUND_EDIT_READLINE_READLINE
+      NAMES edit/readline/readline.h
+    )
+    IF(FOUND_EDIT_READLINE_READLINE)
+      SET(EDITLINE_INCLUDE_DIR "${FOUND_EDIT_READLINE_READLINE}/edit/readline")
+    ENDIF()
+  ENDIF()
+
+  FIND_LIBRARY(EDITLINE_LIBRARY
+    NAMES
+    edit
+  )
+  MARK_AS_ADVANCED(EDITLINE_INCLUDE_DIR EDITLINE_LIBRARY)
+
+  MESSAGE(STATUS "EDITLINE_INCLUDE_DIR ${EDITLINE_INCLUDE_DIR}")
+  MESSAGE(STATUS "EDITLINE_LIBRARY ${EDITLINE_LIBRARY}")
 
   INCLUDE(CheckCXXSourceCompiles)
-  SET(CMAKE_REQUIRES_LIBRARIES ${${name}_LIBRARY})
-
-  IF(${name}_LIBRARY AND ${name}_INCLUDE_DIR)
-    SET(SYSTEM_READLINE_FOUND 1)
-    SET(CMAKE_REQUIRED_LIBRARIES ${${name}_LIBRARY})
+  IF(EDITLINE_LIBRARY AND EDITLINE_INCLUDE_DIR)
+    SET(CMAKE_REQUIRED_INCLUDES ${EDITLINE_INCLUDE_DIR})
+    SET(CMAKE_REQUIRED_LIBRARIES ${EDITLINE_LIBRARY})
     CHECK_CXX_SOURCE_COMPILES("
     #include <stdio.h>
-    #include <readline/readline.h> 
+    #include <readline.h>
     int main(int argc, char **argv)
     {
        HIST_ENTRY entry;
        return 0;
     }"
-    ${name}_HAVE_HIST_ENTRY)
-    
+    EDITLINE_HAVE_HIST_ENTRY)
+
     CHECK_CXX_SOURCE_COMPILES("
     #include <stdio.h>
-    #include <readline/readline.h>
+    #include <readline.h>
     int main(int argc, char **argv)
     {
-      char res= *(*rl_completion_entry_function)(0,0);
+      typedef int MYFunction(const char*, int);
+      MYFunction* myf= rl_completion_entry_function;
+      int res= (myf)(NULL, 0);
       completion_matches(0,0);
+      return res;
     }"
-    ${name}_USE_LIBEDIT_INTERFACE)
+    EDITLINE_HAVE_COMPLETION)
 
-    CHECK_CXX_SOURCE_COMPILES("
-    #include <stdio.h>
-    #include <readline/readline.h>
-    int main(int argc, char **argv)
-    {
-      rl_completion_func_t *func1= (rl_completion_func_t*)0;
-      rl_compentry_func_t *func2= (rl_compentry_func_t*)0;
-    }"
-    ${name}_USE_NEW_READLINE_INTERFACE)
-  
-    IF(${name}_USE_LIBEDIT_INTERFACE  OR ${name}_USE_NEW_READLINE_INTERFACE)
-      SET(READLINE_LIBRARY ${${name}_LIBRARY})
-      SET(READLINE_INCLUDE_DIR ${${name}_INCLUDE_DIR})
-      SET(HAVE_HIST_ENTRY ${${name}_HAVE_HIST_ENTRY})
-      SET(USE_LIBEDIT_INTERFACE ${${name}_USE_LIBEDIT_INTERFACE})
-      SET(USE_NEW_READLINE_INTERFACE ${${name}_USE_NEW_READLINE_INTERFACE}) 
-      SET(READLINE_FOUND 1)
+    IF(EDITLINE_HAVE_COMPLETION)
+      SET(HAVE_HIST_ENTRY ${EDITLINE_HAVE_HIST_ENTRY})
+      SET(USE_LIBEDIT_INTERFACE 1)
+      SET(EDITLINE_FOUND 1)
     ENDIF()
   ENDIF()
 ENDMACRO()
 
 
-MACRO (MYSQL_CHECK_READLINE)
+IF (NOT WITH_EDITLINE AND NOT WIN32)
+  SET(WITH_EDITLINE "bundled" CACHE STRING "By default use bundled editline")
+ENDIF()
+
+MACRO (MYSQL_CHECK_EDITLINE)
   IF (NOT WIN32)
     MYSQL_CHECK_MULTIBYTE()
-    IF(NOT CYGWIN)	
-      SET(WITH_LIBEDIT  ON CACHE BOOL  "Use bundled libedit")
-      # Bundled libedit does not compile on cygwin, only readline
-    ENDIF()
 
-    IF(WITH_LIBEDIT) 
-     MYSQL_USE_BUNDLED_LIBEDIT()
+    IF(WITH_EDITLINE STREQUAL "bundled") 
+      MYSQL_USE_BUNDLED_EDITLINE()
+    ELSEIF(WITH_EDITLINE STREQUAL "system")
+      FIND_SYSTEM_EDITLINE()
+      IF(NOT EDITLINE_FOUND)
+        MESSAGE(FATAL_ERROR "Cannot find system editline libraries.") 
+      ENDIF()
     ELSE()
-      FIND_SYSTEM_LIBEDIT(edit)
-      IF(NOT_LIBEDIT_FOUND)
-        MESSAGE(FATAL_ERROR "Cannot find system libedit libraries.Use WITH_LIBEDIT") 
-      ENDIF()
+      MESSAGE(FATAL_ERROR "WITH_EDITLINE must be bundled or system")
     ENDIF()
   ENDIF(NOT WIN32)
 ENDMACRO()
-

=== renamed directory 'cmd-line-utils/libedit/readline' => 'cmd-line-utils/libedit/editline'
=== modified file 'cmd-line-utils/libedit/readline.c'
--- cmd-line-utils/libedit/readline.c	2012-01-12 13:03:44 +0000
+++ cmd-line-utils/libedit/readline.c	2013-11-27 10:38:56 +0000
@@ -51,7 +51,7 @@
 #else
 #include "np/vis.h"
 #endif
-#include "readline/readline.h"
+#include "editline/readline.h"
 #include "el.h"
 #include "fcns.h"		/* for EL_NUM_FCNS */
 #include "histedit.h"

=== modified file 'config.h.cmake'
--- config.h.cmake	2013-02-26 05:45:28 +0000
+++ config.h.cmake	2013-11-27 10:38:56 +0000
@@ -120,7 +120,6 @@
 /* Readline */
 #cmakedefine HAVE_HIST_ENTRY 1
 #cmakedefine USE_LIBEDIT_INTERFACE 1
-#cmakedefine USE_NEW_READLINE_INTERFACE 1
 
 #cmakedefine FIONREAD_IN_SYS_IOCTL 1
 #cmakedefine GWINSZ_IN_SYS_IOCTL 1
@@ -194,7 +193,7 @@
 #cmakedefine HAVE_DECL_MADVISE 1
 #cmakedefine HAVE_DECL_TGOTO 1
 #cmakedefine HAVE_DECL_MHA_MAPSIZE_VA
-#cmakedefine HAVE_MALLINFO 1
+#cmakedefine HAVE_MALLOC_INFO 1
 #cmakedefine HAVE_MEMCPY 1
 #cmakedefine HAVE_MEMMOVE 1
 #cmakedefine HAVE_MKSTEMP 1
@@ -212,6 +211,7 @@
 #cmakedefine HAVE_RDTSCLL 1
 #cmakedefine HAVE_READ_REAL_TIME 1
 #cmakedefine HAVE_PTHREAD_ATTR_CREATE 1
+#cmakedefine HAVE_PTHREAD_ATTR_GETGUARDSIZE 1
 #cmakedefine HAVE_PTHREAD_ATTR_GETSTACKSIZE 1
 #cmakedefine HAVE_PTHREAD_ATTR_SETPRIO 1
 #cmakedefine HAVE_PTHREAD_ATTR_SETSCHEDPARAM 1

=== modified file 'configure.cmake'
--- configure.cmake	2013-02-28 13:55:23 +0000
+++ configure.cmake	2013-11-27 10:38:56 +0000
@@ -441,7 +441,7 @@
 CHECK_FUNCTION_EXISTS (longjmp HAVE_LONGJMP)
 CHECK_FUNCTION_EXISTS (lstat HAVE_LSTAT)
 CHECK_FUNCTION_EXISTS (madvise HAVE_MADVISE)
-CHECK_FUNCTION_EXISTS (mallinfo HAVE_MALLINFO)
+CHECK_FUNCTION_EXISTS (malloc_info HAVE_MALLOC_INFO)
 CHECK_FUNCTION_EXISTS (memcpy HAVE_MEMCPY)
 CHECK_FUNCTION_EXISTS (memmove HAVE_MEMMOVE)
 CHECK_FUNCTION_EXISTS (mkstemp HAVE_MKSTEMP)
@@ -456,6 +456,7 @@
 CHECK_FUNCTION_EXISTS (posix_memalign HAVE_POSIX_MEMALIGN)
 CHECK_FUNCTION_EXISTS (pread HAVE_PREAD)
 CHECK_FUNCTION_EXISTS (pthread_attr_create HAVE_PTHREAD_ATTR_CREATE)
+CHECK_FUNCTION_EXISTS (pthread_attr_getguardsize HAVE_PTHREAD_ATTR_GETGUARDSIZE)
 CHECK_FUNCTION_EXISTS (pthread_attr_getstacksize HAVE_PTHREAD_ATTR_GETSTACKSIZE)
 CHECK_FUNCTION_EXISTS (pthread_attr_setscope HAVE_PTHREAD_ATTR_SETSCOPE)
 CHECK_FUNCTION_EXISTS (pthread_attr_setstacksize HAVE_PTHREAD_ATTR_SETSTACKSIZE)
@@ -695,6 +696,7 @@
 
 # check whether time_t is unsigned
 CHECK_C_SOURCE_COMPILES("
+#include <time.h>
 int main()
 {
   int array[(((time_t)-1) > 0) ? 1 : -1];

=== modified file 'dbug/dbug.c'
--- dbug/dbug.c	2012-11-06 11:30:07 +0000
+++ dbug/dbug.c	2013-11-27 10:38:56 +0000
@@ -79,12 +79,6 @@
  *
  */
 
-/*
-  We can't have SAFE_MUTEX defined here as this will cause recursion
-  in pthread_mutex_lock
-*/
-
-#undef SAFE_MUTEX
 #include <my_global.h>
 #include <m_string.h>
 #include <errno.h>
@@ -598,7 +592,7 @@
         if (!is_shared(stack, keywords))
           FreeList(stack->keywords);
         stack->keywords=NULL;
-        stack->flags &= ~DEBUG_ON;
+        stack->flags&= ~DEBUG_ON;
         break;
       }
       if (rel && is_shared(stack, keywords))
@@ -606,11 +600,29 @@
       if (sign < 0)
       {
         if (DEBUGGING)
+        {
           stack->keywords= ListDel(stack->keywords, control, end);
-      break;
-      }
-      stack->keywords= ListAdd(stack->keywords, control, end);
-      stack->flags |= DEBUG_ON;
+          /* Turn off DEBUG_ON if it is last keyword to be removed. */
+          if (stack->keywords == NULL)
+            stack->flags&= ~DEBUG_ON;
+        }
+        break;
+      }
+
+      /* Do not add keyword if debugging all is enabled. */
+      if (!(DEBUGGING && stack->keywords == NULL))
+      {
+        stack->keywords= ListAdd(stack->keywords, control, end);
+        stack->flags|= DEBUG_ON;
+      }
+
+      /* If debug all is enabled, make the keyword list empty. */
+      if (sign == 1 && control == end)
+      {
+        FreeList(stack->keywords);
+        stack->keywords= NULL;
+      }
+
       break;
     case 'D':
       stack->delay= atoi(control);
@@ -1035,7 +1047,7 @@
       } while (0)
 #define str_to_buf(S)    do {                   \
         char_to_buf(',');                       \
-        buf=strnmov(buf, (S), len+1);           \
+        buf=strnmov(buf, (S), end-buf);         \
         if (buf >= end) goto overflow;          \
       } while (0)
 #define list_to_buf(l, f)  do {                 \
@@ -1358,6 +1370,38 @@
 /*
  *  FUNCTION
  *
+ *    _db_enabled_    check if debug is enabled for the keyword used in
+ *    DBUG_PRINT
+ *
+ *  SYNOPSIS
+ *
+ *    int _db_enabled_();
+ *
+ *  DESCRIPTION
+ *
+ *    The function checks if the debug output is to be enabled for the keyword
+ *    specified in DBUG_PRINT macro. _db_doprnt_ will be called only if this
+ *    function evaluates to 1.
+ */
+
+int _db_enabled_()
+{
+  CODE_STATE *cs;
+
+  get_code_state_or_return 0;
+
+  if (! DEBUGGING)
+    return 0;
+
+  if (_db_keyword_(cs, cs->u_keyword, 0))
+    return 1;
+
+  return 0;
+}
+
+/*
+ *  FUNCTION
+ *
  *      _db_doprnt_    handle print of debug lines
  *
  *  SYNOPSIS
@@ -1368,11 +1412,9 @@
  *
  *  DESCRIPTION
  *
- *      When invoked via one of the DBUG macros, tests the current keyword
- *      set by calling _db_pargs_() to see if that macro has been selected
- *      for processing via the debugger control string, and if so, handles
- *      printing of the arguments via the format string.  The line number
- *      of the DBUG macro in the source is found in u_line.
+ *      This function handles the printing of the arguments via the format
+ *      string.  The line number of the DBUG macro in the source is found in
+ *      u_line.
  *
  *      Note that the format string SHOULD NOT include a terminating
  *      newline, this is supplied automatically.
@@ -1385,6 +1427,8 @@
 {
   va_list args;
   CODE_STATE *cs;
+  int save_errno;
+
   get_code_state_or_return;
 
   /* Dirty read, for DBUG_PRINT() performance. */
@@ -1394,21 +1438,19 @@
   va_start(args,format);
   read_lock_stack(cs);
 
-  if (_db_keyword_(cs, cs->u_keyword, 0))
-  {
-    int save_errno=errno;
-    if (!cs->locked)
-      pthread_mutex_lock(&THR_LOCK_dbug);
-    DoPrefix(cs, cs->u_line);
-    if (TRACING)
-      Indent(cs, cs->level + 1);
-    else
-      (void) fprintf(cs->stack->out_file, "%s: ", cs->func);
-    (void) fprintf(cs->stack->out_file, "%s: ", cs->u_keyword);
-    DbugVfprintf(cs->stack->out_file, format, args);
-    DbugFlush(cs);
-    errno=save_errno;
-  }
+  save_errno=errno;
+  if (!cs->locked)
+    pthread_mutex_lock(&THR_LOCK_dbug);
+  DoPrefix(cs, cs->u_line);
+  if (TRACING)
+    Indent(cs, cs->level + 1);
+  else
+    (void) fprintf(cs->stack->out_file, "%s: ", cs->func);
+  (void) fprintf(cs->stack->out_file, "%s: ", cs->u_keyword);
+  DbugVfprintf(cs->stack->out_file, format, args);
+  DbugFlush(cs);
+  errno=save_errno;
+
   unlock_stack(cs);
   va_end(args);
 }

=== modified file 'extra/charset2html.c'
--- extra/charset2html.c	2013-02-26 05:45:28 +0000
+++ extra/charset2html.c	2013-11-27 10:38:56 +0000
@@ -12,7 +12,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA 
  */
 
 /*

=== modified file 'extra/comp_err.c'
--- extra/comp_err.c	2013-02-26 05:45:28 +0000
+++ extra/comp_err.c	2013-11-27 10:38:56 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2013, 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
@@ -31,6 +31,7 @@
 #include <my_getopt.h>
 #include <assert.h>
 #include <my_dir.h>
+#include <mysql_version.h>
 
 #define MAX_ROWS  1000
 #define HEADER_LENGTH 32                /* Length of header in errmsg.sys */
@@ -182,6 +183,23 @@
       fprintf(stderr, "Failed to parse input file %s\n", TXTFILE);
       DBUG_RETURN(1);
     }
+#if MYSQL_VERSION_ID >= 50100 && MYSQL_VERSION_ID < 50500
+/* Number of error messages in 5.1 - do not change this number! */
+#define MYSQL_OLD_GA_ERROR_MESSAGE_COUNT 641
+#elif MYSQL_VERSION_ID >= 50500 && MYSQL_VERSION_ID < 50600
+/* Number of error messages in 5.5 - do not change this number! */
+#define MYSQL_OLD_GA_ERROR_MESSAGE_COUNT 728
+#endif
+#if MYSQL_OLD_GA_ERROR_MESSAGE_COUNT
+    if (row_count != MYSQL_OLD_GA_ERROR_MESSAGE_COUNT)
+    {
+      fprintf(stderr, "Can only add new error messages to latest GA. ");
+      fprintf(stderr, "Use ER_UNKNOWN_ERROR instead.\n");
+      fprintf(stderr, "Expected %u messages, found %u.\n",
+              MYSQL_OLD_GA_ERROR_MESSAGE_COUNT, row_count);
+      DBUG_RETURN(1);
+    }
+#endif
     if (lang_head == NULL || error_head == NULL)
     {
       fprintf(stderr, "Failed to parse input file %s\n", TXTFILE);

=== modified file 'extra/yassl/COPYING'
--- extra/yassl/COPYING	2006-08-01 18:20:46 +0000
+++ extra/yassl/COPYING	2013-11-27 10:38:56 +0000
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -305,7 +305,7 @@
 
     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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 
 Also add information on how to contact you by electronic and paper mail.

=== modified file 'extra/yassl/include/openssl/generate_prefix_files.pl'
--- extra/yassl/include/openssl/generate_prefix_files.pl	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/generate_prefix_files.pl	2013-11-27 10:38:56 +0000
@@ -13,7 +13,7 @@
 # 
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 #
 # This script generates defines for all functions

=== modified file 'extra/yassl/src/crypto_wrapper.cpp'
--- extra/yassl/src/crypto_wrapper.cpp	2013-02-26 05:45:28 +0000
+++ extra/yassl/src/crypto_wrapper.cpp	2013-11-27 10:38:56 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 /*  The crypto wrapper source implements the policies for the cipher
  *  components used by SSL.

=== modified file 'extra/yassl/src/make.bat'
--- extra/yassl/src/make.bat	2013-02-26 05:45:28 +0000
+++ extra/yassl/src/make.bat	2013-11-27 10:38:56 +0000
@@ -11,7 +11,7 @@
 REM 
 REM You should have received a copy of the GNU General Public License
 REM along with this program; if not, write to the Free Software
-REM Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 REM quick and dirty build file for testing different MSDEVs
 setlocal 

=== modified file 'extra/yassl/src/yassl_int.cpp'
--- extra/yassl/src/yassl_int.cpp	2013-02-26 05:45:28 +0000
+++ extra/yassl/src/yassl_int.cpp	2013-11-27 10:38:56 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 /* yaSSL internal source implements SSL supporting types not specified in the
  * draft along with type conversion functions.

=== modified file 'extra/yassl/taocrypt/COPYING'
--- extra/yassl/taocrypt/COPYING	2006-09-25 14:40:29 +0000
+++ extra/yassl/taocrypt/COPYING	2013-11-27 10:38:56 +0000
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -305,7 +305,7 @@
 
     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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 
 Also add information on how to contact you by electronic and paper mail.

=== modified file 'extra/yassl/taocrypt/benchmark/make.bat'
--- extra/yassl/taocrypt/benchmark/make.bat	2013-02-26 05:45:28 +0000
+++ extra/yassl/taocrypt/benchmark/make.bat	2013-11-27 10:38:56 +0000
@@ -11,7 +11,7 @@
 REM 
 REM You should have received a copy of the GNU General Public License
 REM along with this program; if not, write to the Free Software
-REM Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 REM quick and dirty build file for testing different MSDEVs
 setlocal 

=== modified file 'extra/yassl/taocrypt/src/algebra.cpp'
--- extra/yassl/taocrypt/src/algebra.cpp	2013-02-26 05:45:28 +0000
+++ extra/yassl/taocrypt/src/algebra.cpp	2013-11-27 10:38:56 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 /* based on Wei Dai's algebra.cpp from CryptoPP */
 #undef  NDEBUG

=== modified file 'extra/yassl/taocrypt/src/integer.cpp'
--- extra/yassl/taocrypt/src/integer.cpp	2013-02-26 05:45:28 +0000
+++ extra/yassl/taocrypt/src/integer.cpp	2013-11-27 10:38:56 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 /* based on Wei Dai's integer.cpp from CryptoPP */
 

=== modified file 'extra/yassl/taocrypt/src/make.bat'
--- extra/yassl/taocrypt/src/make.bat	2013-02-26 05:45:28 +0000
+++ extra/yassl/taocrypt/src/make.bat	2013-11-27 10:38:56 +0000
@@ -11,7 +11,7 @@
 REM 
 REM You should have received a copy of the GNU General Public License
 REM along with this program; if not, write to the Free Software
-REM Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 REM quick and dirty build file for testing different MSDEVs
 setlocal 

=== modified file 'extra/yassl/taocrypt/test/make.bat'
--- extra/yassl/taocrypt/test/make.bat	2013-02-26 05:45:28 +0000
+++ extra/yassl/taocrypt/test/make.bat	2013-11-27 10:38:56 +0000
@@ -11,7 +11,7 @@
 REM 
 REM You should have received a copy of the GNU General Public License
 REM along with this program; if not, write to the Free Software
-REM Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 REM quick and dirty build file for testing different MSDEVs
 setlocal 

=== modified file 'extra/yassl/testsuite/make.bat'
--- extra/yassl/testsuite/make.bat	2013-02-26 05:45:28 +0000
+++ extra/yassl/testsuite/make.bat	2013-11-27 10:38:56 +0000
@@ -11,7 +11,7 @@
 REM 
 REM You should have received a copy of the GNU General Public License
 REM along with this program; if not, write to the Free Software
-REM Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 REM quick and dirty build file for testing different MSDEVs
 setlocal 

=== modified file 'include/atomic/rwlock.h'
--- include/atomic/rwlock.h	2011-06-30 15:46:53 +0000
+++ include/atomic/rwlock.h	2013-11-27 10:38:56 +0000
@@ -1,8 +1,7 @@
 #ifndef ATOMIC_RWLOCK_INCLUDED
 #define ATOMIC_RWLOCK_INCLUDED
 
-/* Copyright (c) 2006 MySQL AB, 2009 Sun Microsystems, Inc.
-   Use is subject to license terms.
+/* Copyright (c) 2006, 2013 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
@@ -41,8 +40,6 @@
 
 typedef struct {pthread_mutex_t rw;} my_atomic_rwlock_t;
 
-#ifndef SAFE_MUTEX
-
 /*
   we're using read-write lock macros but map them to mutex locks, and they're
   faster. Still, having semantically rich API we can change the
@@ -55,37 +52,6 @@
 #define my_atomic_rwlock_rdunlock(name)    pthread_mutex_unlock(& (name)->rw)
 #define my_atomic_rwlock_wrunlock(name)    pthread_mutex_unlock(& (name)->rw)
 
-#else /* SAFE_MUTEX */
-
-/*
-  SAFE_MUTEX pollutes the compiling name space with macros
-  that alter pthread_mutex_t, pthread_mutex_init, etc.
-  Atomic operations should never use the safe mutex wrappers.
-  Unfortunately, there is no way to have both:
-  - safe mutex macros expanding pthread_mutex_lock to safe_mutex_lock
-  - my_atomic macros expanding to unmodified pthread_mutex_lock
-  inlined in the same compilation unit.
-  So, in case of SAFE_MUTEX, a function call is required.
-  Given that SAFE_MUTEX is a debugging facility,
-  this extra function call is not a performance concern for
-  production builds.
-*/
-C_MODE_START
-extern void plain_pthread_mutex_init(safe_mutex_t *);
-extern void plain_pthread_mutex_destroy(safe_mutex_t *);
-extern void plain_pthread_mutex_lock(safe_mutex_t *);
-extern void plain_pthread_mutex_unlock(safe_mutex_t *);
-C_MODE_END
-
-#define my_atomic_rwlock_destroy(name)     plain_pthread_mutex_destroy(&(name)->rw)
-#define my_atomic_rwlock_init(name)        plain_pthread_mutex_init(&(name)->rw)
-#define my_atomic_rwlock_rdlock(name)      plain_pthread_mutex_lock(&(name)->rw)
-#define my_atomic_rwlock_wrlock(name)      plain_pthread_mutex_lock(&(name)->rw)
-#define my_atomic_rwlock_rdunlock(name)    plain_pthread_mutex_unlock(&(name)->rw)
-#define my_atomic_rwlock_wrunlock(name)    plain_pthread_mutex_unlock(&(name)->rw)
-
-#endif /* SAFE_MUTEX */
-
 #define MY_ATOMIC_MODE "mutex"
 #ifndef MY_ATOMIC_MODE_RWLOCKS
 #define MY_ATOMIC_MODE_RWLOCKS 1

=== modified file 'include/big_endian.h'
--- include/big_endian.h	2012-02-01 08:31:03 +0000
+++ include/big_endian.h	2013-11-27 10:38:56 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 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
@@ -11,7 +11,7 @@
 
    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  02111-1307  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
 /*
   Data in big-endian format.

=== modified file 'include/byte_order_generic.h'
--- include/byte_order_generic.h	2012-02-01 08:31:03 +0000
+++ include/byte_order_generic.h	2013-11-27 10:38:56 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2001, 2013, 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
@@ -11,7 +11,7 @@
 
    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  02111-1307  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
 /*
   Endianness-independent definitions for architectures other

=== modified file 'include/byte_order_generic_x86.h'
--- include/byte_order_generic_x86.h	2012-02-01 08:31:03 +0000
+++ include/byte_order_generic_x86.h	2013-11-27 10:38:56 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2001, 2013, 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
@@ -11,7 +11,7 @@
 
    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  02111-1307  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
 /*
   Optimized function-like macros for the x86 architecture (_WIN32 included).

=== modified file 'include/byte_order_generic_x86_64.h'
--- include/byte_order_generic_x86_64.h	2012-02-01 08:31:03 +0000
+++ include/byte_order_generic_x86_64.h	2013-11-27 10:38:56 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2001, 2013, 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
@@ -11,7 +11,7 @@
 
    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  02111-1307  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
 /*
   Optimized function-like macros for the x86 architecture (_WIN32 included).

=== modified file 'include/little_endian.h'
--- include/little_endian.h	2012-02-01 08:31:03 +0000
+++ include/little_endian.h	2013-11-27 10:38:56 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 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
@@ -11,7 +11,7 @@
 
    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  02111-1307  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
 /*
   Data in little-endian format.

=== modified file 'include/my_base.h'
--- include/my_base.h	2013-02-26 05:45:28 +0000
+++ include/my_base.h	2013-11-27 10:38:56 +0000
@@ -479,7 +479,9 @@
 #define HA_ERR_TABLESPACE_EXISTS  184    /* The tablespace existed in storage engine */
 #define HA_ERR_TOO_MANY_FIELDS    185    /* Table has too many columns */
 #define HA_ERR_ROW_IN_WRONG_PARTITION 186 /* Row in wrong partition */
-#define HA_ERR_LAST               186    /* Copy of last error nr */
+#define HA_ERR_INNODB_READ_ONLY   187    /* InnoDB is in read only mode. */
+#define HA_ERR_FTS_EXCEED_RESULT_CACHE_LIMIT  188 /* FTS query exceeds result cache limit */
+#define HA_ERR_LAST               188    /* Copy of last error nr */
 
 /* Number of different errors */
 #define HA_ERR_ERRORS            (HA_ERR_LAST - HA_ERR_FIRST + 1)

=== modified file 'include/my_bitmap.h'
--- include/my_bitmap.h	2012-03-29 19:22:02 +0000
+++ include/my_bitmap.h	2013-11-27 10:38:56 +0000
@@ -12,7 +12,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 #ifndef _my_bitmap_h_
 #define _my_bitmap_h_

=== modified file 'include/my_compare.h'
--- include/my_compare.h	2011-03-29 12:56:34 +0000
+++ include/my_compare.h	2013-11-27 10:38:56 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 #ifndef _my_compare_h
 #define _my_compare_h

=== modified file 'include/my_dbug.h'
--- include/my_dbug.h	2013-02-26 05:45:28 +0000
+++ include/my_dbug.h	2013-11-27 10:38:56 +0000
@@ -39,7 +39,7 @@
 };
 
 struct  _db_code_state_;
-extern  my_bool _dbug_on_;
+extern  MYSQL_PLUGIN_IMPORT my_bool _dbug_on_;
 extern  my_bool _db_keyword_(struct _db_code_state_ *, const char *, int);
 extern  int _db_explain_(struct _db_code_state_ *cs, char *buf, size_t len);
 extern  int _db_explain_init_(char *buf, size_t len);
@@ -55,6 +55,7 @@
                        struct _db_stack_frame_ *_stack_frame_);
 extern  void _db_return_(uint _line_, struct _db_stack_frame_ *_stack_frame_);
 extern  void _db_pargs_(uint _line_,const char *keyword);
+extern  int _db_enabled_();
 extern  void _db_doprnt_(const char *format,...)
   ATTRIBUTE_FORMAT(printf, 1, 2);
 extern  void _db_dump_(uint _line_,const char *keyword,
@@ -80,7 +81,17 @@
 #define DBUG_EVALUATE_IF(keyword,a1,a2) \
         (_db_keyword_(0,(keyword), 1) ? (a1) : (a2))
 #define DBUG_PRINT(keyword,arglist) \
-        do {_db_pargs_(__LINE__,keyword); _db_doprnt_ arglist;} while(0)
+        do \
+        {  \
+          if (_dbug_on_) \
+          { \
+            _db_pargs_(__LINE__,keyword); \
+            if (_db_enabled_()) \
+            {  \
+              _db_doprnt_ arglist; \
+            } \
+          } \
+        } while(0)
 #define DBUG_PUSH(a1) _db_push_ (a1)
 #define DBUG_POP() _db_pop_ ()
 #define DBUG_SET(a1) _db_set_ (a1)

=== modified file 'include/my_default.h'
--- include/my_default.h	2012-06-09 13:16:21 +0000
+++ include/my_default.h	2013-11-27 10:38:56 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 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
@@ -11,7 +11,7 @@
 
    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  02111-1307  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
 #ifndef MY_DEFAULT_INCLUDED
 #define MY_DEFAULT_INCLUDED

=== modified file 'include/my_getopt.h'
--- include/my_getopt.h	2012-10-28 03:26:15 +0000
+++ include/my_getopt.h	2013-11-27 10:38:56 +0000
@@ -128,6 +128,9 @@
 my_bool getopt_compare_strings(const char *s, const char *t, uint length);
 ulonglong max_of_int_range(int var_type);
 
+ulonglong getopt_double2ulonglong(double);
+double getopt_ulonglong2double(ulonglong);
+
 C_MODE_END
 
 #endif /* _my_getopt_h */

=== modified file 'include/my_global.h'
--- include/my_global.h	2012-03-06 14:29:42 +0000
+++ include/my_global.h	2013-11-27 10:38:56 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2001, 2013, 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
@@ -47,10 +47,6 @@
 #define HAVE_ERRNO_AS_DEFINE
 #endif /* __CYGWIN__ */
 
-#if defined(__OpenBSD__) && (OpenBSD >= 200411)
-#define HAVE_ERRNO_AS_DEFINE
-#endif
-
 #if defined(i386) && !defined(__i386__)
 #define __i386__
 #endif
@@ -381,7 +377,7 @@
 #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
 
@@ -951,7 +947,7 @@
   TODO Convert these to use Bitmap class.
  */
 typedef ulonglong table_map;          /* Used for table bits in join */
-typedef ulong nesting_map;  /* Used for flags of nesting constructs */
+typedef ulonglong nesting_map;  /* Used for flags of nesting constructs */
 
 #if defined(__WIN__)
 #define socket_errno	WSAGetLastError()
@@ -1021,8 +1017,6 @@
 #define reg16 register
 #endif
 
-#include <my_dbug.h>
-
 /* Some helper macros */
 #define YESNO(X) ((X) ? "yes" : "no")
 
@@ -1190,6 +1184,8 @@
 #endif
 #endif
 
+#include <my_dbug.h>
+
 /* Defines that are unique to the embedded version of MySQL */
 
 #ifdef EMBEDDED_LIBRARY

=== modified file 'include/my_md5.h'
--- include/my_md5.h	2013-02-26 05:45:28 +0000
+++ include/my_md5.h	2013-11-27 10:38:56 +0000
@@ -14,7 +14,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 #include "m_string.h"
 

=== modified file 'include/my_pthread.h'
--- include/my_pthread.h	2013-02-26 05:45:28 +0000
+++ include/my_pthread.h	2013-11-27 10:38:56 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2013, 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
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 /* Defines to make different thread packages compatible */
 
@@ -798,6 +798,15 @@
 extern my_thread_id my_thread_dbug_id(void);
 extern int pthread_dummy(int);
 
+#ifndef HAVE_PTHREAD_ATTR_GETGUARDSIZE
+static inline int pthread_attr_getguardsize(pthread_attr_t *attr,
+                                            size_t *guardsize)
+{
+  *guardsize= 0;
+  return 0;
+}
+#endif
+
 /* All thread specific variables are in the following struct */
 
 #define THREAD_NAME_SIZE 10

=== modified file 'include/my_sys.h'
--- include/my_sys.h	2013-02-26 05:45:28 +0000
+++ include/my_sys.h	2013-11-27 10:38:56 +0000
@@ -234,13 +234,8 @@
 #define my_afree(PTR) my_free(PTR)
 #endif /* HAVE_ALLOCA */
 
-#ifndef errno				/* did we already get it? */
-#ifdef HAVE_ERRNO_AS_DEFINE
 #include <errno.h>			/* errno is a define */
-#else
-extern int errno;			/* declare errno */
-#endif
-#endif					/* #ifndef errno */
+
 extern char *home_dir;			/* Home directory for user */
 extern const char *my_progname;		/* program-name (printed in errors) */
 extern char curr_dir[];		/* Current directory for user */

=== modified file 'include/my_user.h'
--- include/my_user.h	2013-02-26 05:45:28 +0000
+++ include/my_user.h	2013-11-27 10:38:56 +0000
@@ -12,7 +12,7 @@
 
  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 /*
   This is a header for libraries containing functions used in both server and

=== modified file 'include/my_xml.h'
--- include/my_xml.h	2013-02-26 05:45:28 +0000
+++ include/my_xml.h	2013-11-27 10:38:56 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA  */
 
 
 #ifndef _my_xml_h

=== modified file 'include/mysql/innodb_priv.h'
--- include/mysql/innodb_priv.h	2010-11-22 14:08:51 +0000
+++ include/mysql/innodb_priv.h	2013-11-27 10:38:56 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 #ifndef INNODB_PRIV_INCLUDED
 #define INNODB_PRIV_INCLUDED

=== modified file 'include/mysql/plugin.h'
--- include/mysql/plugin.h	2013-02-26 05:45:28 +0000
+++ include/mysql/plugin.h	2013-11-27 10:38:56 +0000
@@ -169,6 +169,7 @@
 #define PLUGIN_VAR_STR          0x0005
 #define PLUGIN_VAR_ENUM         0x0006
 #define PLUGIN_VAR_SET          0x0007
+#define PLUGIN_VAR_DOUBLE       0x0008
 #define PLUGIN_VAR_UNSIGNED     0x0080
 #define PLUGIN_VAR_THDLOCAL     0x0100 /* Variable is per-connection */
 #define PLUGIN_VAR_READONLY     0x0200 /* Server variable is read only */
@@ -351,6 +352,11 @@
   PLUGIN_VAR_SET | ((opt) & PLUGIN_VAR_MASK), \
   #name, comment, check, update, &varname, def, typelib }
 
+#define MYSQL_SYSVAR_DOUBLE(name, varname, opt, comment, check, update, def, min, max, blk) \
+DECLARE_MYSQL_SYSVAR_SIMPLE(name, double) = { \
+  PLUGIN_VAR_DOUBLE | ((opt) & PLUGIN_VAR_MASK), \
+  #name, comment, check, update, &varname, def, min, max, blk }
+
 #define MYSQL_THDVAR_BOOL(name, opt, comment, check, update, def) \
 DECLARE_MYSQL_THDVAR_BASIC(name, char) = { \
   PLUGIN_VAR_BOOL | PLUGIN_VAR_THDLOCAL | ((opt) & PLUGIN_VAR_MASK), \
@@ -401,6 +407,11 @@
   PLUGIN_VAR_SET | PLUGIN_VAR_THDLOCAL | ((opt) & PLUGIN_VAR_MASK), \
   #name, comment, check, update, -1, def, NULL, typelib }
 
+#define MYSQL_THDVAR_DOUBLE(name, opt, comment, check, update, def, min, max, blk) \
+DECLARE_MYSQL_THDVAR_SIMPLE(name, double) = { \
+  PLUGIN_VAR_DOUBLE | PLUGIN_VAR_THDLOCAL | ((opt) & PLUGIN_VAR_MASK), \
+  #name, comment, check, update, -1, def, min, max, blk, NULL }
+
 /* accessor macros */
 
 #define SYSVAR(name) \

=== modified file 'include/mysql/plugin_audit.h'
--- include/mysql/plugin_audit.h	2011-07-07 09:45:10 +0000
+++ include/mysql/plugin_audit.h	2013-11-27 10:38:56 +0000
@@ -25,7 +25,7 @@
 
 #define MYSQL_AUDIT_CLASS_MASK_SIZE 1
 
-#define MYSQL_AUDIT_INTERFACE_VERSION 0x0300
+#define MYSQL_AUDIT_INTERFACE_VERSION 0x0301
 
 
 /*************************************************************************
@@ -59,6 +59,10 @@
   struct charset_info_st *general_charset;
   unsigned long long general_time;
   unsigned long long general_rows;
+  MYSQL_LEX_STRING general_host;
+  MYSQL_LEX_STRING general_sql_command;
+  MYSQL_LEX_STRING general_external_user;
+  MYSQL_LEX_STRING general_ip;
 };
 
 

=== modified file 'include/mysql/plugin_audit.h.pp'
--- include/mysql/plugin_audit.h.pp	2012-12-19 09:33:45 +0000
+++ include/mysql/plugin_audit.h.pp	2013-11-27 10:38:56 +0000
@@ -261,6 +261,10 @@
   struct charset_info_st *general_charset;
   unsigned long long general_time;
   unsigned long long general_rows;
+  MYSQL_LEX_STRING general_host;
+  MYSQL_LEX_STRING general_sql_command;
+  MYSQL_LEX_STRING general_external_user;
+  MYSQL_LEX_STRING general_ip;
 };
 struct mysql_event_connection
 {

=== modified file 'include/mysql_time.h'
--- include/mysql_time.h	2013-02-26 05:45:28 +0000
+++ include/mysql_time.h	2013-11-27 10:38:56 +0000
@@ -11,7 +11,7 @@
 
  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 #ifndef _mysql_time_h_
 #define _mysql_time_h_

=== modified file 'include/t_ctype.h'
--- include/t_ctype.h	2010-10-27 11:32:32 +0000
+++ include/t_ctype.h	2013-11-27 10:38:56 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 /*
   Copyright (C) 1998, 1999 by Pruet Boonma, all rights reserved.

=== modified file 'include/typelib.h'
--- include/typelib.h	2013-02-26 05:45:28 +0000
+++ include/typelib.h	2013-11-27 10:38:56 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 
 #ifndef _typelib_h

=== modified file 'libmysql/CMakeLists.txt'
--- libmysql/CMakeLists.txt	2013-11-27 10:38:46 +0000
+++ libmysql/CMakeLists.txt	2013-11-27 10:38:56 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2013, 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
@@ -131,6 +131,13 @@
 mysql_set_character_set
 mysql_get_character_set_info
 mysql_stmt_next_result
+my_init
+mysql_client_find_plugin
+mysql_client_register_plugin
+mysql_load_plugin
+mysql_load_plugin_v
+mysql_options4
+mysql_plugin_options
 
 CACHE INTERNAL "Functions exported by client API"
 
@@ -179,6 +186,12 @@
 IF(MSVC)
 ENDIF()
 
+MACRO(GET_TARGET_NAME target out_name)
+  GET_TARGET_PROPERTY(location ${target} LOCATION)
+  GET_FILENAME_COMPONENT(name ${location} NAME)
+  SET(${out_name} ${name})
+ENDMACRO()
+
 IF(UNIX)
   MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
     SET(DOT_VERSION ".${VERSION}")
@@ -204,10 +217,9 @@
     # libtool compatability
     IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
       SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
-    ELSEIF(CMAKE_SYSTEM_NAME MATCHES "HP-UX")
-      SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0")
     ELSE()
-      SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0.0")
+      SET(OS_SHARED_LIB_VERSION
+        "${SHARED_LIB_MAJOR_VERSION}.${SHARED_LIB_MINOR_VERSION}.0")
     ENDIF()
     # Name of shared library is mysqlclient on Unix
     SET_TARGET_PROPERTIES(libmysql PROPERTIES 

=== modified file 'libmysql/authentication_win/common.cc'
--- libmysql/authentication_win/common.cc	2011-09-21 11:01:41 +0000
+++ libmysql/authentication_win/common.cc	2013-11-27 10:38:56 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 #include "common.h"
 #include <sddl.h>   // for ConvertSidToStringSid()

=== modified file 'libmysql/authentication_win/common.h'
--- libmysql/authentication_win/common.h	2011-09-21 11:01:41 +0000
+++ libmysql/authentication_win/common.h	2013-11-27 10:38:56 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 #ifndef COMMON_H
 #define COMMON_H

=== modified file 'libmysql/authentication_win/handshake.cc'
--- libmysql/authentication_win/handshake.cc	2011-04-29 21:53:46 +0000
+++ libmysql/authentication_win/handshake.cc	2013-11-27 10:38:56 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2013, 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
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 #include "handshake.h"
 
@@ -280,10 +280,9 @@
 
 void Security_buffer::free(void)
 {
-  if (!m_allocated)
-    return;
-  if (!ptr())
-    return;
-  FreeContextBuffer(ptr());
-  m_allocated= false;
+  if (m_allocated && NULL != ptr())
+  {
+    FreeContextBuffer(ptr());
+    init(NULL, 0);
+  }
 }

=== modified file 'libmysql/authentication_win/handshake.h'
--- libmysql/authentication_win/handshake.h	2011-04-29 21:53:46 +0000
+++ libmysql/authentication_win/handshake.h	2013-11-27 10:38:56 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2013, 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
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 #ifndef HANDSHAKE_H
 #define HANDSHAKE_H
@@ -53,7 +53,12 @@
   }
 
   /// If @c false, no deallocation will be done in the destructor.
-  bool m_allocated;
+  const bool m_allocated;
+
+  // Copying/assignment is not supported and can lead to memory leaks
+  // So declaring copy constructor and assignment operator as private
+  Security_buffer( const Security_buffer& );
+  const Security_buffer& operator=( const Security_buffer& );
 
  public:
 
@@ -75,11 +80,6 @@
     return m_buf.cbBuffer;
   }
 
-  bool is_valid() const
-  {
-    return ptr() != NULL;
-  }
-
   const Blob as_blob() const
   {
     return Blob(ptr(), len());

=== modified file 'libmysql/authentication_win/handshake_client.cc'
--- libmysql/authentication_win/handshake_client.cc	2011-10-19 11:42:46 +0000
+++ libmysql/authentication_win/handshake_client.cc	2013-11-27 10:38:56 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 #include "handshake.h"
 

=== modified file 'libmysql/authentication_win/log_client.cc'
--- libmysql/authentication_win/log_client.cc	2011-09-21 11:01:41 +0000
+++ libmysql/authentication_win/log_client.cc	2013-11-27 10:38:56 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 #include <my_global.h>
 #include "common.h"

=== modified file 'libmysql/authentication_win/plugin_client.cc'
--- libmysql/authentication_win/plugin_client.cc	2011-06-03 13:17:35 +0000
+++ libmysql/authentication_win/plugin_client.cc	2013-11-27 10:38:56 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 #include <my_global.h>
 #include <mysql.h>

=== modified file 'libmysql/conf_to_src.c'
--- libmysql/conf_to_src.c	2013-02-26 05:45:28 +0000
+++ libmysql/conf_to_src.c	2013-11-27 10:38:56 +0000
@@ -14,7 +14,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 /* can't use -lmysys because this prog is used to create -lstrings */
 

=== modified file 'libmysql/libmysql.def'
--- libmysql/libmysql.def	2011-04-06 14:31:26 +0000
+++ libmysql/libmysql.def	2013-11-27 10:38:56 +0000
@@ -104,3 +104,10 @@
 	mysql_server_end
 	mysql_set_character_set
 	mysql_get_character_set_info
+	my_init
+	mysql_client_find_plugin
+	mysql_client_register_plugin
+	mysql_load_plugin
+	mysql_load_plugin_v
+	mysql_options4
+	mysql_plugin_options

=== modified file 'libmysqld/examples/CMakeLists.txt'
--- libmysqld/examples/CMakeLists.txt	2013-02-26 05:45:28 +0000
+++ libmysqld/examples/CMakeLists.txt	2013-11-27 10:38:56 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2013, 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
@@ -17,7 +17,7 @@
                     ${CMAKE_SOURCE_DIR}/libmysqld/include
                     ${CMAKE_SOURCE_DIR}/regex 
                     ${CMAKE_SOURCE_DIR}/tests
-                    ${READLINE_INCLUDE_DIR}                 
+                    ${EDITLINE_INCLUDE_DIR}                 
                     )
 
 
@@ -28,8 +28,7 @@
                ../../client/mysql.cc ../../client/readline.cc)
 TARGET_LINK_LIBRARIES(mysql_embedded mysqlserver)
 IF(UNIX)
-  ADD_DEFINITIONS(${READLINE_DEFINES})
-  TARGET_LINK_LIBRARIES(mysql_embedded ${READLINE_LIBRARY})
+  TARGET_LINK_LIBRARIES(mysql_embedded ${EDITLINE_LIBRARY})
   SET_TARGET_PROPERTIES(mysql_embedded PROPERTIES ENABLE_EXPORTS TRUE)
 ENDIF(UNIX)
 

=== modified file 'libmysqld/examples/test-run'
--- libmysqld/examples/test-run	2010-12-28 18:57:23 +0000
+++ libmysqld/examples/test-run	2013-11-27 10:38:56 +0000
@@ -13,7 +13,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 # This is slapped together as a quick way to run the tests and
 # is not meant for prime time.  Please hack at it and submit

=== modified file 'libmysqld/lib_sql.cc'
--- libmysqld/lib_sql.cc	2013-02-12 10:17:24 +0000
+++ libmysqld/lib_sql.cc	2013-11-27 10:38:56 +0000
@@ -511,6 +511,7 @@
   char ***argvp= NULL;
   int fake_argc= 1;
   char *fake_argv[2];
+  char **foo= &fake_argv[0];
   char fake_server[]= "server";
   char fake_embedded[]= "embedded";
   char *fake_groups[]= { fake_server, fake_embedded, NULL };
@@ -530,7 +531,6 @@
     fake_argv[0]= fake_name;
     fake_argv[1]= NULL;
 
-    char **foo= &fake_argv[0];
     argcp= &fake_argc;
     argvp= &foo;
   }
@@ -566,7 +566,8 @@
     return 1;
   }
 
-  adjust_related_options();
+  ulong requested_open_files_dummy;
+  adjust_related_options(&requested_open_files_dummy);
 
   if (init_common_variables())
   {
@@ -784,7 +785,8 @@
   thd_init_client_charset(thd, mysql->charset->number);
   thd->update_charset();
   Security_context *sctx= thd->security_ctx;
-  sctx->host_or_ip= sctx->host= (char*) my_localhost;
+  sctx->set_host(my_localhost);
+  sctx->host_or_ip= sctx->get_host()->ptr();
   strmake(sctx->priv_host, (char*) my_localhost,  MAX_HOSTNAME-1);
   strmake(sctx->priv_user, mysql->user,  USERNAME_LENGTH-1);
   sctx->user= my_strdup(mysql->user, MYF(0));
@@ -819,14 +821,14 @@
                  connect_attrs_len + 2);
   if (mysql->options.client_ip)
   {
-    sctx->host= my_strdup(mysql->options.client_ip, MYF(0));
-    sctx->ip= my_strdup(sctx->host, MYF(0));
+    sctx->set_host(my_strdup(mysql->options.client_ip, MYF(0)));
+    sctx->set_ip(my_strdup(sctx->get_host()->ptr(), MYF(0)));
   }
   else
-    sctx->host= (char*)my_localhost;
-  sctx->host_or_ip= sctx->host;
+    sctx->set_host((char*)my_localhost);
+  sctx->host_or_ip= sctx->host->ptr();
 
-  if (acl_check_host(sctx->host, sctx->ip))
+  if (acl_check_host(sctx->get_host()->ptr(), sctx->get_ip()->ptr()))
     goto err;
 
   /* construct a COM_CHANGE_USER packet */

=== modified file 'mysql-test/collections/default.daily'
--- mysql-test/collections/default.daily	2013-02-12 12:09:48 +0000
+++ mysql-test/collections/default.daily	2013-11-27 10:38:56 +0000
@@ -1,7 +1,8 @@
 # Default suites in modes  normal(which includes binlog format stmt/mixed/row, parts), embedded and ps-protocol
 # Adding "--big-test" option to the default suite, normal(which includes binlog format stmt/mixed/row, parts), embedded and ps-protocol
-perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=90 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=normal-debug-big  --vardir=var-normal-debug-big  --report-features --skip-test-list=collections/disabled-daily.list
-perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=60 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=embedded-debug-big  --vardir=var-embedded-debug-big  --embedded
+perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=90 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=normal-debug-big  --vardir=var-normal-debug-big  --report-features --skip-test-list=collections/disabled-daily.list --unit-tests
+# --debug-server is not used for embedded runs since debug build of embedded server is not available
+perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=60 --parallel=auto --experimental=collections/default.experimental --comment=embedded-big  --vardir=var-embedded-big  --embedded-server
 perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=60 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=ps-debug-big  --vardir=var-ps-debug-big  --ps-protocol --skip-test-list=collections/disabled-daily.list 
 # Run the suites that are not part of the default - funcs_2, stress, jp, nist
 perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60  --debug-server --parallel=auto --experimental=collections/default.experimental --comment=funcs2-debug-big  --vardir=var-funcs2-debug-big --suite=funcs_2
@@ -21,9 +22,9 @@
 # Additional GTID coverage (binlog suite with gtid_mode=ON)
 perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=binlog_gtid-debug --vardir=var-binlog_gtid-debug --suite=binlog --mysqld=--binlog-checksum=CRC32 --mysqld=--enforce-gtid-consistency --mysqld=--log-slave-updates --mysqld=--gtid-mode=on --skip-test-list=collections/disabled-gtid-on.list
 
-# Additional runs for innodb-page-size=4k and 8k
-perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=n_mix_4k_size --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --mysqld=--innodb-page-size=4k --skip-test=innodb_ignore_builtin
-perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=n_mix_8k_size --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --mysqld=--innodb-page-size=8k --skip-test=innodb_ignore_builtin
+# Run innodb suite including big-test with innodb-page-size=4k and 8k
+perl mysql-test-run.pl --timer --force --big-test --testcase-timeout=60 --debug-server --parallel=auto --comment=n_mix_4k_size --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-test-list=collections/disabled-daily.list --mysqld=--innodb-page-size=4k --skip-test=innodb_ignore_builtin --suite=innodb
+perl mysql-test-run.pl --timer --force --big-test --testcase-timeout=60 --debug-server --parallel=auto --comment=n_mix_8k_size --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-test-list=collections/disabled-daily.list --mysqld=--innodb-page-size=8k --skip-test=innodb_ignore_builtin --suite=innodb
 
 #Engine independent tests
 perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-rpl-binlog-row-tests-myisam-engine-debug --experimental=collections/default.experimental --vardir=var-binlog-row-eits-tests-myisam-engine-debug --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=myisam --do-test=rpl --mysqld=--binlog-format=row --skip-test-list=collections/disabled-daily.list

=== added file 'mysql-test/collections/default.daily-valgrind'
--- mysql-test/collections/default.daily-valgrind	1970-01-01 00:00:00 +0000
+++ mysql-test/collections/default.daily-valgrind	2013-11-27 10:38:56 +0000
@@ -0,0 +1,15 @@
+# Valgrind run of non default suites
+# Default suites are covered through per push  
+
+perl mysql-test-run.pl --force --timer --testcase-timeout=60  --debug-server --parallel=auto --experimental=collections/default.experimental --comment=funcs2-debug-big  --vardir=var-funcs2-debug-big --suite=funcs_2
+perl mysql-test-run.pl --force --timer  --debug-server --parallel=auto --experimental=collections/default.experimental --comment=stress-debug --vardir=var-stress-debug  --suite=stress
+perl mysql-test-run.pl --force --timer  --debug-server --parallel=auto --experimental=collections/default.experimental --comment=jp-debug --vardir=var-jp-debug --suite=jp
+perl mysql-test-run.pl --force --timer  --debug-server --parallel=auto --experimental=collections/default.experimental --comment=nist-debug  --vardir=var-nist-debug --suite=nist
+
+
+#Engine independent tests
+perl mysql-test-run.pl --timer --force  --testcase-timeout=60 --debug-server --parallel=auto  --comment=eits-tests-myisam-engine-debug-big --experimental=collections/default.experimental --vardir=var-stmt-eits-tests-myisam-engine-debug-big --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=myisam --mysqld=--default-tmp-storage-engine=myisam  --skip-test-list=collections/disabled-daily.list
+perl mysql-test-run.pl --timer --force  --testcase-timeout=60 --debug-server --parallel=auto --comment=eits-tests-innodb-engine-debug-big --experimental=collections/default.experimental --vardir=var-stmt-eits-tests-innodb-engine-debug-big --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --mysqld=--innodb --skip-test-list=collections/disabled-daily.list
+
+#Memcached tests
+perl mysql-test-run.pl --timer --force --debug-server --comment=memcached-debug --vardir=var-debug-memcached --experimental=collections/default.experimental --parallel=1 --retry=0 --suite=memcached  --skip-test-list=collections/disabled-daily.list

=== modified file 'mysql-test/collections/default.experimental'
--- mysql-test/collections/default.experimental	2013-02-09 01:18:29 +0000
+++ mysql-test/collections/default.experimental	2013-11-27 10:38:56 +0000
@@ -10,13 +10,14 @@
 
 main.index_merge_innodb                  # BUG#11754168 2012-05-08 jorgen Doing an attempt at reenabling tests disabled by bug. EXPLAIN's row estimates varies for innodb so marked experimental for a while
 
-innodb.innodb_monitor                    # Bug#12320827 2011-08-04 Occasional failure in PB2
+
+parts.partition_debug_innodb             # Bug#14150368 2013-03-07 anitha Failing very frequently on PB2
 
 rpl.rpl_delayed_slave                    # BUG#11764654 rpl_delayed_slave fails sporadically in pb
 rpl.rpl_innodb_bug28430                  # Bug#11754425
 rpl.rpl_show_slave_running               # BUG#12346048 2011-04-11 sven fails sporadically on pb2
 rpl.rpl_gtid_logs_without_rotate_or_stop_event @windows    # Bug#16207800 2013-02-09 anitha Fails very frequently on windows
 
-sys_vars.rpl_init_slave_func		 # Bug#12535301 2011-05-09 andrei sys_vars.rpl_init_slave_func mismatches in daily-5.5
-
+perfschema.socket_summary_by_instance_func  # bug#16274580
+innodb.innodb_bug14676111                   # bug#17026780  2013-07-08 anitha Originally made experimental due to bug#16371942 which is now fixed. Now fails with mismatch in CLUST_INDEX_SIZE
 

=== modified file 'mysql-test/collections/default.push'
--- mysql-test/collections/default.push	2013-01-29 11:21:54 +0000
+++ mysql-test/collections/default.push	2013-11-27 10:38:56 +0000
@@ -1,5 +1,5 @@
-perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=n_mix-debug --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list
+perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=n_mix-debug --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --unit-tests
 perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=rpl_binlog_ps_row-debug --vardir=var-rpl_binlog-ps_row --suite=rpl,binlog --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list
-perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=main_embedded-debug --vardir=var-main_emebbed  --suite=main --embedded --experimental=collections/default.experimental
-perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=innodb_4k_size-debug --vardir=var-innodb-4k --experimental=collections/default.experimental --suite=innodb --mysqld=--innodb-page-size=4k
-perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=rpl_binlog_n_mix_MTS-debug --vardir=var-mts-rpl-binlog-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl 
+perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=main_embedded-debug --vardir=var-main_emebbed  --suite=main --embedded --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list
+perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=innodb_4k_size-debug --vardir=var-innodb-4k --experimental=collections/default.experimental --suite=innodb --mysqld=--innodb-page-size=4k --skip-test-list=collections/disabled-per-push.list
+perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=rpl_binlog_n_mix_MTS-debug --vardir=var-mts-rpl-binlog-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl --skip-test-list=collections/disabled-per-push.list

=== added file 'mysql-test/collections/default.push-valgrind'
--- mysql-test/collections/default.push-valgrind	1970-01-01 00:00:00 +0000
+++ mysql-test/collections/default.push-valgrind	2013-11-27 10:38:56 +0000
@@ -0,0 +1,2 @@
+# Run all default suites
+perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=all_default_valgrind --vardir=var-all_default_valgrind --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list

=== modified file 'mysql-test/collections/default.release.in'
--- mysql-test/collections/default.release.in	2013-01-21 14:05:32 +0000
+++ mysql-test/collections/default.release.in	2013-11-27 10:38:56 +0000
@@ -15,4 +15,4 @@
 perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=embedded   --vardir=var-embedded                    --embedded-server --skip-rpl
 perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=nist       --vardir=var-nist       --suite=nist
 perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=nist+ps    --vardir=var-nist_ps    --suite=nist     --ps-protocol
-perl mysql-test-run.pl --timer --force --comment=memcached --vardir=var-memcached --experimental=collections/default.experimental --parallel=auto --retry=0 --suite=memcached --mysqld=--innodb-page-size=4k
+perl mysql-test-run.pl --timer --force --comment=memcached --vardir=var-memcached --experimental=collections/default.experimental --parallel=auto --retry=0 --suite=memcached 

=== modified file 'mysql-test/collections/default.weekly'
--- mysql-test/collections/default.weekly	2013-01-29 11:21:54 +0000
+++ mysql-test/collections/default.weekly	2013-11-27 10:38:56 +0000
@@ -11,9 +11,10 @@
 # Repeat daily run
 # big-test option for normal runs 
 # Default suites (in modes binlog format stmt/mixed/row, parts), embedded and ps-protocol
-perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=90 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=normal-debug-big  --vardir=var-normal-debug-big  --report-features --skip-test-list=collections/disabled-daily.list --mysqld=--innodb_autoextend_increment=64
-perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=60 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=embedded-debug-big  --vardir=var-embedded-debug-big  --embedded
-perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=90 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=ps-debug-big  --vardir=var-ps-debug-big  --ps-protocol --skip-test-list=collections/disabled-daily.list
+perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=90 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=normal-debug-big  --vardir=var-normal-debug-big  --report-features --skip-test-list=collections/disabled-weekly.list --mysqld=--innodb_autoextend_increment=64 --unit-tests
+# --debug-server is not used for embedded runs since debug build of embedded server is not available
+perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=60 --parallel=auto --experimental=collections/default.experimental --comment=embedded-big  --vardir=var-embedded-big  --embedded-server
+perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=90 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=ps-debug-big  --vardir=var-ps-debug-big  --ps-protocol --skip-test-list=collections/disabled-weekly.list
 
 # Run the suites that are not part of the default - funcs_2, stress, jp, nist
 perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=60 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=funcs2-debug  --vardir=var-funcs2-big  --suite=funcs_2-big
@@ -25,9 +26,9 @@
 
 # Additional  replication configurations
 perl mysql-test-run.pl --timer --force --big-test --testcase-timeout=60 --parallel=auto --comment=all_binlog_checksum-debug --experimental=collections/default.experimental --mysqld=--binlog-checksum=CRC32 --vardir=var-all_binlog_checksum-debug --suite=main,binlog,innodb,federated,rpl,sys_vars,perfschema --skip-test-list=collections/disabled-weekly.list
-perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=rpl_crash_safe_relay-debug --vardir=var-rpl_crash_safe_relay-debug --suite=rpl --mysqld=--relay-log-info-repository=TABLE --skip-test-list=collections/disabled-daily.list
-perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=rpl_crash_safe_master-debug --vardir=var-rpl_crash_safe_master-debug --suite=rpl --mysqld=--master-info-repository=TABLE --skip-test-list=collections/disabled-daily.list
-perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=rpl_binlog-debug-big --vardir=rpl_binlog-debug-big --suite=rpl --skip-test-list=collections/disabled-daily.list
+perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=rpl_crash_safe_relay-debug --vardir=var-rpl_crash_safe_relay-debug --suite=rpl --mysqld=--relay-log-info-repository=TABLE --skip-test-list=collections/disabled-weekly.list
+perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=rpl_crash_safe_master-debug --vardir=var-rpl_crash_safe_master-debug --suite=rpl --mysqld=--master-info-repository=TABLE --skip-test-list=collections/disabled-weekly.list
+perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=rpl_binlog-debug-big --vardir=rpl_binlog-debug-big --suite=rpl --skip-test-list=collections/disabled-weekly.list
 
 
 #Engine independent tests
@@ -41,25 +42,18 @@
 #Memcached tests
 perl mysql-test-run.pl --timer --force --debug-server --comment=memcached-debug --vardir=var-debug-memcached --experimental=collections/default.experimental --parallel=1 --retry=0 --suite=memcached  --skip-test-list=collections/disabled-weekly.list
 
-# Non debug runs of default suites in normal and embedded modes
-perl mysql-test-run.pl --force --debug-server --timer   --parallel=auto --experimental=collections/default.experimental --comment=normal-non-debug  --vardir=var-normal-non-debug --report-features --skip-test-list=collections/disabled-daily.list
-perl mysql-test-run.pl --force --debug-server --timer    --parallel=auto --experimental=collections/default.experimental --comment=embedded-non-debug  --vardir=var-embedded-non-debug  --embedded
+# Non debug runs of default suites in normal modes
+perl mysql-test-run.pl --force --timer   --parallel=auto --experimental=collections/default.experimental --comment=normal-non-debug  --vardir=var-normal-non-debug --report-features --skip-test-list=collections/disabled-weekly.list
 
 
 
 # Multi-Thread Slave
-perl mysql-test-run.pl --timer --force --big-test --testcase-timeout=60 --debug-server --parallel=auto --comment=MTS-debug-big --vardir=var-MTS-debug-big --suite=rpl  --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0
-
-# Run with 4K page size
-perl mysql-test-run.pl --debug-server --timer --force --parallel=auto --comment=n_mix_4k_size --vardir=var-n_mix_4k_size --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --mysqld=--innodb-page-size=4k --skip-test=innodb_ignore_builtin
-perl mysql-test-run.pl --debug-server --timer --force --parallel=auto --comment=rpl_binlog_ps_row_4k_size --vardir=var-rpl_binlog-ps_row --suite=rpl,binlog --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --mysqld=--innodb-page-size=4k --skip-test=innodb_ignore_builtin
-perl mysql-test-run.pl --debug-server  --timer --force --parallel=auto --comment=main_embedded_4k_size --vardir=var-main_emebbed  --suite=main --embedded --experimental=collections/default.experimental --mysqld=--innodb-page-size=4k --skip-test=innodb_ignore_builtin
-
-# Run with 8K page size
-perl mysql-test-run.pl --debug-server  --timer --force --parallel=auto --comment=n_mix_8k_size --vardir=var-n_mix_8k_size --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --mysqld=--innodb-page-size=8k --skip-test=innodb_ignore_builtin
-perl mysql-test-run.pl --debug-server --timer --force --parallel=auto --comment=rpl_binlog_ps_row_8k_size --vardir=var-rpl_binlog-ps_row --suite=rpl,binlog --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --mysqld=--innodb-page-size=8k --skip-test=innodb_ignore_builtin
-perl mysql-test-run.pl --debug-server --timer --force --parallel=auto --comment=main_embedded_8k_size --vardir=var-main_emebbed  --suite=main --embedded --experimental=collections/default.experimental --mysqld=--innodb-page-size=8k --skip-test=innodb_ignore_builtin
-
+perl mysql-test-run.pl --timer --force --big-test --testcase-timeout=60 --debug-server --parallel=auto --comment=MTS-debug-big --vardir=var-MTS-debug-big --suite=rpl  --experimental=collections/default.experimental --skip-test-list=collections/disabled-weekly.list --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0
+
+
+# Run innodb suite including big-test with innodb-page-size=4k and 8k
+perl mysql-test-run.pl --timer --force --big-test --testcase-timeout=60 --debug-server --parallel=auto --comment=n_mix_4k_size --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-test-list=collections/disabled-weekly.list --mysqld=--innodb-page-size=4k --skip-test=innodb_ignore_builtin --suite=innodb
+perl mysql-test-run.pl --timer --force --big-test --testcase-timeout=60 --debug-server --parallel=auto --comment=n_mix_8k_size --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-test-list=collections/disabled-weekly.list --mysqld=--innodb-page-size=8k --skip-test=innodb_ignore_builtin --suite=innodb
 
 # Additional run to test rpl HASH_SCAN & INDEX_SCAN
 perl mysql-test-run.pl --force --debug-server --timer --parallel=auto --experimental=collections/default.experimental --comment=binlog_rpl_row_hash_scan --vardir=var-binlog_rpl_row_hash_scan --mysqld=--binlog-format=row --suite=binlog,rpl --mysqld=--slave-rows-search-algorithms=HASH_SCAN,INDEX_SCAN --big-test --testcase-timeout=60

=== added file 'mysql-test/collections/default.weekly-valgrind'
--- mysql-test/collections/default.weekly-valgrind	1970-01-01 00:00:00 +0000
+++ mysql-test/collections/default.weekly-valgrind	2013-11-27 10:38:56 +0000
@@ -0,0 +1,17 @@
+# Run all default suites with big-test option 
+perl mysql-test-run.pl --timer --big-test --debug-server --force --parallel=auto --comment=all_default_valgrind --vardir=var-all_default_valgrind --experimental=collections/default.experimental 
+
+
+# Run all non default suites with big-test
+perl mysql-test-run.pl --force --timer  --big-test --testcase-timeout=60 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=funcs2-debug  --vardir=var-funcs2-big  --suite=funcs_2
+perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=stress-debug-big --vardir=var-stress-debug-big  --suite=stress
+perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=jp-debug-big --vardir=var-jp-debug-big --suite=jp
+perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=nist-debug-big  --vardir=var-nist-debug-big --suite=nist
+
+
+#Engine independent tests
+perl mysql-test-run.pl --timer --force --big-test --testcase-timeout=60 --debug-server --parallel=auto  --comment=eits-tests-myisam-engine-debug-big --experimental=collections/default.experimental --vardir=var-stmt-eits-tests-myisam-engine-debug-big --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=myisam --mysqld=--default-tmp-storage-engine=myisam  --skip-test-list=collections/disabled-weekly.list
+perl mysql-test-run.pl --timer --force --big-test --testcase-timeout=60 --debug-server --parallel=auto --comment=eits-tests-innodb-engine-debug-big --experimental=collections/default.experimental --vardir=var-stmt-eits-tests-innodb-engine-debug-big --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --mysqld=--innodb --skip-test-list=collections/disabled-weekly.list
+
+#Memcached tests
+perl mysql-test-run.pl --timer --force --big-test --debug-server --comment=memcached-debug --vardir=var-debug-memcached --experimental=collections/default.experimental --parallel=1 --retry=0 --suite=memcached  --skip-test-list=collections/disabled-weekly.list

=== modified file 'mysql-test/extra/binlog_tests/ctype_ucs_binlog.test'
--- mysql-test/extra/binlog_tests/ctype_ucs_binlog.test	2012-01-06 20:00:48 +0000
+++ mysql-test/extra/binlog_tests/ctype_ucs_binlog.test	2013-11-27 10:38:56 +0000
@@ -17,7 +17,7 @@
 flush logs;
 let $MYSQLD_DATADIR= `select @@datadir`;
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ /file_id=[0-9]+/file_id=#/ /block_len=[0-9]+/block_len=#/ /Server ver:.*$/SERVER_VERSION, BINLOG_VERSION/ /SET @@SESSION.GTID_NEXT= '.*'/SET @@SESSION.GTID_NEXT= 'GTID';/
+--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ /file_id=[0-9]+/file_id=#/ /block_len=[0-9]+/block_len=#/ /Server ver:.*$/SERVER_VERSION, BINLOG_VERSION/ /SET @@SESSION.GTID_NEXT= '.*'/SET @@SESSION.GTID_NEXT= 'GTID'/
 --exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000001 
 drop table t2;
 

=== modified file 'mysql-test/extra/binlog_tests/mysqlbinlog_row_engine.inc'
--- mysql-test/extra/binlog_tests/mysqlbinlog_row_engine.inc	2013-02-15 15:57:07 +0000
+++ mysql-test/extra/binlog_tests/mysqlbinlog_row_engine.inc	2013-11-27 10:38:56 +0000
@@ -1650,7 +1650,7 @@
 --echo #
 let $MYSQLD_DATADIR= `select @@datadir`;
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
---replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /server v [^ ]*/server v #.##.##/ /(@[0-9]*=[0-9-]*[.][0-9]{1,3})[0-9e+-]*[^ ]*[ ]*(.*(FLOAT|DOUBLE).*[*].)/\1... \2/ /SET @@SESSION.GTID_NEXT=.*$/SET @@SESSION.GTID_NEXT= 'GTID';/ /([0-9A-F\-]{36})\:[0-9]+\-[0-9]+/GTID:#-#/ /GROUPS: .*:(.*,.*)/GROUPS: GTID:(X,X)/ /CRC32 0x[0-9a-f]{8}/CRC32 #/
+--replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /server v [^ ]*/server v #.##.##/ /(@[0-9]*=[0-9-]*[.][0-9]{1,3})[0-9e+-]*[^ ]*[ ]*(.*(FLOAT|DOUBLE).*[*].)/\1... \2/ /SET @@SESSION.GTID_NEXT= '.*'/SET @@SESSION.GTID_NEXT= 'GTID'/ /([0-9A-F\-]{36})\:[0-9]+\-[0-9]+/GTID:#-#/ /GROUPS: .*:(.*,.*)/GROUPS: GTID:(X,X)/ /CRC32 0x[0-9a-f]{8}/CRC32 #/
 --exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLD_DATADIR/master-bin.000001
 
 --echo #
@@ -1730,7 +1730,7 @@
 --echo #
 let $MYSQLD_DATADIR= `select @@datadir`;
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
---replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /server v [^ ]*/server v #.##.##/ /(@[0-9]*=[0-9-]*[.][0-9]{1,3})[0-9e+-]*[^ ]*[ ]*(.*(FLOAT|DOUBLE).*[*].)/\1... \2/ /SET @@SESSION.GTID_NEXT=.*$/SET @@SESSION.GTID_NEXT= 'GTID';/ /([0-9A-F\-]{36})\:[0-9]+\-[0-9]+/GTID:#-#/ /GROUPS: .*:(.*,.*)/GROUPS: GTID:(X,X)/ /CRC32 0x[0-9a-f]{8}/CRC32 #/
+--replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /server v [^ ]*/server v #.##.##/ /(@[0-9]*=[0-9-]*[.][0-9]{1,3})[0-9e+-]*[^ ]*[ ]*(.*(FLOAT|DOUBLE).*[*].)/\1... \2/ /SET @@SESSION.GTID_NEXT= '.*'/SET @@SESSION.GTID_NEXT= 'GTID'/ /([0-9A-F\-]{36})\:[0-9]+\-[0-9]+/GTID:#-#/ /GROUPS: .*:(.*,.*)/GROUPS: GTID:(X,X)/ /CRC32 0x[0-9a-f]{8}/CRC32 #/
 --exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLD_DATADIR/master-bin.000001
 
 --echo #
@@ -1857,7 +1857,7 @@
 --echo #
 let $MYSQLD_DATADIR= `select @@datadir`;
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
---replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /server v [^ ]*/server v #.##.##/ /(@[0-9]*=[0-9-]*[.][0-9]{1,3})[0-9e+-]*[^ ]*[ ]*(.*(FLOAT|DOUBLE).*[*].)/\1... \2/ /SET @@SESSION.GTID_NEXT=.*$/SET @@SESSION.GTID_NEXT= 'GTID';/ /([0-9A-F\-]{36})\:[0-9]+\-[0-9]+/GTID:#-#/ /GROUPS: .*:(.*,.*)/GROUPS: GTID:(X,X)/ /CRC32 0x[0-9a-f]{8}/CRC32 #/
+--replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /server v [^ ]*/server v #.##.##/ /(@[0-9]*=[0-9-]*[.][0-9]{1,3})[0-9e+-]*[^ ]*[ ]*(.*(FLOAT|DOUBLE).*[*].)/\1... \2/ /SET @@SESSION.GTID_NEXT= '.*'/SET @@SESSION.GTID_NEXT= 'GTID'/ /([0-9A-F\-]{36})\:[0-9]+\-[0-9]+/GTID:#-#/ /GROUPS: .*:(.*,.*)/GROUPS: GTID:(X,X)/ /CRC32 0x[0-9a-f]{8}/CRC32 #/
 --exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLD_DATADIR/master-bin.000001
 
 --echo #
@@ -1915,7 +1915,7 @@
 --echo #
 let $MYSQLD_DATADIR= `select @@datadir`;
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
---replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /server v [^ ]*/server v #.##.##/ /(@[0-9]*=[0-9-]*[.][0-9]{1,3})[0-9e+-]*[^ ]*[ ]*(.*(FLOAT|DOUBLE).*[*].)/\1... \2/ /SET @@SESSION.GTID_NEXT= '.*'/SET @@SESSION.GTID_NEXT= 'GTID';/ /CRC32 0x[0-9a-f]{8}/CRC32 #/
+--replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /server v [^ ]*/server v #.##.##/ /(@[0-9]*=[0-9-]*[.][0-9]{1,3})[0-9e+-]*[^ ]*[ ]*(.*(FLOAT|DOUBLE).*[*].)/\1... \2/ /SET @@SESSION.GTID_NEXT= '.*'/SET @@SESSION.GTID_NEXT= 'GTID'/ /CRC32 0x[0-9a-f]{8}/CRC32 #/
 --exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLD_DATADIR/master-bin.000001
 
 --echo #

=== modified file 'mysql-test/extra/binlog_tests/mysqlbinlog_start_stop_2.inc'
--- mysql-test/extra/binlog_tests/mysqlbinlog_start_stop_2.inc	2013-02-12 12:09:48 +0000
+++ mysql-test/extra/binlog_tests/mysqlbinlog_start_stop_2.inc	2013-11-27 10:38:56 +0000
@@ -30,5 +30,5 @@
 --echo ---- $option_text ----
 
 # Print output
---replace_regex /SET @@SESSION.GTID_NEXT= '.*'/SET @@SESSION.GTID_NEXT= 'GTID';/ /([0-9A-Fa-f\-]{36})\:[0-9]+\-[0-9]+/UUID:#-#/
+--replace_regex /SET @@SESSION.GTID_NEXT= '.*'/SET @@SESSION.GTID_NEXT= 'GTID'/ /([0-9A-Fa-f\-]{36})\:[0-9]+\-[0-9]+/UUID:#-#/
 --exec $MYSQL_BINLOG --short-form $option $extra_options

=== modified file 'mysql-test/extra/rpl_tests/rpl_conflicts.test'
--- mysql-test/extra/rpl_tests/rpl_conflicts.test	2011-08-19 13:04:28 +0000
+++ mysql-test/extra/rpl_tests/rpl_conflicts.test	2013-11-27 10:38:56 +0000
@@ -89,14 +89,12 @@
   --echo ---- Wait until slave stops with an error ----
   # Wait until the slave tries to run the query, fails with duplicate
   # key error, and stops the SQL thread.
-  let $slave_sql_errno= 1062; # ER_DUP_ENTRY
+
+  let $slave_sql_errno= convert_error(ER_DUP_ENTRY);
   source include/wait_for_slave_sql_error.inc;
+  --let $errno= query_get_value("SHOW SLAVE STATUS", Last_SQL_Errno, 1)
+  --eval SELECT "$errno" as 'Last_SQL_Errno'
 
-  --let $err= query_get_value("SHOW SLAVE STATUS", Last_SQL_Error, 1)
-  --replace_regex /end_log_pos [0-9]+/end_log_pos END_LOG_POS/
-  --disable_query_log
-  --eval SELECT "$err" as 'Last_SQL_Error (expected "duplicate key" error)'
-  --enable_query_log
   call mtr.add_suppression("Slave SQL.*Duplicate entry .1. for key .PRIMARY.* Error_code: 1062");
   call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 
@@ -144,14 +142,11 @@
 if (`SELECT @@global.binlog_format = 'ROW' AND @@global.slave_exec_mode = 'STRICT'`) {
   --echo ---- Wait until slave stops with an error ----
   call mtr.add_suppression("Slave SQL.*Can.t find record in .t1., Error_code: 1032");
-  let $slave_sql_errno= 1032; # ER_KEY_NOT_FOUND
+
+  let $slave_sql_errno= convert_error(ER_KEY_NOT_FOUND);
   source include/wait_for_slave_sql_error.inc;
-
-  --let $err= query_get_value("SHOW SLAVE STATUS", Last_SQL_Error, 1)
-  --replace_regex /end_log_pos [0-9]+/end_log_pos END_LOG_POS/
-  --disable_query_log
-  --eval SELECT "$err" as 'Last_SQL_Error (expected "duplicate key" error)'
-  --enable_query_log
+  --let $errno= query_get_value("SHOW SLAVE STATUS", Last_SQL_Errno, 1)
+  --eval SELECT "$errno" as 'Last_SQL_Errno'
 
   SELECT * FROM t1;
 

=== modified file 'mysql-test/extra/rpl_tests/rpl_extra_col_master.test'
--- mysql-test/extra/rpl_tests/rpl_extra_col_master.test	2012-11-20 19:18:59 +0000
+++ mysql-test/extra/rpl_tests/rpl_extra_col_master.test	2013-11-27 10:38:56 +0000
@@ -486,10 +486,8 @@
 --echo ********************************************
 --echo
 connection slave;
-# 1677 = ER_SLAVE_CONVERSION_FAILED
---let $slave_sql_errno= 1677
 --let $slave_skip_counter= 2
---let $show_slave_sql_error= 1
+--let $slave_sql_errno= convert_error(ER_SLAVE_CONVERSION_FAILED)
 --source include/wait_for_slave_sql_error_and_skip.inc
 
 --echo
@@ -542,10 +540,8 @@
 --echo ********************************************
 --echo
 connection slave;
-# 1677 = ER_SLAVE_CONVERSION_FAILED
---let $slave_sql_errno= 1677
 --let $slave_skip_counter= 2
---let $show_slave_sql_error= 1
+--let $slave_sql_errno= convert_error(ER_SLAVE_CONVERSION_FAILED)
 --source include/wait_for_slave_sql_error_and_skip.inc
 
 --echo
@@ -684,9 +680,7 @@
 # Remove below once fixed
 #***************************
 connection slave;
-# 1091 = ER_CANT_DROP_FIELD_OR_KEY
---let $slave_sql_errno= 1091
---let $show_slave_sql_error= 1
+--let $slave_sql_errno= convert_error(ER_CANT_DROP_FIELD_OR_KEY)
 --source include/wait_for_slave_sql_error.inc
 #***************************
 
@@ -751,9 +745,7 @@
 --echo ********************************************
 --echo
 connection slave;
-# 1054 = ER_BAD_FIELD_ERROR
---let $slave_sql_errno= 1054
---let $show_slave_sql_error= 1
+--let $slave_sql_errno= convert_error(ER_BAD_FIELD_ERROR)
 --source include/wait_for_slave_sql_error.inc
 STOP SLAVE;
 
@@ -829,9 +821,7 @@
 --echo *****************
 --echo
 connection slave;
-# 1072 = ER_KEY_COLUMN_DOES_NOT_EXITS
---let $slave_sql_errno= 1072
---let $show_slave_sql_error= 1
+--let $slave_sql_errno= convert_error(ER_KEY_COLUMN_DOES_NOT_EXITS)
 --source include/wait_for_slave_sql_error.inc
 STOP SLAVE;
 

=== modified file 'mysql-test/extra/rpl_tests/rpl_extra_col_slave.test'
--- mysql-test/extra/rpl_tests/rpl_extra_col_slave.test	2012-06-21 02:57:40 +0000
+++ mysql-test/extra/rpl_tests/rpl_extra_col_slave.test	2013-11-27 10:38:56 +0000
@@ -94,8 +94,7 @@
 SELECT * FROM t2 ORDER BY a;
 
 connection slave;
---let $slave_sql_errno= 1677
---let $show_slave_sql_error= 1
+--let $slave_sql_errno= convert_error(ER_SLAVE_CONVERSION_FAILED)
 --source include/wait_for_slave_sql_error.inc
 STOP SLAVE;
 
@@ -140,13 +139,12 @@
 
 INSERT INTO t3 () VALUES(@b1,2,'Kyle, TEX'),(@b1,1,'JOE AUSTIN'),(@b1,4,'QA TESTING');
 
---echo ********************************************
---echo *** Expect slave to fail with Error 1677 ***
---echo ********************************************
+--echo ******************************************************************
+--echo *** Expect slave to fail with Error ER_SLAVE_CONVERSION_FAILED ***
+--echo ******************************************************************
 connection slave;
---let $slave_sql_errno= 1677
 --let $slave_skip_counter= 2
---let $show_slave_sql_error= 1
+--let $slave_sql_errno= convert_error(ER_SLAVE_CONVERSION_FAILED)
 --source include/wait_for_slave_sql_error_and_skip.inc
 
 --echo *** Drop t3  ***
@@ -183,15 +181,15 @@
 INSERT INTO t4 () VALUES(100.22,2,'Kyle, TEX'),(200.26,1,'JOE AUSTIN'),
                         (30000.22,4,'QA TESTING');
 
---echo ********************************************
---echo *** Expect slave to fail with Error 1677 ***
---echo ********************************************
+--echo ******************************************************************
+--echo *** Expect slave to fail with Error ER_SLAVE_CONVERSION_FAILED ***
+--echo ******************************************************************
 connection slave;
---let $slave_sql_errno= 1677
 --let $slave_skip_counter= 2
---let $show_slave_sql_error= 1
+--let $slave_sql_errno= convert_error(ER_SLAVE_CONVERSION_FAILED)
 --source include/wait_for_slave_sql_error_and_skip.inc
 
+
 --echo *** Drop t4  ***
 connection master;
 DROP TABLE t4;
@@ -226,15 +224,15 @@
 INSERT INTO t5 () VALUES(1,'Kyle',200.23,1,'b1b1',23.00098),
                         (2,'JOE',300.01,0,'b2b2',1.0000009);
 
---echo ********************************************
---echo *** Expect slave to fail with Error 1677 ***
---echo ********************************************
+--echo ******************************************************************
+--echo *** Expect slave to fail with Error ER_SLAVE_CONVERSION_FAILED ***
+--echo ******************************************************************
 connection slave;
---let $slave_sql_errno= 1677
 --let $slave_skip_counter= 2
---let $show_slave_sql_error= 1
+--let $slave_sql_errno= convert_error(ER_SLAVE_CONVERSION_FAILED)
 --source include/wait_for_slave_sql_error_and_skip.inc
 
+
 --echo *** Drop t5  ***
 connection master;
 DROP TABLE t5;
@@ -270,13 +268,13 @@
 INSERT INTO t6 () VALUES(1,'Kyle',200.23,1),
                         (2,'JOE',300.01,0);
 
---echo ********************************************
---echo *** Expect slave to fail with Error 1677 ***
---echo ********************************************
+--echo ******************************************************************
+--echo *** Expect slave to fail with Error ER_SLAVE_CONVERSION_FAILED ***
+--echo ******************************************************************
 connection slave;
---let $slave_sql_errno= 1677
---let $show_slave_sql_error= 1
---source include/wait_for_slave_sql_error.inc
+--let $slave_sql_errno= convert_error(ER_SLAVE_CONVERSION_FAILED)
+--source include/wait_for_slave_sql_error_and_skip.inc
+
 
 --echo *** Drop t6  ***
 --let $rpl_only_running_threads= 1
@@ -474,15 +472,15 @@
 set @b1 = concat(@b1,@b1);
 INSERT INTO t10 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
 
---echo ********************************************
---echo *** Expect slave to fail with Error 1677 ***
---echo ********************************************
+--echo ******************************************************************
+--echo *** Expect slave to fail with Error ER_SLAVE_CONVERSION_FAILED ***
+--echo ******************************************************************
 connection slave;
---let $slave_sql_errno= 1677
 --let $slave_skip_counter= 2
---let $show_slave_sql_error= 1
+--let $slave_sql_errno= convert_error(ER_SLAVE_CONVERSION_FAILED)
 --source include/wait_for_slave_sql_error_and_skip.inc
 
+
 --echo *** Drop t10  ***
 connection master;
 DROP TABLE t10;
@@ -516,15 +514,15 @@
 set @b1 = concat(@b1,@b1);
 INSERT INTO t11 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
 
---echo ********************************************
---echo *** Expect slave to fail with Error 1677 ***
---echo ********************************************
+--echo ******************************************************************
+--echo *** Expect slave to fail with Error ER_SLAVE_CONVERSION_FAILED ***
+--echo ******************************************************************
 connection slave;
---let $slave_sql_errno= 1677
 --let $slave_skip_counter= 2
---let $show_slave_sql_error= 1
+--let $slave_sql_errno= convert_error(ER_SLAVE_CONVERSION_FAILED)
 --source include/wait_for_slave_sql_error_and_skip.inc
 
+
 --echo *** Drop t11  ***
 connection master;
 DROP TABLE t11;
@@ -794,15 +792,15 @@
 connection master;
 ALTER TABLE t15 ADD COLUMN c6 INT AFTER c5;
 
---echo ********************************************
---echo *** Expect slave to fail with Error 1060 ***
---echo ********************************************
+--echo ********************************************************
+--echo *** Expect slave to fail with Error ER_DUP_FIELDNAME ***
+--echo ********************************************************
 connection slave;
---let $slave_sql_errno= 1060
 --let $slave_skip_counter= 1
---let $show_slave_sql_error= 1
+--let $slave_sql_errno= convert_error(ER_DUP_FIELDNAME) # 1060
 --source include/wait_for_slave_sql_error_and_skip.inc
 
+
 --echo *** Try to insert in master ****
 connection master;
 INSERT INTO t15 () VALUES(5,2.00,'Replication Testing',@b1,'Buda',2);
@@ -903,13 +901,12 @@
 
 INSERT INTO t17 () VALUES(9223372036854775807,2,'Kyle, TEX');
 
---echo ********************************************
---echo *** Expect slave to fail with Error 1677 ***
---echo ********************************************
+--echo ******************************************************************
+--echo *** Expect slave to fail with Error ER_SLAVE_CONVERSION_FAILED ***
+--echo ******************************************************************
 connection slave;
---let $slave_sql_errno= 1677
 --let $slave_skip_counter= 2
---let $show_slave_sql_error= 1
+--let $slave_sql_errno= convert_error(ER_SLAVE_CONVERSION_FAILED)
 --source include/wait_for_slave_sql_error_and_skip.inc
 
 --echo ** DROP table t17 ***

=== modified file 'mysql-test/extra/rpl_tests/rpl_mts_crash_safe.test'
--- mysql-test/extra/rpl_tests/rpl_mts_crash_safe.test	2012-12-21 10:13:22 +0000
+++ mysql-test/extra/rpl_tests/rpl_mts_crash_safe.test	2013-11-27 10:38:56 +0000
@@ -31,6 +31,8 @@
 #
 #  At the end, master and slave cannot diverge.
 ################################################################################
+#  Clean all configuration changes after running the test.
+--source include/force_restart.inc
 
 
 --echo ########################################################################

=== modified file 'mysql-test/extra/rpl_tests/rpl_row_basic.test'
--- mysql-test/extra/rpl_tests/rpl_row_basic.test	2012-04-12 08:43:18 +0000
+++ mysql-test/extra/rpl_tests/rpl_row_basic.test	2013-11-27 10:38:56 +0000
@@ -440,9 +440,7 @@
 INSERT INTO t5 VALUES (2, repeat(_utf8'a', 255), 2);
 
 connection slave;
-# 1677 = ER_SLAVE_CONVERSION_FAILED 
---let $slave_sql_errno= 1677 
---let $show_slave_sql_error= 1
+--let $slave_sql_errno= convert_error(ER_SLAVE_CONVERSION_FAILED) # 1677
 --source include/wait_for_slave_sql_error.inc
 
 --source include/rpl_reset.inc
@@ -453,9 +451,7 @@
 INSERT INTO t6 VALUES (2, repeat(_utf8'a', 255), 2);
 
 connection slave;
-# 1677 = ER_SLAVE_CONVERSION_FAILED 
---let $slave_sql_errno= 1677 
---let $show_slave_sql_error= 1
+--let $slave_sql_errno= convert_error(ER_SLAVE_CONVERSION_FAILED) # 1677
 --source include/wait_for_slave_sql_error.inc
 
 --source include/rpl_reset.inc

=== modified file 'mysql-test/extra/rpl_tests/rpl_row_empty_imgs.test'
--- mysql-test/extra/rpl_tests/rpl_row_empty_imgs.test	2011-08-19 13:04:28 +0000
+++ mysql-test/extra/rpl_tests/rpl_row_empty_imgs.test	2013-11-27 10:38:56 +0000
@@ -205,7 +205,7 @@
 
 SET SQL_LOG_BIN=0;
 call mtr.add_suppression("Slave: Can\'t find record in \'t1\' Error_code: 1032");
-call mtr.add_suppression("Slave SQL: Could not execute Update_rows event on table test.t1; Can.t find record in .t1.* Error_code: 1032");
+call mtr.add_suppression("Slave SQL: .*Could not execute Update_rows event on table test.t1; Can.t find record in .t1.* Error_code: 1032");
 call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 
 SET SQL_LOG_BIN=1;

=== modified file 'mysql-test/extra/rpl_tests/rpl_row_tabledefs.test'
--- mysql-test/extra/rpl_tests/rpl_row_tabledefs.test	2011-09-06 12:43:05 +0000
+++ mysql-test/extra/rpl_tests/rpl_row_tabledefs.test	2013-11-27 10:38:56 +0000
@@ -152,8 +152,7 @@
 call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 
 --let $slave_skip_counter= 2
---let $slave_sql_errno= 1677
---let $show_slave_sql_error= 1
+--let $slave_sql_errno= convert_error(ER_SLAVE_CONVERSION_FAILED) # 1677
 --source include/wait_for_slave_sql_error_and_skip.inc
 
 connection master;
@@ -164,8 +163,7 @@
 INSERT INTO t5 VALUES (5,10,25);
 connection slave;
 --let $slave_skip_counter= 2
---let $slave_sql_errno= 1677
---let $show_slave_sql_error= 1
+--let $slave_sql_errno= convert_error(ER_SLAVE_CONVERSION_FAILED) # 1677
 --source include/wait_for_slave_sql_error_and_skip.inc
 
 connection master;
@@ -176,8 +174,7 @@
 INSERT INTO t6 VALUES (6,12,36);
 connection slave;
 --let $slave_skip_counter= 2
---let $slave_sql_errno= 1677
---let $show_slave_sql_error= 1
+--let $slave_sql_errno= convert_error(ER_SLAVE_CONVERSION_FAILED) # 1677
 --source include/wait_for_slave_sql_error_and_skip.inc
 
 connection master;

=== added file 'mysql-test/extra/rpl_tests/rpl_stress_test.inc'
--- mysql-test/extra/rpl_tests/rpl_stress_test.inc	1970-01-01 00:00:00 +0000
+++ mysql-test/extra/rpl_tests/rpl_stress_test.inc	2013-11-27 10:38:56 +0000
@@ -0,0 +1,111 @@
+################################################################################
+# Build connections to master server
+# Stress test that execute massive queries on every connection
+#
+# ################################################################################
+--connection master
+--disable_query_log
+--disable_result_log
+--let $n= $connections
+--let $i= 1
+while ($i < $n)
+{
+  --eval CREATE TABLE t$i(c1 INT) ENGINE= $engine;
+  --inc $i
+}
+--enable_result_log
+--enable_query_log
+
+--sync_slave_with_master
+
+--echo # Build connections to master server
+--disable_query_log
+--disable_result_log
+--let $i= 1
+while ($i < $n)
+{
+  --connect(con$i,127.0.0.1,root,,test,$MASTER_MYPORT,)
+  --inc $i
+}
+--let $i= 1
+while ($i < $connections)
+{
+  --connection con$i
+  set session debug="+d,simulate_binlog_flush_error";
+  --inc $i
+}
+--enable_result_log
+--enable_query_log
+
+--echo # Stress test that execute massive queries on every connection
+--let $m= $loops
+--let $j= 1
+--disable_query_log
+--disable_result_log
+while ($j < $m)
+{
+  # Execute INSERT statement on these connections in parallel
+  --let $i= 1
+  while ($i < $n)
+  {
+    --connection con$i
+    --send
+    --eval INSERT INTO t$i VALUES(2)
+    --inc $i
+  }
+  # reap on every connection
+  --let $i= 1
+  while ($i < $n)
+  {
+    --connection con$i
+    --reap
+    --inc $i
+  }
+  --inc $j
+}
+
+--let $i= 1
+while ($i < $connections)
+{
+  --connection con$i
+  set session debug="-d,simulate_binlog_flush_error";
+  --inc $i
+}
+--enable_result_log
+--enable_query_log
+
+--let $slave_timeout= 3600
+if ($enable_diff_table)
+{
+--source include/sync_slave_sql_with_master.inc
+  --echo # Test if the results are consistent on master and slave
+  --let $i= 1
+  while ($i < $n)
+  {
+    --let $diff_tables= master:t$i, slave:t$i
+    --source include/diff_tables.inc
+    --inc $i
+  }
+}
+
+# clean up
+--connection master
+--disable_query_log
+--disable_result_log
+# disconnect connections
+--let $i= 1
+while ($i < $n)
+{
+  --disconnect con$i
+  --inc $i
+}
+# drop tables
+--let $i= 1
+while ($i < $n)
+{
+  --eval DROP TABLE t$i
+  --inc $i
+}
+--enable_result_log
+--enable_query_log
+--source include/sync_slave_sql_with_master.inc

=== modified file 'mysql-test/include/default_mysqld.cnf'
--- mysql-test/include/default_mysqld.cnf	2013-02-26 05:45:28 +0000
+++ mysql-test/include/default_mysqld.cnf	2013-11-27 10:38:56 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2013, 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
@@ -25,7 +25,7 @@
 
 log-bin-trust-function-creators=1
 key_buffer_size=            1M
-sort_buffer=                256K
+sort_buffer_size=           256K
 max_heap_table_size=        1M
 
 loose-innodb_data_file_path=      ibdata1:10M:autoextend

=== modified file 'mysql-test/include/explain_json.inc'
--- mysql-test/include/explain_json.inc	2012-08-23 07:45:33 +0000
+++ mysql-test/include/explain_json.inc	2013-11-27 10:38:56 +0000
@@ -320,7 +320,7 @@
   (4,1), (4,1), (4,1), (4,1),
   (2,1), (2,1);
 
-EXPLAIN FORMAT=JSON SELECT DISTINCT SUM(b) FROM t1 GROUP BY a WITH ROLLUP;
+EXPLAIN FORMAT=JSON SELECT SUM(b) FROM t1 GROUP BY a WITH ROLLUP;
 
 DROP TABLE t1;
 

=== modified file 'mysql-test/include/handler.inc'
--- mysql-test/include/handler.inc	2012-05-09 15:11:24 +0000
+++ mysql-test/include/handler.inc	2013-11-27 10:38:56 +0000
@@ -1090,8 +1090,7 @@
 connection default;
 --echo #
 --echo # Demonstrate that HANDLER locks and transaction locks
---echo # reside in the same context, and we don't back-off
---echo # when have transaction or handler locks.
+--echo # reside in the same context.
 --echo #
 create table t1 (a int, key a (a));
 insert into t1 (a) values (1), (2), (3), (4), (5);
@@ -1112,9 +1111,9 @@
 --source include/wait_condition.inc
 --echo # --> connection default
 connection default;
+--echo # We back-off on hitting deadlock condition.
 --error ER_LOCK_DEADLOCK
 handler t0 open;
---error ER_LOCK_DEADLOCK
 select * from t0;
 handler t1 open;
 commit;

=== added file 'mysql-test/include/have_daemon_example_plugin.inc'
--- mysql-test/include/have_daemon_example_plugin.inc	1970-01-01 00:00:00 +0000
+++ mysql-test/include/have_daemon_example_plugin.inc	2013-11-27 10:38:56 +0000
@@ -0,0 +1,16 @@
+disable_query_log;
+#
+# Check if server has support for loading plugins
+#
+if (`SELECT @@have_dynamic_loading != 'YES'`) {
+  --skip daemon example plugin requires dynamic loading
+}
+
+#
+# Check if the variable DAEMONEXAMPLE is set
+#
+if (!$DAEMONEXAMPLE) {
+  --skip daemon_example plugin requires the environment variable \$DAEMONEXAMPLE to be set (normally done by mtr)
+}
+
+enable_query_log;

=== modified file 'mysql-test/include/have_perfschema.inc'
--- mysql-test/include/have_perfschema.inc	2010-01-07 05:42:07 +0000
+++ mysql-test/include/have_perfschema.inc	2013-11-27 10:38:56 +0000
@@ -11,7 +11,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 if (!`SELECT count(*) FROM information_schema.engines WHERE
       (support = 'YES' OR support = 'DEFAULT') AND

=== modified file 'mysql-test/include/have_plugin_auth.inc'
--- mysql-test/include/have_plugin_auth.inc	2011-03-18 09:31:39 +0000
+++ mysql-test/include/have_plugin_auth.inc	2013-11-27 10:38:56 +0000
@@ -1,5 +1,4 @@
-disable_query_log;
---require r/true.require
-select (PLUGIN_LIBRARY LIKE 'auth_test_plugin%') as `TRUE` FROM INFORMATION_SCHEMA.PLUGINS 
-  WHERE PLUGIN_NAME='test_plugin_server';
-enable_query_log;
+if (!`select count(*) FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME='test_plugin_server' and PLUGIN_LIBRARY LIKE 'auth_test_plugin%'`) {
+  --skip Need the plugin test_plugin_server
+}
+

=== modified file 'mysql-test/include/have_plugin_interface.inc'
--- mysql-test/include/have_plugin_interface.inc	2010-10-20 14:56:09 +0000
+++ mysql-test/include/have_plugin_interface.inc	2013-11-27 10:38:56 +0000
@@ -1,5 +1,4 @@
---disable_query_log
---require r/true.require
-select (PLUGIN_LIBRARY LIKE 'qa_auth_interface%') as `TRUE` FROM INFORMATION_SCHEMA.PLUGINS
-  WHERE PLUGIN_NAME='qa_auth_interface';
---enable_query_log
+if (!`select count(*) FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME='qa_auth_interface' and PLUGIN_LIBRARY LIKE 'qa_auth_interface%'`) {
+  --skip Need the plugin qa_auth_interface
+}
+

=== modified file 'mysql-test/include/have_plugin_server.inc'
--- mysql-test/include/have_plugin_server.inc	2010-10-20 14:56:09 +0000
+++ mysql-test/include/have_plugin_server.inc	2013-11-27 10:38:56 +0000
@@ -1,5 +1,4 @@
---disable_query_log
---require r/true.require
-select (PLUGIN_LIBRARY LIKE 'qa_auth_server%') as `TRUE` FROM INFORMATION_SCHEMA.PLUGINS
-  WHERE PLUGIN_NAME='qa_auth_server';
---enable_query_log
+if (!`select count(*) FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME='qa_auth_server' and PLUGIN_LIBRARY LIKE 'qa_auth_server%'`) {
+  --skip Need the plugin qa_auth_server
+}
+

=== added file 'mysql-test/include/have_valgrind.inc'
--- mysql-test/include/have_valgrind.inc	1970-01-01 00:00:00 +0000
+++ mysql-test/include/have_valgrind.inc	2013-11-27 10:38:56 +0000
@@ -0,0 +1,11 @@
+# include/have_valgrind.inc
+#
+# If some test should be run with only valgrind then skip it while running test
+# without it.
+#
+
+if (!$VALGRIND_TEST) {
+  --skip Need "--valgrind" 
+}
+
+

=== added file 'mysql-test/include/index_merge_delete.inc'
--- mysql-test/include/index_merge_delete.inc	1970-01-01 00:00:00 +0000
+++ mysql-test/include/index_merge_delete.inc	2013-11-27 10:38:56 +0000
@@ -0,0 +1,215 @@
+#
+# DELETE Statements
+#
+
+# The include file works as intended only when index_merge_single_col_setup.inc
+# or index_merge_multi_col_setup.inc is used. The table t1 set-up is done in 
+# these two include files.
+
+--disable_warnings
+DROP TABLE IF EXISTS t2;
+--enable_warnings
+
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 SELECT * FROM t1;
+ANALYZE TABLE t2;
+
+#1. SQL statments with various combinations of comparison operators
+
+# union and sort_union 
+
+--let $query = FROM t1 WHERE key1=25 OR key4=10
+--replace_column 9 #
+--eval EXPLAIN DELETE $query
+--eval SELECT COUNT(*) $query
+--eval DELETE $query
+--eval SELECT COUNT(*) $query
+
+--let $query = FROM t1 WHERE key1=48 OR  key4=2 OR key6=3
+--replace_column 9 #
+--eval EXPLAIN DELETE $query
+--eval SELECT COUNT(*) $query
+--eval DELETE $query
+--eval SELECT COUNT(*) $query
+
+--let $query = FROM t1 WHERE key3=1025 OR key5 IS NULL
+--replace_column 9 #
+--eval EXPLAIN DELETE $query
+--eval SELECT COUNT(*) $query
+--eval DELETE $query
+--eval SELECT COUNT(*) $query
+
+--let $query = FROM t1 WHERE key3=45 OR key1=6 OR key6 IS NULL
+--replace_column 9 #
+--eval EXPLAIN DELETE $query
+--eval SELECT COUNT(*) $query
+--eval DELETE $query
+--eval SELECT COUNT(*) $query
+
+--let $query = FROM t1 WHERE (key4=42 AND key6 IS NOT NULL) OR (key1=4 AND key3=6)
+--replace_column 9 #
+--eval EXPLAIN DELETE $query
+--eval SELECT COUNT(*) $query
+--eval DELETE $query
+--eval SELECT COUNT(*) $query
+
+INSERT INTO t1 VALUES (42,42,42,42,3,3,3,3),(4,4,6,6,6,6,4,4);
+--let $query = FROM t1 WHERE (key4=42 AND key6=3) OR (key1=4 AND key3=6)
+--replace_column 9 #
+--eval EXPLAIN DELETE $query
+--eval SELECT COUNT(*) $query
+--eval DELETE $query
+--eval SELECT COUNT(*) $query
+
+INSERT INTO t1 VALUES (42,42,42,42,3,3,3,3),(4,4,6,6,6,6,4,4);
+--let $query = FROM t1 WHERE (key4=42 AND key6=3) OR (key1=4 AND key3=6) AND key5<>50
+--replace_column 9 #
+--eval EXPLAIN DELETE $query
+--eval SELECT COUNT(*) $query
+--eval DELETE $query
+--eval SELECT COUNT(*) $query
+
+--let $query = FROM t1 WHERE key1<2 OR key2<3
+--replace_result "i1,i2" "i2,i1"
+--replace_column 9 #
+--eval EXPLAIN DELETE $query
+--eval SELECT COUNT(*) $query
+--eval DELETE $query
+--eval SELECT COUNT(*) $query
+
+--let $query = FROM t1 WHERE key1<5 OR key3<7
+--replace_result "i1,i3" "i3,i1"
+--replace_column 9 #
+--eval EXPLAIN DELETE $query
+--eval SELECT COUNT(*) $query
+--eval DELETE $query
+--eval SELECT COUNT(*) $query
+
+INSERT INTO t1 VALUES (10,10,10,10,10,10,10,10),(3,3,3,3,3,3,3,3);
+--let $query = FROM t1 WHERE key2=10 OR key3=3 OR key4 IS NULL
+--replace_column 9 #
+--eval EXPLAIN DELETE $query
+--eval SELECT COUNT(*) $query
+--eval DELETE $query
+--eval SELECT COUNT(*) $query
+
+INSERT INTO t1 VALUES (10,10,10,10,10,10,10,10),(3,3,3,3,3,3,3,3);
+--let $query = FROM t1 WHERE key2=10 OR key3=3 OR key4 <=> null
+--replace_column 9 #
+--eval EXPLAIN DELETE $query
+--eval SELECT COUNT(*) $query
+--eval DELETE $query
+--eval SELECT COUNT(*) $query
+
+--let $query = FROM t1 WHERE (key1>30 AND key1<35) OR (key2>32 AND key2<40)
+--replace_column 9 #
+--eval EXPLAIN DELETE $query
+--eval SELECT COUNT(*) $query
+--eval DELETE $query
+--eval SELECT COUNT(*) $query
+
+--let $query = FROM t1 WHERE key1 BETWEEN 30 AND 35 OR key2 BETWEEN 32 AND 40
+--replace_column 9 #
+--eval EXPLAIN DELETE $query
+--eval SELECT COUNT(*) $query
+--eval DELETE $query
+--eval SELECT COUNT(*) $query
+
+--let $query = FROM t1 WHERE (key1>30 AND key1<35) OR (key2>32 AND key2<40) OR (key3>20 AND key3<45)
+--replace_column 9 #
+--eval EXPLAIN DELETE $query
+--eval SELECT COUNT(*) $query
+--eval DELETE $query
+--eval SELECT COUNT(*) $query
+
+--let $query = FROM t1 WHERE key1 BETWEEN 30 AND 35 OR key2 BETWEEN 32 AND 40 OR key3 BETWEEN 20 AND 45
+--replace_column 9 #
+--eval EXPLAIN DELETE $query
+--eval SELECT COUNT(*) $query
+--eval DELETE $query
+--eval SELECT COUNT(*) $query
+
+INSERT INTO t1 VALUES (1,1,1,1,1,1,1,1),(2,2,2,2,2,2,2,2),(3,3,3,3,3,3,3,3),(4,4,4,4,4,4,4,4);
+--let $query = FROM t1 WHERE ((key3<4 OR key5<3) AND (key1<3 OR key2<3)) OR (((key3<5 AND key6<5) OR key5<2) AND (key5<4 OR key6<4))
+--replace_column 9 #
+--eval EXPLAIN DELETE $query
+--eval SELECT COUNT(*) $query
+--eval DELETE $query
+--eval SELECT COUNT(*) $query
+
+--let $query = FROM t1 WHERE (key4<42 AND key6 IS NOT NULL) OR (key1>4 AND key5 IS NULL) AND key2<>50
+--replace_column 9 #
+--eval EXPLAIN DELETE $query
+--eval SELECT COUNT(*) $query
+--eval DELETE $query
+--eval SELECT COUNT(*) $query
+
+--let $query = FROM t1 WHERE (key5 IN (15,70) OR key6 IN (15,70)) 
+--replace_column 9 #
+--eval EXPLAIN DELETE $query
+--eval SELECT COUNT(*) $query
+--eval DELETE $query
+--eval SELECT COUNT(*) $query
+
+#2. Statements with ORDER BY
+
+INSERT INTO t1 VALUES (1,1,1,1,1,1,1,1),(2,2,2,2,2,2,2,2),(3,3,3,3,3,3,3,3);
+--let $query = FROM t1 WHERE key1<2 OR key2<3 ORDER BY key1
+--replace_column 9 #
+--eval EXPLAIN DELETE $query
+--eval SELECT COUNT(*) $query
+--eval DELETE $query
+--eval SELECT COUNT(*) $query
+
+#3. Multi table SQL statements 
+
+--let $query = FROM t1 USING t1 INNER JOIN t2 ON (t2.key1=t2.key1) WHERE t1.key1=3 OR t1.key2=4
+--replace_column 9 #
+--eval EXPLAIN DELETE $query
+SELECT COUNT(*) FROM t1;
+--eval DELETE $query
+SELECT COUNT(*) FROM t1;
+
+# Statements with subqueries
+
+--let $query1 = FROM t2 WHERE key6 = (SELECT key6 FROM t1 WHERE key1=10 OR key5=3 OR key2 IS NULL)
+--let $query2 = key3=28 OR key4=10
+--replace_column 9 #
+--eval EXPLAIN DELETE $query1 OR $query2
+--eval SELECT COUNT(*) $query1 OR $query2
+--eval DELETE $query1 OR $query2
+--eval SELECT COUNT(*) $query1 OR $query2
+
+--let $query3 = key1 < ANY (SELECT key1 FROM t1 WHERE key1<5 OR key4<7) 
+--let $query2 = key4 < SOME (SELECT key4 FROM t1 WHERE key1<5 OR key4<8)
+--let $query1 = FROM t2 WHERE key1=25 OR key4=40
+--replace_column 9 #
+--eval EXPLAIN DELETE $query1 AND ($query2 OR $query3)
+--eval SELECT COUNT(*) $query1 AND ($query2 OR $query3)
+--eval DELETE $query1 AND ($query2 OR $query3)
+--eval SELECT COUNT(*) $query1 AND ($query2 OR $query3)
+
+INSERT INTO t1 VALUES (2,2,2,2,2,2,2,2),(5,5,5,5,5,5,5,5);
+--let $query = FROM t2 WHERE EXISTS (SELECT * FROM t1 WHERE key1<5 OR key3<7)
+--replace_column 9 #
+--eval EXPLAIN DELETE $query
+--eval SELECT COUNT(*) $query
+--eval DELETE $query
+--eval SELECT COUNT(*) $query
+
+# The following statement uses index_merge optimization only when the table is 
+# created with multi column setup. 
+
+INSERT INTO t1 VALUES ( 3,3,3,3,3,3,3,3 ),(4,4,4,4,4,4,4,4);
+--let $query = FROM t1 WHERE key7 = 3 OR key8 = 4
+--replace_column 9 #
+--eval EXPLAIN DELETE $query
+--eval SELECT COUNT(*) $query
+--eval DELETE $query
+--eval SELECT COUNT(*) $query
+
+#
+# end of DELETE statements 
+#
+
+

=== added file 'mysql-test/include/index_merge_insert-and-replace.inc'
--- mysql-test/include/index_merge_insert-and-replace.inc	1970-01-01 00:00:00 +0000
+++ mysql-test/include/index_merge_insert-and-replace.inc	2013-11-27 10:38:56 +0000
@@ -0,0 +1,137 @@
+#
+# INSERT and REPLACE using index_merge optimization
+#
+
+# The include file works as intended only when index_merge_single_col_setup.inc
+# or index_merge_multi_col_setup.inc is used. The table t1 set-up is done in
+# these two include files.
+
+--disable_warnings
+DROP TABLE IF EXISTS t2;
+--enable_warnings
+
+CREATE TABLE t2 LIKE t1;
+
+let $i=10;
+while ($i)
+{
+  INSERT INTO t2 VALUES (rand()*6, rand()*6, rand()*6, rand()*6,
+                         rand()*6, rand()*6, rand()*6, rand()*6);
+  dec $i;
+}
+
+ANALYZE TABLE t2;
+
+# intersect optimization technique test cases for non-selects 
+# are in a separate file(index_merge_intersect_dml.inc) 
+# due to different table requirements.
+
+#
+# REPLACE
+#
+
+# union
+
+--let $query = INTO t2 SELECT * FROM t1 WHERE key3=1025 OR key5 IS NULL
+--replace_column 9 #
+--eval EXPLAIN REPLACE $query
+--eval SELECT COUNT(*) FROM t2
+--eval REPLACE $query
+--eval SELECT COUNT(*) FROM t2
+
+--let $query = INTO t2 SELECT * FROM t1 WHERE key1=48 OR key4=2 OR key6=3
+--replace_column 9 #
+--eval EXPLAIN REPLACE $query
+--eval SELECT COUNT(*) FROM t2
+--eval REPLACE $query
+--eval SELECT COUNT(*) FROM t2
+
+# sort_union
+
+--let $query = INTO t2 SELECT * FROM t1 WHERE key1<2 OR key2<3
+--replace_column 9 #
+--eval EXPLAIN REPLACE $query
+--eval SELECT COUNT(*) FROM t2
+--eval REPLACE $query
+--eval SELECT COUNT(*) FROM t2
+
+--let $query = INTO t2 SELECT * FROM t1 WHERE (key1>30 AND key1<35) OR (key2>32 AND key2<40)
+--replace_column 9 #
+--eval EXPLAIN REPLACE $query
+--eval SELECT COUNT(*) FROM t2
+--eval REPLACE $query
+--eval SELECT COUNT(*) FROM t2
+
+# statements with use/force/ignore index
+
+--let $query = INTO t2 SELECT * FROM t1 IGNORE INDEX(i2) WHERE key1<2 OR key2<3
+--replace_column 9 #
+--eval EXPLAIN REPLACE $query
+--eval SELECT COUNT(*) FROM t2
+--eval REPLACE $query
+--eval SELECT COUNT(*) FROM t2
+
+INSERT INTO t1 VALUES (42,42,42,42,3,3,3,3),(4,4,6,6,6,6,4,4);
+--let $query = INTO t2 SELECT * FROM t1 USE INDEX(i6,i3) WHERE (key4=42 AND key6=3) OR (key1=4 AND key3=6)
+--replace_column 9 #
+--eval EXPLAIN  REPLACE $query
+--eval SELECT COUNT(*) FROM t2
+--eval REPLACE $query
+--eval SELECT COUNT(*) FROM t2
+
+--let $query = INTO t2 SELECT * FROM t1 FORCE INDEX(i1,i2) WHERE (key1>1 OR key2>2)
+--replace_column 9 #
+--eval EXPLAIN REPLACE $query
+--eval SELECT COUNT(*) FROM t2
+--eval REPLACE $query
+--eval SELECT COUNT(*) FROM t2
+
+#
+# INSERT 
+#
+
+# union
+
+INSERT INTO t1 VALUES (42,42,42,42,3,3,3,3),(4,4,6,6,6,6,4,4);
+--let $query = INTO t2 SELECT * FROM t1 WHERE (key4=42 AND key6=3) OR (key1=4 AND key3=6) AND key5<>50
+--replace_column 9 #
+--eval EXPLAIN INSERT $query
+--eval SELECT COUNT(*) FROM t2
+--eval INSERT $query
+--eval SELECT COUNT(*) FROM t2
+
+# sort_union
+
+--let $query = INTO t2 SELECT * FROM t1 WHERE key2=10 OR key3=3 OR key4 <=> null
+--replace_column 9 #
+--eval EXPLAIN INSERT $query
+--eval SELECT COUNT(*) FROM t2
+--eval INSERT $query                   
+--eval SELECT COUNT(*) FROM t2
+
+# statements with use/force/ignore index
+
+--let $query = INTO t2 SELECT * FROM t1 IGNORE INDEX(i1) WHERE key1<2 OR key2<3
+--replace_column 9 #
+--eval EXPLAIN INSERT $query
+--eval SELECT COUNT(*) FROM t2
+--eval INSERT $query
+--eval SELECT COUNT(*) FROM t2
+
+--let $query = INTO t2 SELECT * FROM t1 USE INDEX(i5,i6) WHERE (key1<2 OR key2<2) AND (key3<3 OR key4<3) AND (key5<5 OR key6<5);
+--replace_column 9 #
+--eval EXPLAIN INSERT $query
+--eval SELECT COUNT(*) FROM t2
+--eval INSERT $query
+--eval SELECT COUNT(*) FROM t2
+
+--let $query = INTO t2 SELECT * FROM t1 FORCE INDEX(i4,i5) WHERE (key4>3 OR key5>5)
+--replace_column 9 #
+--eval EXPLAIN INSERT $query
+--eval SELECT COUNT(*) FROM t2
+--eval INSERT $query
+--eval SELECT COUNT(*) FROM t2
+
+#
+# end 
+#

=== added file 'mysql-test/include/index_merge_intersect_dml.inc'
--- mysql-test/include/index_merge_intersect_dml.inc	1970-01-01 00:00:00 +0000
+++ mysql-test/include/index_merge_intersect_dml.inc	2013-11-27 10:38:56 +0000
@@ -0,0 +1,197 @@
+#
+# index_merge tests for statements using intersect algorithm
+#
+
+--disable_warnings
+DROP TABLE IF EXISTS t1,t2;
+--enable_warnings
+
+CREATE TABLE t1 (
+  pk MEDIUMINT NOT NULL AUTO_INCREMENT,
+  a INT NOT NULL,
+  b INT NOT NULL,
+  c INT NOT NULL,
+  d INT NOT NULL,
+  PRIMARY KEY pk (pk),
+  KEY idx_a (a),
+  KEY idx_b (b),
+  KEY idx_c (c),
+  KEY idx_d (d)
+);
+
+--disable_query_log
+
+# Inserting a lot of rows inorder to enable index_merge intersect
+
+INSERT INTO t1(a,b,c,d) VALUES
+               ( RAND()*5, RAND()*5, RAND()*5, RAND()*5 );
+ 
+let $cnt=4;
+while ($cnt)
+{
+  INSERT INTO t1(a,b,c,d) SELECT 6,6,6,6 FROM t1;
+  dec $cnt;
+}
+
+INSERT INTO t1(a,b,c,d) SELECT 6, RAND()*5, RAND()*5, 
+                                 RAND()*5 FROM t1 LIMIT 3;
+INSERT INTO t1(a,b,c,d) SELECT RAND()*5, 6, RAND()*5, 
+                                 RAND()*5 FROM t1 LIMIT 3;
+INSERT INTO t1(a,b,c,d) SELECT RAND()*5, RAND()*5, 6, 
+                                 RAND()*5 FROM t1 LIMIT 3;
+INSERT INTO t1(a,b,c,d) SELECT RAND()*5, RAND()*5, 
+                              RAND()*5, 6 FROM t1 LIMIT 3;
+
+let $cnt=7;
+while ($cnt)
+{
+  INSERT INTO t1(a,b,c,d) SELECT RAND()*5, RAND()*5, 
+                              RAND()*5, RAND()*5 FROM t1;
+  dec $cnt;
+}
+                      
+--enable_query_log    
+
+# The following statement analyzes and 
+# stores the key distribution for a table.
+
+ANALYZE TABLE t1;
+
+# DELETEs are not included as index merge intersection 
+# is disabled for DELETE statements.
+
+# 1. UPDATE
+
+--let $query = WHERE b=6 AND c=6 
+--replace_result "idx_c,idx_b" "idx_b,idx_c"
+--replace_column 9 #
+--eval EXPLAIN UPDATE t1 SET a=2 $query
+--eval SELECT COUNT(*), SUM(a) FROM t1 $query 
+--eval UPDATE t1 SET a=2 $query
+--eval SELECT COUNT(*), SUM(a) FROM t1 $query
+
+--let $query = WHERE b=6 AND c=6 AND d=6
+--replace_result idx_b idx_x idx_c idx_x idx_d idx_x
+--replace_column 9 #
+--eval EXPLAIN UPDATE t1 SET a=2 $query
+--eval SELECT COUNT(*), SUM(a) FROM t1 $query
+--eval UPDATE t1 SET a=2 $query
+--eval SELECT COUNT(*), SUM(a) FROM t1 $query
+
+--let $query = WHERE d=6 AND a IS NOT NULL AND b=6
+--replace_result "idx_d,idx_b" "idx_b,idx_d"
+--replace_column 9 #
+--eval EXPLAIN UPDATE t1 SET c=6 $query
+--eval SELECT COUNT(*), SUM(c) FROM t1 $query
+--eval UPDATE t1 SET c=6 $query
+--eval SELECT COUNT(*), SUM(c) FROM t1 $query
+
+--let $query = WHERE d=6 AND a=6  AND c <> 6
+--replace_column 9 #
+--eval EXPLAIN UPDATE t1 SET b=0 $query
+--eval SELECT COUNT(*), SUM(b) FROM t1 $query
+--eval UPDATE t1 SET b=0 $query
+--eval SELECT COUNT(*), SUM(b) FROM t1 $query
+
+--let $query = WHERE d=6 AND a=6 AND c IN (1,2,3,4,5)
+--replace_column 9 #
+--eval EXPLAIN UPDATE t1 SET a=100 $query
+--eval SELECT COUNT(*), SUM(a) FROM t1 $query
+--eval UPDATE t1 SET a=100 $query
+--eval SELECT COUNT(*), SUM(a) FROM t1 $query
+
+# uses range scan instead of index_merge
+
+--let $query = WHERE a=5 AND b=4 AND d<3
+--replace_column 9 #
+--eval EXPLAIN UPDATE t1 SET a=2 $query
+--eval UPDATE t1 SET a=2 $query
+
+# Any range condition over a primary key of an InnoDB table.
+
+create table t2 (
+  pk MEDIUMINT NOT NULL AUTO_INCREMENT,
+  a INT NOT NULL,
+  b INT NOT NULL,
+  c INT NOT NULL,
+  d INT NOT NULL,
+  PRIMARY KEY pk (pk),
+  KEY idx_a (a),
+  KEY idx_b (b),
+  KEY idx_c (c),
+  KEY idx_d (d)
+)engine=InnoDB;
+
+INSERT INTO t2 SELECT * FROM t1;
+ANALYZE TABLE t2;
+
+--let $query = WHERE pk<2492 AND d=1
+--replace_column 9 #
+--eval EXPLAIN UPDATE t2 SET a=2 $query
+--eval UPDATE t2 SET a=2 $query
+
+# 2. REPLACE and INSERT  
+
+CREATE TABLE t3(
+  a INT NOT NULL,
+  b INT NOT NULL,
+  c INT NOT NULL,
+  d INT NOT NULL,
+  e INT
+);
+
+INSERT INTO t3(a,b,c,d,e) VALUES (3890,3890,3890,3890,3890);
+INSERT INTO t3(a,b,c,d,e) VALUES (4000,4000,4000,4000,4000);
+
+--let $query = INTO t3 SELECT * FROM t1 WHERE b=6 AND c=6
+--replace_result "idx_c,idx_b" "idx_b,idx_c"
+--replace_column 9 #
+--eval EXPLAIN REPLACE $query
+--eval SELECT COUNT(*) FROM t3
+--eval REPLACE $query
+--eval SELECT COUNT(*) FROM t3
+
+--let $query = INTO t3 SELECT * FROM t1 WHERE d=6 AND a IS NOT NULL AND b=6
+--replace_column 9 #
+--replace_result "idx_d,idx_b" "idx_b,idx_d"
+--eval EXPLAIN INSERT $query
+--eval SELECT COUNT(*) FROM t3
+--eval INSERT $query
+--eval SELECT COUNT(*) FROM t3
+
+# Test case for multi column set-up.
+
+CREATE TABLE t4 (
+  pk MEDIUMINT NOT NULL AUTO_INCREMENT,
+  a INT NOT NULL,
+  b INT NOT NULL,
+  c INT NOT NULL,
+  d INT NOT NULL,
+  PRIMARY KEY pk (pk),
+  KEY idx_cd (c,d),
+  KEY idx_bd (b,d)
+);
+
+INSERT INTO t4 SELECT * FROM t1;
+
+# The following statement analyzes and 
+# stores the key distribution for a table.
+
+ANALYZE TABLE t4;
+
+--let $query = WHERE b=6 AND c=6 AND d=6
+--replace_result idx_b idx_x idx_c idx_x idx_d idx_x
+--replace_column 9 #
+--eval EXPLAIN UPDATE t4 SET a=2 $query
+--eval SELECT COUNT(*), SUM(a) FROM t4 $query
+--eval UPDATE t4 SET a=2 $query
+--eval SELECT COUNT(*), SUM(a)  FROM t4 $query
+
+DROP TABLE t1,t2,t3,t4;
+
+#
+# end of test cases for intersect index_merge optimization technique
+#
+
+
+

=== added file 'mysql-test/include/index_merge_multi_col_setup.inc'
--- mysql-test/include/index_merge_multi_col_setup.inc	1970-01-01 00:00:00 +0000
+++ mysql-test/include/index_merge_multi_col_setup.inc	2013-11-27 10:38:56 +0000
@@ -0,0 +1,75 @@
+#
+# Creating table with multi column index setup
+#
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+CREATE TABLE t1
+(
+  key1 INT NOT NULL,
+  key2 INT NOT NULL,
+  key3 INT NOT NULL,
+  key4 INT NOT NULL,
+  key5 INT,
+  key6 INT,
+  key7 INT NOT NULL,
+  key8 INT NOT NULL,
+  INDEX i1(key1,key2),
+  INDEX i2(key2,key1),
+  INDEX i3(key3,key4),
+  INDEX i4(key4,key3),
+  INDEX i5(key5,key6),
+  INDEX i6(key6,key5),
+  INDEX i7(key7,key8),
+  INDEX i8(key8,key7)
+);
+
+--disable_query_log
+
+
+# inserting values
+
+INSERT INTO t1 VALUES ( 1,1,1,1,1,1,1,1),(2,2,2,2,2,2,2,2);
+
+let $i=10;
+set @d=2;
+while($i)
+{
+  INSERT INTO t1 SELECT key1+@d, key2+@d, key3+@d, key4+@d,
+                            key5+@d, key6+@d, key7+@d, key8+@d FROM t1;
+  set @d=@d*2;
+  dec $i;
+}
+
+
+# Inserting null values.
+
+let $i=5;
+set @d=5;
+while($i)
+{
+  INSERT INTO t1 VALUES (key1+@d, key2+@d, key3+@d, key4+@d,
+                                        key5+@d, NULL, key7+@d, key8+@d);
+  set @d=@d*2;
+  dec $i;
+}
+
+let $i=4;
+set @d=6;
+while($i)
+{
+  INSERT INTO t1 VALUES (key1+@d, key2+@d, key3+@d, key4+@d,
+                                       NULL, key6+@d, key7+@d, key8+@d);
+  set @d=@d*2;
+  dec $i;
+}
+
+--enable_query_log
+
+# To analyze and store the key distribution of the table.
+
+ANALYZE TABLE t1;
+
+ 

=== added file 'mysql-test/include/index_merge_single_col_setup.inc'
--- mysql-test/include/index_merge_single_col_setup.inc	1970-01-01 00:00:00 +0000
+++ mysql-test/include/index_merge_single_col_setup.inc	2013-11-27 10:38:56 +0000
@@ -0,0 +1,72 @@
+#
+# Creating table with single column index setup
+#
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+CREATE TABLE t1
+(
+  key1 INT NOT NULL,
+  key2 INT NOT NULL,
+  key3 INT NOT NULL,
+  key4 INT NOT NULL,
+  key5 INT,
+  key6 INT,
+  key7 INT NOT NULL,
+  key8 INT NOT NULL,
+  INDEX i1(key1),
+  INDEX i2(key2),
+  INDEX i3(key3),
+  INDEX i4(key4),
+  INDEX i5(key5),
+  INDEX i6(key6)
+);
+
+--disable_query_log
+
+# inserting values 
+
+INSERT INTO t1 VALUES ( 1,1,1,1,1,1,1,1),(2,2,2,2,2,2,2,2);
+
+let $i=10;
+set @d=2;
+while($i)
+{
+  INSERT INTO t1 SELECT key1+@d, key2+@d, key3+@d, key4+@d,
+                            key5+@d, key6+@d, key7+@d, key8+@d FROM t1;
+  set @d=@d*2;
+  dec $i;
+}
+
+
+# inserting null values.
+
+let $i=5;
+set @d=5;
+while($i)
+{
+  INSERT INTO t1 VALUES (key1+@d, key2+@d, key3+@d, key4+@d,
+                                        key5+@d, NULL, key7+@d, key8+@d);
+  set @d=@d*2;
+  dec $i;
+}
+
+let $i=4;
+set @d=6;
+while($i)
+{
+  INSERT INTO t1 VALUES (key1+@d, key2+@d, key3+@d, key4+@d,
+                                       NULL, key6+@d, key7+@d, key8+@d);
+  set @d=@d*2;
+  dec $i;
+}
+
+--enable_query_log
+
+# The following statement analyzes and
+# stores the key distribution for a table.
+
+ANALYZE TABLE t1;
+

=== added file 'mysql-test/include/index_merge_update.inc'
--- mysql-test/include/index_merge_update.inc	1970-01-01 00:00:00 +0000
+++ mysql-test/include/index_merge_update.inc	2013-11-27 10:38:56 +0000
@@ -0,0 +1,130 @@
+# 
+# UPDATE statements using index_merge optimization
+# 
+
+# The include file works as intended only when index_merge_single_col_setup.inc
+# or index_merge_multi_col_setup.inc is used. The table t1 set-up is done in
+# these two include files.
+
+--disable_warnings
+DROP TABLE IF EXISTS t2;
+--enable_warnings
+
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t2 SELECT * FROM t1;
+ANALYZE TABLE t2;
+
+#1. UPDATE statements with various combinations of comparison operators
+
+# intersect optimization technique test cases for non-selects 
+# are in a separate file(index_merge_intersect_dml.inc) 
+# due to different table requirements. 
+
+# union and sort_union
+
+--let $query = WHERE key1=80 OR key4=49
+--replace_column 9 #
+--eval EXPLAIN UPDATE t1 SET key6=7 $query
+--eval SELECT COUNT(*), SUM(key6) FROM t1 $query
+--eval UPDATE t1 SET key6=7 $query
+--eval SELECT COUNT(*), SUM(key6) FROM t1 $query
+
+--let $query = WHERE (key3=80 AND key5 IS NULL) OR (key2=49 AND key6 IS NULL)
+--replace_column 9 #
+--eval EXPLAIN UPDATE t1 SET key1=18 $query
+--eval SELECT COUNT(*), SUM(key1) FROM t1 $query
+--eval UPDATE t1 SET key1=18 $query
+--eval SELECT COUNT(*), SUM(key1) FROM t1 $query
+
+--let $query = WHERE (key4=42 AND key6 IS NOT NULL) OR (key1>4 AND key5 IS NULL) AND key2<>50
+--replace_column 9 #
+--eval EXPLAIN UPDATE t1 SET key3=18 $query
+--eval SELECT COUNT(*), SUM(key3) FROM t1 $query
+--eval UPDATE t1 SET key3=18 $query
+--eval SELECT COUNT(*), SUM(key3) FROM t1 $query
+
+--let $query = WHERE key2=80 OR key3=1025 OR key4 <=> NULL
+--replace_column 9 #
+--eval EXPLAIN UPDATE t1 SET key8=64 $query
+--eval SELECT COUNT(*), SUM(key8) FROM t1 $query
+--eval UPDATE t1 SET key8=64 $query
+--eval SELECT COUNT(*), SUM(key8) FROM t1 $query
+
+--let $query = WHERE (key1 < 3 OR key2 < 2) AND (key3 < 3 OR key4 < 3) AND (key5 < 2 OR key6 < 2)
+--replace_column 9 #
+--eval EXPLAIN UPDATE t1 SET key8=18 $query
+--eval SELECT COUNT(*), SUM(key8) FROM t1 $query
+--eval UPDATE t1 SET key8=18 $query
+--eval SELECT COUNT(*), SUM(key8) FROM t1 $query
+
+--let $query = WHERE key1 between 25 AND 40 OR key2 between 15 AND 49
+--replace_column 9 #
+--eval EXPLAIN UPDATE t1 SET key3=32 $query
+--eval SELECT COUNT(*), SUM(key3) FROM t1 $query
+--eval UPDATE t1 SET key3=32 $query
+--eval SELECT COUNT(*), SUM(key3) FROM t1 $query
+
+--let $query = WHERE key1 IN (15,70) OR key2 IN (15,70)
+--replace_column 9 #
+--eval EXPLAIN UPDATE t1 SET key7=25 $query
+--eval SELECT COUNT(*), SUM(key7) FROM t1 $query
+--eval UPDATE t1 SET key7=25 $query
+--eval SELECT COUNT(*), SUM(key7) FROM t1 $query
+
+#2. Statement with ORDER BY
+
+--let $query = WHERE key5<5 OR key8<10 ORDER BY key1
+--replace_column 9 #
+--eval EXPLAIN UPDATE t1 SET key1=10 $query
+--eval SELECT COUNT(*), SUM(key1) FROM t1 $query
+--eval UPDATE t1 SET key1=10 $query
+--eval SELECT COUNT(*), SUM(key1) FROM t1 $query
+
+#3. Multi table SQL statements
+
+--let $query = t1 left join t2 ON (t2.key1=t2.key1) SET t1.key4=15 WHERE t1.key5=40 OR t1.key4=15
+--replace_column 9 #
+--eval EXPLAIN UPDATE $query
+SELECT COUNT(*), SUM(key4) FROM t1; 
+--eval UPDATE $query
+SELECT COUNT(*), SUM(key4) FROM t1;
+
+# Statements with subqueries
+
+--let $query2 = key6 < ANY (SELECT key6 FROM t1 WHERE key1=10 OR key5=3)
+--let $query1 = WHERE (key3=28 OR key4=10) 
+--replace_column 9 #
+--eval EXPLAIN UPDATE t2 SET key7=7 $query1 AND $query2
+--eval SELECT COUNT(*), SUM(key7) FROM t2 $query1 AND $query2
+--eval UPDATE t2 SET key7=7 $query1 AND $query2
+--eval SELECT COUNT(*), SUM(key7) FROM t2 $query1 AND $query2
+
+--let $query3 = key1 < ANY (SELECT key1 FROM t1 WHERE key1<5 OR key4<7)
+--let $query2 = key4 < SOME (SELECT key4 FROM t1 WHERE key1<5 OR key4<8)
+--let $query1 = WHERE key1=25 OR key4=40
+--replace_column 9 #
+--eval EXPLAIN UPDATE t2 SET key2=2 $query1 AND ($query2 OR $query3)
+--eval SELECT COUNT(*), SUM(key2) FROM t2 $query1 AND ($query2 OR $query3)
+--eval UPDATE t2 SET key2=2 $query1 AND ($query2 OR $query3)
+--eval SELECT COUNT(*), SUM(key2) FROM t2 $query1 AND ($query2 OR $query3)
+
+--let $query = WHERE EXISTS (SELECT * FROM t1 WHERE key6<3 OR key4<10)
+--replace_column 9 #
+--eval EXPLAIN UPDATE t2 SET key3=20 $query
+--eval SELECT COUNT(*), SUM(key3) FROM t2 $query
+--eval UPDATE t2 SET key3=20 $query
+--eval SELECT COUNT(*), SUM(key3) FROM t2 $query
+
+# The following statement doesn't use index_merge optimization technique when 
+# the table is created with single column index setup.
+
+--let $query = WHERE key5=80 OR key6=49
+--replace_column 9 #
+--eval EXPLAIN UPDATE t1 SET key8=50 $query
+--eval SELECT COUNT(*), SUM(key8) FROM t1 $query
+--eval UPDATE t1 SET key8=50 $query
+--eval SELECT COUNT(*), SUM(key8) FROM t1 $query
+
+#
+# end of UPDATE statements
+#

=== added file 'mysql-test/include/install_semisync.inc'
--- mysql-test/include/install_semisync.inc	1970-01-01 00:00:00 +0000
+++ mysql-test/include/install_semisync.inc	2013-11-27 10:38:56 +0000
@@ -0,0 +1,39 @@
+#
+# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+#
+--let $include_filename= install_semisync.inc
+--source include/begin_include_file.inc
+
+--source include/not_embedded.inc
+--source include/not_gtid_enabled.inc
+--source include/have_semisync_plugin.inc
+
+--connection master
+
+--disable_query_log
+--let $value = query_get_value(show variables like 'rpl_semi_sync_master_enabled', Value, 1)
+if ($value == No such row)
+{
+    SET sql_log_bin = 0;
+    eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_PLUGIN';
+    SET GLOBAL rpl_semi_sync_master_enabled = 1;
+    SET sql_log_bin = 1;
+}
+--enable_query_log
+
+--connection slave
+--source include/stop_slave_io.inc
+
+--disable_query_log
+--let $value= query_get_value(show variables like 'rpl_semi_sync_slave_enabled', Value, 1)
+if ($value == No such row)
+{
+    SET sql_log_bin = 0;
+    eval INSTALL PLUGIN rpl_semi_sync_slave SONAME '$SEMISYNC_SLAVE_PLUGIN';
+    SET GLOBAL rpl_semi_sync_slave_enabled = 1;
+    SET sql_log_bin = 1;
+}
+--source include/start_slave_io.inc
+--enable_query_log
+
+--source include/end_include_file.inc

=== modified file 'mysql-test/include/mtr_warnings.sql'
--- mysql-test/include/mtr_warnings.sql	2012-12-14 10:16:24 +0000
+++ mysql-test/include/mtr_warnings.sql	2013-11-27 10:38:56 +0000
@@ -1,4 +1,4 @@
--- Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (c) 2008, 2013, 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
@@ -241,7 +241,9 @@
   */
  ("Slave SQL: Coordinator thread of multi-threaded slave is being stopped in the middle of assigning a group of events.*"),
  
- ("Changed limits: max_open_files: *  max_connections: *  table_cache: *"),
+ ("Changed limits: max_open_files: *"),
+ ("Changed limits: max_connections: *"),
+ ("Changed limits: table_cache: *"),
  ("Could not increase number of max_open_files to more than *"),
 
  ("THE_LAST_SUPPRESSION")||

=== added file 'mysql-test/include/restart_readonly_mysqld.inc'
--- mysql-test/include/restart_readonly_mysqld.inc	1970-01-01 00:00:00 +0000
+++ mysql-test/include/restart_readonly_mysqld.inc	2013-11-27 10:38:56 +0000
@@ -0,0 +1,21 @@
+# Write file to make mysql-test-run.pl expect the "crash", but don't start
+# it until it's told to
+--let $_server_id= `SELECT @@server_id`
+--let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.$_server_id.expect
+--exec echo "wait" > $_expect_file_name
+
+# Send shutdown to the connected server and give
+# it 10 seconds to die before zapping it
+shutdown_server 10;
+
+# Write file to make mysql-test-run.pl start up the server again
+--exec echo "restart: --innodb-read-only " > $_expect_file_name
+
+# Turn on reconnect
+--enable_reconnect
+
+# Call script that will poll the server waiting for it to be back online again
+--source include/wait_until_connected_again.inc
+
+# Turn off reconnect again
+--disable_reconnect

=== modified file 'mysql-test/include/rpl_stop_server.inc'
--- mysql-test/include/rpl_stop_server.inc	2012-01-16 22:21:16 +0000
+++ mysql-test/include/rpl_stop_server.inc	2013-11-27 10:38:56 +0000
@@ -47,8 +47,8 @@
 --exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.$rpl_server_number.expect
 
 # Send shutdown to the connected server and give
-# it 10 seconds to die before zapping it
-shutdown_server 10;
+# it 14 seconds to die before zapping it
+shutdown_server 14;
 
 --source include/wait_until_disconnected.inc
 

=== modified file 'mysql-test/include/select.inc'
--- mysql-test/include/select.inc	2013-01-29 08:42:47 +0000
+++ mysql-test/include/select.inc	2013-11-27 10:38:56 +0000
@@ -2455,6 +2455,8 @@
 
 create table t1 (s1 int);
 insert into t1 values (null),(1);
+select avg(s1) as x from t1 group by s1 with rollup;
+--error ER_WRONG_USAGE
 select distinct avg(s1) as x from t1 group by s1 with rollup;
 drop table t1;
 

=== modified file 'mysql-test/include/shutdown_mysqld.inc'
--- mysql-test/include/shutdown_mysqld.inc	2012-06-15 15:32:44 +0000
+++ mysql-test/include/shutdown_mysqld.inc	2013-11-27 10:38:56 +0000
@@ -13,6 +13,6 @@
 --exec echo "wait" > $_expect_file_name
 
 # Send shutdown to the connected server
---shutdown_server 10
+--shutdown_server
 --source include/wait_until_disconnected.inc
 

=== modified file 'mysql-test/include/start_slave_sql.inc'
--- mysql-test/include/start_slave_sql.inc	2011-05-05 09:58:48 +0000
+++ mysql-test/include/start_slave_sql.inc	2013-11-27 10:38:56 +0000
@@ -32,7 +32,7 @@
 
 
 START SLAVE SQL_THREAD;
---source include/wait_for_slave_io_to_start.inc
+--source include/wait_for_slave_sql_to_start.inc
 
 
 --let $include_filename= start_slave_sql.inc

=== modified file 'mysql-test/include/subquery.inc'
--- mysql-test/include/subquery.inc	2012-07-10 11:59:40 +0000
+++ mysql-test/include/subquery.inc	2013-11-27 10:38:56 +0000
@@ -4715,6 +4715,10 @@
 
 --error ER_BAD_FIELD_ERROR
 EXPLAIN EXTENDED SELECT DISTINCT 1 FROM t1,
+(SELECT a AS away FROM t1 GROUP BY a WITH ROLLUP) AS d1  
+WHERE t1.a = d1.a;
+--error ER_WRONG_USAGE
+EXPLAIN EXTENDED SELECT DISTINCT 1 FROM t1,
 (SELECT DISTINCTROW a AS away FROM t1 GROUP BY a WITH ROLLUP) AS d1  
 WHERE t1.a = d1.a;
 

=== modified file 'mysql-test/include/test_fieldsize.inc'
--- mysql-test/include/test_fieldsize.inc	2012-03-06 14:29:42 +0000
+++ mysql-test/include/test_fieldsize.inc	2013-11-27 10:38:56 +0000
@@ -22,8 +22,7 @@
 eval $test_insert;
 
 connection slave;
---let $slave_sql_errno= 1677
---let $show_slave_sql_error= 1
+--let $slave_sql_errno= convert_error(ER_SLAVE_CONVERSION_FAILED) # 1677
 --source include/wait_for_slave_sql_error.inc
 
 # The following should be 0

=== added file 'mysql-test/include/uninstall_semisync.inc'
--- mysql-test/include/uninstall_semisync.inc	1970-01-01 00:00:00 +0000
+++ mysql-test/include/uninstall_semisync.inc	2013-11-27 10:38:56 +0000
@@ -0,0 +1,23 @@
+#
+# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+#
+--let $include_filename= uninstall_semisync.inc
+--source include/begin_include_file.inc
+
+--disable_query_log
+--connection slave
+--source include/stop_slave_io.inc
+
+# Uninstall rpl_semi_sync_slave first
+--disable_warnings
+UNINSTALL PLUGIN rpl_semi_sync_slave;
+
+--connection master
+UNINSTALL PLUGIN rpl_semi_sync_master;
+--enable_warnings
+
+--connection slave
+--source include/start_slave_io.inc
+--enable_query_log
+
+--source include/end_include_file.inc

=== modified file 'mysql-test/lib/My/CoreDump.pm'
--- mysql-test/lib/My/CoreDump.pm	2012-04-20 05:23:24 +0000
+++ mysql-test/lib/My/CoreDump.pm	2013-11-27 10:38:56 +0000
@@ -1,5 +1,5 @@
 # -*- cperl -*-
-# Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2013, 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
@@ -261,13 +261,17 @@
 
 
 sub show {
-  my ($class, $core_name, $exe_mysqld)= @_;
+  my ($class, $core_name, $exe_mysqld, $parallel)= @_;
   $hint_mysqld= $exe_mysqld;
 
   # On Windows, rely on cdb to be there...
   if (IS_WINDOWS)
   {
-    _cdb($core_name);
+    # Starting cdb is unsafe when used with --parallel > 1 option 
+    if ( $parallel < 2 )
+    {
+      _cdb($core_name);
+    }
     return;
   }
   

=== modified file 'mysql-test/lib/My/SafeProcess/CMakeLists.txt'
--- mysql-test/lib/My/SafeProcess/CMakeLists.txt	2013-02-26 05:45:28 +0000
+++ mysql-test/lib/My/SafeProcess/CMakeLists.txt	2013-11-27 10:38:56 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2013, 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
@@ -13,6 +13,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
+IF (NOT INSTALL_MYSQLTESTDIR)
+  RETURN()
+ENDIF()
+
 SET(INSTALL_ARGS 
   DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" 
   COMPONENT Test
@@ -25,8 +29,16 @@
   MYSQL_ADD_EXECUTABLE(my_safe_process safe_process.cc ${INSTALL_ARGS})
 ENDIF()
 
-INSTALL(TARGETS my_safe_process DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test)
+INSTALL(TARGETS my_safe_process
+  DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test
+)
+
 IF(WIN32)
-  INSTALL(TARGETS my_safe_kill DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test)
+  INSTALL(TARGETS my_safe_kill
+    DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test
+  )
 ENDIF()
-INSTALL(FILES Base.pm DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test)
+
+INSTALL(FILES Base.pm
+  DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test
+)

=== modified file 'mysql-test/lib/My/SafeProcess/safe_process.cc'
--- mysql-test/lib/My/SafeProcess/safe_process.cc	2013-02-26 05:45:28 +0000
+++ mysql-test/lib/My/SafeProcess/safe_process.cc	2013-11-27 10:38:56 +0000
@@ -11,7 +11,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 
 /*

=== modified file 'mysql-test/lib/My/SysInfo.pm'
--- mysql-test/lib/My/SysInfo.pm	2012-03-06 14:29:42 +0000
+++ mysql-test/lib/My/SysInfo.pm	2013-11-27 10:38:56 +0000
@@ -1,5 +1,5 @@
 # -*- cperl -*-
-# Copyright (c) 2008 MySQL AB, 2008 Sun Microsystems, Inc.
+# Copyright (c) 2013 MySQL AB, 2008 Sun Microsystems, Inc.
 # Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -60,7 +60,7 @@
     }
 
     # Make sure bogomips is set to some value
-    $cpuinfo->{bogomips} |= DEFAULT_BOGO_MIPS;
+    $cpuinfo->{bogomips} ||= DEFAULT_BOGO_MIPS;
 
     # Cpus reported once, but with 'cpu_count' set to the actual number
     my $cpu_count= $cpuinfo->{cpu_count} || 1;

=== modified file 'mysql-test/lib/v1/mysql-test-run.pl'
--- mysql-test/lib/v1/mysql-test-run.pl	2013-02-26 05:45:28 +0000
+++ mysql-test/lib/v1/mysql-test-run.pl	2013-11-27 10:38:56 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # -*- cperl -*-
 
-# Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2013, 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
@@ -133,7 +133,6 @@
 our $path_snapshot;
 our $path_mysqltest_log;
 our $path_current_test_log;
-our $path_my_basedir;
 
 our $opt_vardir;                 # A path but set directly on cmd line
 our $path_vardir_trace;          # unix formatted opt_vardir for trace files
@@ -765,8 +764,6 @@
   $glob_mysql_bench_dir= undef
     unless -d $glob_mysql_bench_dir;
 
-  $path_my_basedir=
-    $source_dist ? $glob_mysql_test_dir : $glob_basedir;
 
   $glob_timers= mtr_init_timers();
 
@@ -3142,7 +3139,7 @@
   mtr_init_args(\$args);
   mtr_add_arg($args, "--no-defaults");
   mtr_add_arg($args, "--bootstrap");
-  mtr_add_arg($args, "--basedir=%s", $path_my_basedir);
+  mtr_add_arg($args, "--basedir=%s", $glob_basedir);
   mtr_add_arg($args, "--datadir=%s", $data_dir);
   mtr_add_arg($args, "--loose-skip-ndbcluster");
   mtr_add_arg($args, "--tmpdir=.");
@@ -3292,7 +3289,7 @@
 log-error           = $instance->{path_datadir}/mysqld$server_id.err.log
 log-slow-queries    = $instance->{path_datadir}/mysqld$server_id.slow.log
 character-sets-dir  = $path_charsetsdir
-basedir             = $path_my_basedir
+basedir             = $glob_basedir
 server_id           = $server_id
 shutdown-delay      = 10
 skip-stack-trace
@@ -3883,7 +3880,7 @@
 
   mtr_add_arg($args, "%s--no-defaults", $prefix);
 
-  mtr_add_arg($args, "%s--basedir=%s", $prefix, $path_my_basedir);
+  mtr_add_arg($args, "%s--basedir=%s", $prefix, $glob_basedir);
   mtr_add_arg($args, "%s--character-sets-dir=%s", $prefix, $path_charsetsdir);
 
   if ( $mysql_version_id >= 50036)
@@ -4075,7 +4072,7 @@
   }
 
   mtr_add_arg($args, "%s--key_buffer_size=1M", $prefix);
-  mtr_add_arg($args, "%s--sort_buffer=256K", $prefix);
+  mtr_add_arg($args, "%s--sort_buffer_size=256K", $prefix);
   mtr_add_arg($args, "%s--max_heap_table_size=1M", $prefix);
 
   if ( $opt_ssl_supported )

=== modified file 'mysql-test/mysql-test-run.pl'
--- mysql-test/mysql-test-run.pl	2013-02-20 09:31:47 +0000
+++ mysql-test/mysql-test-run.pl	2013-11-27 10:38:56 +0000
@@ -646,7 +646,7 @@
 			   mtr_report(" - found '$core_name'",
 				      "($num_saved_cores/$opt_max_save_core)");
 
-			   My::CoreDump->show($core_file, $exe_mysqld);
+			   My::CoreDump->show($core_file, $exe_mysqld, $opt_parallel);
 
 			   if ($num_saved_cores >= $opt_max_save_core) {
 			     mtr_report(" - deleting it, already saved",
@@ -2059,7 +2059,17 @@
   }
   else
   {
-    $exe_mysqltest= mtr_exe_exists("$path_client_bindir/mysqltest");
+    if ( defined $ENV{'MYSQL_TEST'} )
+    {
+      $exe_mysqltest=$ENV{'MYSQL_TEST'};
+      print "===========================================================\n";
+      print "WARNING:The mysqltest binary is fetched from $exe_mysqltest\n";
+      print "===========================================================\n";
+    }
+    else
+    {
+      $exe_mysqltest= mtr_exe_exists("$path_client_bindir/mysqltest");
+    }
   }
 
 }
@@ -2215,7 +2225,7 @@
     mtr_error("Lines in $defs_file must have 3 or 4 items") unless $plug_var;
 
     # If running debug server, plugins will be in 'debug' subdirectory
-    $plug_file= "debug/$plug_file" if $running_debug;
+    $plug_file= "debug/$plug_file" if $running_debug && !$source_dist;
 
     my ($plugin)= find_plugin($plug_file, $plug_loc);
 

=== modified file 'mysql-test/purify.supp'
--- mysql-test/purify.supp	2010-12-28 18:57:23 +0000
+++ mysql-test/purify.supp	2013-11-27 10:38:56 +0000
@@ -12,8 +12,8 @@
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA
 
 suppress UMR rw_read_held; mi_open; ha_myisam::open64; handler::ha_open; openfrm
 suppress UMR my_end; main

=== modified file 'mysql-test/r/auth_rpl.result'
--- mysql-test/r/auth_rpl.result	2012-03-30 04:28:39 +0000
+++ mysql-test/r/auth_rpl.result	2013-11-27 10:38:56 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	####	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 [connection slave]
 include/stop_slave.inc
@@ -16,7 +16,7 @@
 MASTER_RETRY_COUNT= 0;
 Warnings:
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	####	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 include/start_slave.inc
 # Slave in-sync with master now.
 SELECT user, plugin, authentication_string FROM mysql.user WHERE user LIKE 'plug_user';
@@ -27,7 +27,7 @@
 CHANGE MASTER TO MASTER_USER='root';
 Warnings:
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	####	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 DROP USER 'plug_user';
 # Cleanup (on master).
 DROP USER 'plug_user';

=== modified file 'mysql-test/r/create.result'
--- mysql-test/r/create.result	2012-10-22 08:08:04 +0000
+++ mysql-test/r/create.result	2013-11-27 10:38:56 +0000
@@ -878,9 +878,10 @@
 unlock tables;
 lock table t1 read, t2 read;