Merge lp:~laurynas-biveinis/percona-server/merge-5.6.11 into lp:percona-server/5.6

[Laurynas Biveinis]

http://jenkins.percona.com/job/percona-server-5.6-param/94/

Merge MySQL 5.6.11. Non-automerge bits:

- Removing our log_slow_admin_statements and log_slow_sp_statements
  variables due to upstream implementation.

- Trivial XtraDB adjustments around fake changes code.

- Removing our RETURN_IF_INNODB_NOT_STARTED calls now that upstream
  added them.

- Merge our threadpool implementation, featuring vio->shutdown
  function pointer with the upstream changes that introduce
  vio->vioshutdown function pointer. Both implementations are very
  similar, except that the upstream passes SHUT_RDWR unconditionally
  and the threadpool passes SHUT_RD for handling KILLs. Resolve by
  adding "how" arg to vio->vioshutdown and moving the relevant bits
  from vio_socket_shutdown() to vio_shutdown(). Then threadpool's
  vio->shutdown pointer and all supporting code is removed. At the
  same time fix bug 1177780 (Unused declarations
  vio_shutdown_shared_memory(Vio*, int) and vio_shutdown_pipe(Vio*,
  int)).

- Revert our fix for bug 1042946 due to the upstream fix.

[Alexey Kopytov (akopytov)]

Looks good, but setting to WiP as it is unclear whether the dependent branch will be resubmitted.

review: Approve

=== modified file 'Percona-Server/BUILD-CMAKE'
--- Percona-Server/BUILD-CMAKE	2011-06-30 15:50:45 +0000
+++ Percona-Server/BUILD-CMAKE	2013-05-12 06:41:27 +0000
@@ -1,2 +1,4 @@
 The latest information about building MySQL with CMake is located on 
-http://forge.mysql.com/wiki/CMake
\ No newline at end of file
+http://dev.mysql.com/doc/internals/en/cmake.html
+
+See also BUILD/README

=== modified file 'Percona-Server/BUILD/SETUP.sh'
--- Percona-Server/BUILD/SETUP.sh	2012-05-09 16:47:39 +0000
+++ Percona-Server/BUILD/SETUP.sh	2013-05-12 06:41:27 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public

=== modified file 'Percona-Server/BUILD/build_mccge.sh'
--- Percona-Server/BUILD/build_mccge.sh	2012-05-09 16:47:39 +0000
+++ Percona-Server/BUILD/build_mccge.sh	2013-05-12 06:41:27 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public

=== modified file 'Percona-Server/BUILD/compile-pentium'
--- Percona-Server/BUILD/compile-pentium	2012-08-22 01:40:20 +0000
+++ Percona-Server/BUILD/compile-pentium	2013-05-12 06:41:27 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== removed file 'Percona-Server/Docs/glibc-2.2.5.patch'
--- Percona-Server/Docs/glibc-2.2.5.patch	2002-05-26 13:11:29 +0000
+++ Percona-Server/Docs/glibc-2.2.5.patch	1970-01-01 00:00:00 +0000
@@ -1,137 +0,0 @@
-diff -r -c --exclude='*.info*' glibc-2.2.5.org/linuxthreads/internals.h glibc-2.2.5/linuxthreads/internals.h
-*** glibc-2.2.5.org/linuxthreads/internals.h	Thu Nov 29 08:44:16 2001
---- glibc-2.2.5/linuxthreads/internals.h	Tue May 21 10:51:53 2002
-***************
-*** 343,349 ****
-     THREAD_SELF implementation is used, this must be a power of two and
-     a multiple of PAGE_SIZE.  */
-  #ifndef STACK_SIZE
-! #define STACK_SIZE  (2 * 1024 * 1024)
-  #endif
-  
-  /* The initial size of the thread stack.  Must be a multiple of PAGE_SIZE.  */
---- 343,349 ----
-     THREAD_SELF implementation is used, this must be a power of two and
-     a multiple of PAGE_SIZE.  */
-  #ifndef STACK_SIZE
-! #define STACK_SIZE  (128 * 1024)
-  #endif
-  
-  /* The initial size of the thread stack.  Must be a multiple of PAGE_SIZE.  */
-diff -r -c --exclude='*.info*' glibc-2.2.5.org/linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h glibc-2.2.5/linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h
-*** glibc-2.2.5.org/linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h	Thu Jun  8 21:49:49 2000
---- glibc-2.2.5/linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h	Tue May 21 10:52:58 2002
-***************
-*** 64,70 ****
-  /* The number of threads per process.  */
-  #define _POSIX_THREAD_THREADS_MAX	64
-  /* This is the value this implementation supports.  */
-! #define PTHREAD_THREADS_MAX	1024
-  
-  /* Maximum amount by which a process can descrease its asynchronous I/O
-     priority level.  */
---- 64,70 ----
-  /* The number of threads per process.  */
-  #define _POSIX_THREAD_THREADS_MAX	64
-  /* This is the value this implementation supports.  */
-! #define PTHREAD_THREADS_MAX	4096
-  
-  /* Maximum amount by which a process can descrease its asynchronous I/O
-     priority level.  */
-diff -r -c --exclude='*.info*' glibc-2.2.5.org/nss/nsswitch.c glibc-2.2.5/nss/nsswitch.c
-*** glibc-2.2.5.org/nss/nsswitch.c	Tue Jul 17 10:21:36 2001
---- glibc-2.2.5/nss/nsswitch.c	Tue May 21 10:59:55 2002
-***************
-*** 496,501 ****
---- 496,502 ----
-      {
-        service_user *new_service;
-        const char *name;
-+ 			int name_alloc_len;
-  
-        while (isspace (line[0]))
-  	++line;
-***************
-*** 510,522 ****
-        if (name == line)
-  	return result;
-  
-  
-        new_service = (service_user *) malloc (sizeof (service_user)
-! 					     + (line - name + 1));
-        if (new_service == NULL)
-  	return result;
-  
-!       *((char *) __mempcpy (new_service->name, name, line - name)) = '\0';
-  
-        /* Set default actions.  */
-        new_service->actions[2 + NSS_STATUS_TRYAGAIN] = NSS_ACTION_CONTINUE;
---- 511,534 ----
-        if (name == line)
-  	return result;
-  
-+       name_alloc_len = line - name + 1;
-+ 
-+ #ifdef DO_STATIC_NSS
-+       if (!((name_alloc_len == 6 && strncmp(name,"files",5) == 0) ||
-+       (name_alloc_len == 4 && strncmp(name,"dns",3) == 0)))
-+       {
-+         name = (char*) "files";
-+         name_alloc_len = 6;
-+       }
-+ #endif
-  
-        new_service = (service_user *) malloc (sizeof (service_user)
-! 					     + name_alloc_len);
-        if (new_service == NULL)
-  	return result;
-  
-!       *((char *) __mempcpy (new_service->name, name, name_alloc_len-1)) = '\0';
-! 
-  
-        /* Set default actions.  */
-        new_service->actions[2 + NSS_STATUS_TRYAGAIN] = NSS_ACTION_CONTINUE;
-diff -r -c --exclude='*.info*' glibc-2.2.5.org/time/Makefile glibc-2.2.5/time/Makefile
-*** glibc-2.2.5.org/time/Makefile	Fri Aug 10 01:59:41 2001
---- glibc-2.2.5/time/Makefile	Tue May 21 11:01:11 2002
-***************
-*** 37,44 ****
-  
-  include ../Rules
-  
-! tz-cflags = -DTZDIR='"$(zonedir)"' \
-! 	    -DTZDEFAULT='"$(localtime-file)"' \
-  	    -DTZDEFRULES='"$(posixrules-file)"'
-  
-  CFLAGS-tzfile.c = $(tz-cflags)
---- 37,44 ----
-  
-  include ../Rules
-  
-! tz-cflags = -DTZDIR='"/usr/share/zoneinfo/"' \
-! 	    -DTZDEFAULT='"/etc/localtime"' \
-  	    -DTZDEFRULES='"$(posixrules-file)"'
-  
-  CFLAGS-tzfile.c = $(tz-cflags)
-diff -r -c --exclude='*.info*' glibc-2.2.5.org/timezone/Makefile glibc-2.2.5/timezone/Makefile
-*** glibc-2.2.5.org/timezone/Makefile	Thu Aug 30 00:45:25 2001
---- glibc-2.2.5/timezone/Makefile	Tue May 21 11:01:57 2002
-***************
-*** 159,166 ****
-  
-  $(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o
-  
-! tz-cflags = -DTZDIR='"$(zonedir)"' \
-! 	    -DTZDEFAULT='"$(localtime-file)"' \
-  	    -DTZDEFRULES='"$(posixrules-file)"' \
-  	    -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone
-  
---- 159,166 ----
-  
-  $(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o
-  
-! tz-cflags = -DTZDIR='"/usr/share/zoneinfo/"' \
-! 	    -DTZDEFAULT='"/etc/localtime"' \
-  	    -DTZDEFRULES='"$(posixrules-file)"' \
-  	    -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone
-  

=== removed file 'Percona-Server/Docs/linuxthreads.txt'
--- Percona-Server/Docs/linuxthreads.txt	2007-03-22 18:38:56 +0000
+++ Percona-Server/Docs/linuxthreads.txt	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-[Note this information is obsolete]
-
-Notes on compiling glibc for the standard MySQL binary:
-
- - make sure you have gcc 2.95 and gmake 3.79 or newer
- - wget ftp://ftp.gnu.org/pub/gnu/glibc/glibc-2.2.5.tar.gz
- - wget ftp://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-2.2.5.tar.gz
- - tar zxvf glibc-2.2.5.tar.gz ; cd glibc-2.2.5 ;
-   tar zxvf ../glibc-linuxthreads-2.2.5.tar.gz
- - patch -p1 < ~/bk/mysql/Docs/glibc-2.2.5.patch
- - ./configure --prefix=/usr/local/mysql-glibc --enable-static-nss \
-  --disable-shared --enable-add-ons=linuxthreads --target=i386 \
-  --host=i386-pc-linux-gnu
- - make
- - possible problems - if compiler is not properly installed, one can get
- "cpp: too many input" files error - easiest way to solve - SUSE RPM for gcc
- 2.95
- - surun make install
- - To build the binaries, run Build-tools/Do-linux-build

=== modified file 'Percona-Server/README'
--- Percona-Server/README	2012-04-11 11:45:07 +0000
+++ Percona-Server/README	2013-05-12 06:41:27 +0000
@@ -5,7 +5,7 @@
 is released under the version 2 of the GNU General Public License. 
 MySQL is brought to you by Oracle.
 
-Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
 
 License information can be found in the COPYING file.
 

=== modified file 'Percona-Server/VERSION'
--- Percona-Server/VERSION	2013-03-05 12:46:43 +0000
+++ Percona-Server/VERSION	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=6
-MYSQL_VERSION_PATCH=10
+MYSQL_VERSION_PATCH=11
 MYSQL_VERSION_EXTRA=

=== modified file 'Percona-Server/client/completion_hash.h'
--- Percona-Server/client/completion_hash.h	2011-04-14 15:40:04 +0000
+++ Percona-Server/client/completion_hash.h	2013-05-12 06:41:27 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2002 MySQL AB
+/* Copyright (c) 2000-2002, 2006 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public

=== modified file 'Percona-Server/client/echo.c'
--- Percona-Server/client/echo.c	2010-10-27 11:32:32 +0000
+++ Percona-Server/client/echo.c	2013-05-12 06:41:27 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2007 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/client/mysql.cc'
--- Percona-Server/client/mysql.cc	2013-05-12 06:39:35 +0000
+++ Percona-Server/client/mysql.cc	2013-05-12 06:41:27 +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
@@ -2951,7 +2951,7 @@
         mysql_free_result(fields);
         break;
       }
-      field_names[i][num_fields*2]= '\0';
+      field_names[i][num_fields*2]= NULL;
       j=0;
       while ((sql_field=mysql_fetch_field(fields)))
       {

=== modified file 'Percona-Server/client/mysql_config_editor.cc'
--- Percona-Server/client/mysql_config_editor.cc	2012-10-28 03:26:15 +0000
+++ Percona-Server/client/mysql_config_editor.cc	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 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
@@ -50,14 +50,14 @@
 */
 static size_t file_size;
 static char *opt_user= NULL, *opt_password= NULL, *opt_host=NULL,
-            *opt_login_path= NULL;
+            *opt_login_path= NULL, *opt_socket= NULL, *opt_port= NULL;
 
 static char my_login_file[FN_REFLEN];
 static char my_key[LOGIN_KEY_LEN];
 
 static my_bool opt_verbose, opt_all, tty_password= 0, opt_warn,
                opt_remove_host, opt_remove_pass, opt_remove_user,
-               login_path_specified= FALSE;
+               opt_remove_socket, opt_remove_port, login_path_specified= FALSE;
 
 static int execute_commands(int command);
 static int set_command(void);
@@ -141,6 +141,10 @@
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"user", 'u', "User name to be entered into the login file.", &opt_user,
    &opt_user, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  {"socket", 'S', "Socket path to be entered into login file.", &opt_socket,
+   &opt_socket, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  {"port", 'P', "Port number to be entered into login file.", &opt_port,
+   &opt_port, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"warn", 'w', "Warn and ask for confirmation if set command attempts to "
    "overwrite an existing login path (enabled by default).",
    &opt_warn, &opt_warn, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
@@ -157,8 +161,9 @@
    0, 0, 0},
   {"login-path", 'G', "Name of the login path from which options to "
    "be removed (entire path would be removed if none of user, password, "
-   "or host options are specified). (Default : client)", &opt_login_path,
-   &opt_login_path, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+   "host, socket, or port options are specified). (Default : client)",
+   &opt_login_path, &opt_login_path, 0, GET_STR, REQUIRED_ARG,
+   0, 0, 0, 0, 0, 0},
   {"password", 'p', "Remove password from the login path.",
    &opt_remove_pass, &opt_remove_pass, 0, GET_BOOL, NO_ARG, 0, 0, 0,
    0, 0, 0},
@@ -168,6 +173,10 @@
    "to remove the default login path (client) if no login path is specified "
    "(enabled by default).", &opt_warn, &opt_warn, 0, GET_BOOL, NO_ARG, 1,
    0, 0, 0, 0, 0},
+  {"socket", 'S', "Remove socket path from the login path.", &opt_remove_socket,
+   &opt_remove_socket, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+  {"port", 'P', "Remove port number from the login path.", &opt_remove_port,
+   &opt_remove_port, 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}
 };
 
@@ -229,6 +238,13 @@
     tty_password= 1;
     break;
   case 'G':
+    if (login_path_specified)
+    {
+      /* Error, we do not support multiple login paths. */
+      my_perror("Error: Use of multiple login paths is not supported. "
+                "Exiting..");
+      return 1;
+    }
     login_path_specified= TRUE;
     break;
   case '?':
@@ -246,6 +262,13 @@
 {
   switch(optid) {
   case 'G':
+    if (login_path_specified)
+    {
+      /* Error, we do not support multiple login paths. */
+      my_perror("Error: Use of multiple login paths is not supported. "
+                "Exiting..");
+      return 1;
+    }
     login_path_specified= TRUE;
     break;
   case '?':
@@ -263,6 +286,13 @@
 {
   switch(optid) {
   case 'G':
+    if (login_path_specified)
+    {
+      /* Error, we do not support multiple login paths. */
+      my_perror("Error: Use of multiple login paths is not supported. "
+                "Exiting..");
+      return 1;
+    }
     login_path_specified= TRUE;
     break;
   case '?':
@@ -537,6 +567,18 @@
     dynstr_append(&path_buf, opt_host);
   }
 
+  if (opt_socket)
+  {
+    dynstr_append(&path_buf, "\nsocket = ");
+    dynstr_append(&path_buf, opt_socket);
+  }
+
+  if (opt_port)
+  {
+    dynstr_append(&path_buf, "\nport = ");
+    dynstr_append(&path_buf, opt_port);
+  }
+
   dynstr_append(&path_buf, "\n");
 
   /* Warn if login path already exists */
@@ -901,7 +943,8 @@
 static void remove_options(DYNAMIC_STRING *file_buf, const char *path_name)
 {
   /* If nope of the options are specified remove the entire path. */
-  if (!opt_remove_host && !opt_remove_pass && !opt_remove_user)
+  if (!opt_remove_host && !opt_remove_pass && !opt_remove_user 
+      && !opt_remove_socket && !opt_remove_port)
   {
     remove_login_path(file_buf, path_name);
     return;
@@ -915,6 +958,12 @@
 
   if (opt_remove_host)
     remove_option(file_buf, path_name, "host");
+
+  if (opt_remove_socket)
+    remove_option(file_buf, path_name, "socket");
+
+  if (opt_remove_port)
+    remove_option(file_buf, path_name, "port");
 }
 
 
@@ -1423,8 +1472,8 @@
   my_print_help(my_program_long_options);
   my_print_variables(my_program_long_options);
   puts("\nWhere command can be any one of the following :\n\
-       set [command options]     Sets user name/password/host name for a\n\
-                                 given login path (section).\n\
+       set [command options]     Sets user name/password/host name/socket/port\n\
+                                 for a given login path (section).\n\
        remove [command options]  Remove a login path from the login file.\n\
        print [command options]   Print all the options for a specified\n\
                                  login path.\n\

=== modified file 'Percona-Server/client/mysql_plugin.c'
--- Percona-Server/client/mysql_plugin.c	2012-12-11 05:32:21 +0000
+++ Percona-Server/client/mysql_plugin.c	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/client/mysql_upgrade.c'
--- Percona-Server/client/mysql_upgrade.c	2013-02-12 07:47:19 +0000
+++ Percona-Server/client/mysql_upgrade.c	2013-05-12 06:41:27 +0000
@@ -329,6 +329,11 @@
   FILE *res_file;
   int error;
 
+  if (! ds_res)
+  {
+    fflush(stdout);
+    fflush(stderr);
+  }
   if (!(res_file= popen(cmd, "r")))
     die("popen(\"%s\", \"r\") failed", cmd);
 
@@ -348,7 +353,10 @@
   }
 
   if (! ds_res)
+  {
     fflush(stdout);
+    fflush(stderr);
+  }
 
   error= pclose(res_file);
   return WEXITSTATUS(error);
@@ -704,6 +712,7 @@
                   ds_args.str,
                   "--check-upgrade",
                   "--all-databases",
+                  "--skip-database=mysql",
                   "--auto-repair",
                   opt_write_binlog ? "--write-binlog" : "--skip-write-binlog",
                   NULL);
@@ -718,13 +727,45 @@
                   "--no-defaults",
                   ds_args.str,
                   "--all-databases",
-                  "--fix-db-names",
-                  "--fix-table-names",
-                  opt_write_binlog ? "--write-binlog" : "--skip-write-binlog",
-                  NULL);
-}
-
-
+                  "--skip-database=mysql",
+                  "--fix-db-names",
+                  "--fix-table-names",
+                  opt_write_binlog ? "--write-binlog" : "--skip-write-binlog",
+                  NULL);
+}
+
+/** performs the same operation as mysqlcheck_upgrade, but on the mysql db */
+static int run_mysqlcheck_mysql_db_upgrade(void)
+{
+  print_conn_args("mysqlcheck");
+  return run_tool(mysqlcheck_path,
+                  NULL, /* Send output from mysqlcheck directly to screen */
+                  "--no-defaults",
+                  ds_args.str,
+                  "--check-upgrade",
+                  "--databases",
+                  "--auto-repair",
+                  opt_write_binlog ? "--write-binlog" : "--skip-write-binlog",
+                  "mysql",
+                  NULL);
+}
+
+
+/** performs the same operation as mysqlcheck_upgrade, but on the mysql db */
+static int run_mysqlcheck_mysql_db_fixnames(void)
+{
+  print_conn_args("mysqlcheck");
+  return run_tool(mysqlcheck_path,
+                  NULL, /* Send output from mysqlcheck directly to screen */
+                  "--no-defaults",
+                  ds_args.str,
+                  "--databases",
+                  "--fix-db-names",
+                  "--fix-table-names",
+                  opt_write_binlog ? "--write-binlog" : "--skip-write-binlog",
+                  "mysql",
+                  NULL);
+}
 static const char *expected_errors[]=
 {
   "ERROR 1060", /* Duplicate column name */
@@ -918,10 +959,15 @@
 
   /*
     Run "mysqlcheck" and "mysql_fix_privilege_tables.sql"
+    First run mysqlcheck on the system database.
+    Then do the upgrade.
+    And then run mysqlcheck on all tables.
   */
   if ((!opt_systables_only &&
-       (run_mysqlcheck_fixnames() || run_mysqlcheck_upgrade())) ||
-      run_sql_fix_privilege_tables())
+       (run_mysqlcheck_mysql_db_fixnames() || run_mysqlcheck_mysql_db_upgrade())) ||
+      run_sql_fix_privilege_tables() ||
+      (!opt_systables_only &&
+      (run_mysqlcheck_fixnames() || run_mysqlcheck_upgrade())))
   {
     /*
       The upgrade failed to complete in some way or another,

=== modified file 'Percona-Server/client/mysqlbinlog.cc'
--- Percona-Server/client/mysqlbinlog.cc	2013-03-05 12:46:43 +0000
+++ Percona-Server/client/mysqlbinlog.cc	2013-05-12 06:41:27 +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
@@ -1134,8 +1134,10 @@
            event was not skipped).
         */
         if (skip_event)
-          if ((copy_event_cache_to_file_and_reinit(&print_event_info->head_cache, result_file) ||
-              copy_event_cache_to_file_and_reinit(&print_event_info->body_cache, result_file)))
+          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;
       }
 
@@ -1177,8 +1179,10 @@
       if (stmt_end)
       {
         print_event_info->have_unflushed_events= FALSE;
-        if (copy_event_cache_to_file_and_reinit(&print_event_info->head_cache, result_file) ||
-            copy_event_cache_to_file_and_reinit(&print_event_info->body_cache, result_file))
+        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;
         goto end;
       }
@@ -1218,7 +1222,7 @@
     }
     /* Flush head cache to result_file for every event */
     if (copy_event_cache_to_file_and_reinit(&print_event_info->head_cache,
-                                            result_file))
+                                            result_file, stop_never /* flush result_file */))
       goto err;
   }
 
@@ -1551,7 +1555,7 @@
 
 static void print_version()
 {
-  printf("%s Ver 3.3 for %s at %s\n", my_progname, SYSTEM_TYPE, MACHINE_TYPE);
+  printf("%s Ver 3.4 for %s at %s\n", my_progname, SYSTEM_TYPE, MACHINE_TYPE);
 }
 
 
@@ -2049,6 +2053,21 @@
     */
 
     type= (Log_event_type) net->read_pos[1 + EVENT_TYPE_OFFSET];
+
+    /*
+      Ignore HEARBEAT events. They can show up if mysqlbinlog is
+      running with:
+
+        --read-from-remote-server
+        --read-from-remote-master=BINLOG-DUMP-GTIDS'
+        --stop-never
+        --stop-never-slave-server-id
+
+      i.e., acting as a fake slave.
+    */
+    if (type == HEARTBEAT_LOG_EVENT)
+      continue;
+
     if (!raw_mode || (type == ROTATE_EVENT) || (type == FORMAT_DESCRIPTION_EVENT))
     {
       if (!(ev= Log_event::read_log_event((const char*) net->read_pos + 1 ,

=== modified file 'Percona-Server/client/mysqlcheck.c'
--- Percona-Server/client/mysqlcheck.c	2013-02-12 07:47:19 +0000
+++ Percona-Server/client/mysqlcheck.c	2013-05-12 06:41:27 +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
@@ -15,7 +15,7 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
-#define CHECK_VERSION "2.5.0"
+#define CHECK_VERSION "2.5.1"
 
 #include "client_priv.h"
 #include "my_default.h"
@@ -30,6 +30,10 @@
 #define EX_USAGE 1
 #define EX_MYSQLERR 2
 
+/* ALTER instead of repair. */
+#define MAX_ALTER_STR_SIZE 128 * 1024
+#define KEY_PARTITIONING_CHANGED_STR "KEY () partitioning changed"
+
 static MYSQL mysql_connection, *sock = 0;
 static my_bool opt_alldbs = 0, opt_check_only_changed = 0, opt_extended = 0,
                opt_compress = 0, opt_databases = 0, opt_fast = 0,
@@ -45,7 +49,8 @@
 	    *default_charset= 0, *current_host= 0;
 static char *opt_plugin_dir= 0, *opt_default_auth= 0;
 static int first_error = 0;
-DYNAMIC_ARRAY tables4repair, tables4rebuild;
+static char *opt_skip_database;
+DYNAMIC_ARRAY tables4repair, tables4rebuild, alter_table_cmds;
 #ifdef HAVE_SMEM
 static char *shared_memory_base_name=0;
 #endif
@@ -175,6 +180,9 @@
 #endif
   {"silent", 's', "Print only error messages.", &opt_silent,
    &opt_silent, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+  {"skip_database", 0, "Don't process the database specified as argument", 
+   &opt_skip_database, &opt_skip_database, 0, GET_STR, REQUIRED_ARG, 
+   0, 0, 0, 0, 0, 0},
   {"socket", 'S', "The socket file to use for connection.",
    &opt_mysql_unix_port, &opt_mysql_unix_port, 0, GET_STR,
    REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
@@ -399,6 +407,7 @@
 	   my_progname);
     return 1;
   }
+
   if (*argc < 1 && !opt_alldbs)
   {
     printf("You forgot to give the arguments! Please see %s --help\n",
@@ -598,6 +607,17 @@
 } /* process_all_tables_in_db */
 
 
+static int run_query(const char *query)
+{
+  if (mysql_query(sock, query))
+  {
+    fprintf(stderr, "Failed to %s\n", query);
+    fprintf(stderr, "Error: %s\n", mysql_error(sock));
+    return 1;
+  }
+  return 0;
+}
+
 
 static int fix_table_storage_name(const char *name)
 {
@@ -606,12 +626,7 @@
   if (strncmp(name, "#mysql50#", 9))
     return 1;
   sprintf(qbuf, "RENAME TABLE `%s` TO `%s`", name, name + 9);
-  if (mysql_query(sock, qbuf))
-  {
-    fprintf(stderr, "Failed to %s\n", qbuf);
-    fprintf(stderr, "Error: %s\n", mysql_error(sock));
-    rc= 1;
-  }
+  rc= run_query(qbuf);
   if (verbose)
     printf("%-50s %s\n", name, rc ? "FAILED" : "OK");
   return rc;
@@ -624,12 +639,7 @@
   if (strncmp(name, "#mysql50#", 9))
     return 1;
   sprintf(qbuf, "ALTER DATABASE `%s` UPGRADE DATA DIRECTORY NAME", name);
-  if (mysql_query(sock, qbuf))
-  {
-    fprintf(stderr, "Failed to %s\n", qbuf);
-    fprintf(stderr, "Error: %s\n", mysql_error(sock));
-    rc= 1;
-  }
+  rc= run_query(qbuf);
   if (verbose)
     printf("%-50s %s\n", name, rc ? "FAILED" : "OK");
   return rc;
@@ -658,6 +668,10 @@
 
 static int process_one_db(char *database)
 {
+  if (opt_skip_database && opt_alldbs &&
+      !strcmp(database, opt_skip_database))
+    return 0;
+
   if (what_to_do == DO_UPGRADE)
   {
     int rc= 0;
@@ -692,13 +706,7 @@
 static int disable_binlog()
 {
   const char *stmt= "SET SQL_LOG_BIN=0";
-  if (mysql_query(sock, stmt))
-  {
-    fprintf(stderr, "Failed to %s\n", stmt);
-    fprintf(stderr, "Error: %s\n", mysql_error(sock));
-    return 1;
-  }
-  return 0;
+  return run_query(stmt);
 }
 
 static int handle_request_for_tables(char *tables, uint length)
@@ -768,12 +776,14 @@
   MYSQL_RES *res;
   MYSQL_ROW row;
   char prev[NAME_LEN*2+2];
+  char prev_alter[MAX_ALTER_STR_SIZE];
   uint i;
   my_bool found_error=0, table_rebuild=0;
 
   res = mysql_use_result(sock);
 
   prev[0] = '\0';
+  prev_alter[0]= 0;
   for (i = 0; (row = mysql_fetch_row(res)); i++)
   {
     int changed = strcmp(prev, row[0]);
@@ -790,12 +800,18 @@
 	  strcmp(row[3],"OK"))
       {
         if (table_rebuild)
-          insert_dynamic(&tables4rebuild, prev);
+        {
+          if (prev_alter[0])
+            insert_dynamic(&alter_table_cmds, (uchar*) prev_alter);
+          else
+            insert_dynamic(&tables4rebuild, (uchar*) prev);
+        }
         else
           insert_dynamic(&tables4repair, prev);
       }
       found_error=0;
       table_rebuild=0;
+      prev_alter[0]= 0;
       if (opt_silent)
 	continue;
     }
@@ -804,11 +820,30 @@
     else if (!status && changed)
     {
       printf("%s\n%-9s: %s", row[0], row[2], row[3]);
-      if (strcmp(row[2],"note"))
+      if (opt_auto_repair && strcmp(row[2],"note"))
       {
-	found_error=1;
-        if (opt_auto_repair && strstr(row[3], "ALTER TABLE") != NULL)
+        const char *alter_txt= strstr(row[3], "ALTER TABLE");
+        found_error=1;
+        if (alter_txt)
+        {
           table_rebuild=1;
+          if (!strncmp(row[3], KEY_PARTITIONING_CHANGED_STR,
+                       strlen(KEY_PARTITIONING_CHANGED_STR)) &&
+              strstr(alter_txt, "PARTITION BY"))
+          {
+            if (strlen(alter_txt) >= MAX_ALTER_STR_SIZE)
+            {
+              printf("Error: Alter command too long (>= %d),"
+                     " please do \"%s\" or dump/reload to fix it!\n",
+                     MAX_ALTER_STR_SIZE,
+                     alter_txt);
+              table_rebuild= 0;
+              prev_alter[0]= 0;
+            }
+            else
+              strcpy(prev_alter, alter_txt);
+          }
+        }
       }
     }
     else
@@ -820,7 +855,12 @@
   if (found_error && opt_auto_repair && what_to_do != DO_REPAIR)
   {
     if (table_rebuild)
-      insert_dynamic(&tables4rebuild, prev);
+    {
+      if (prev_alter[0])
+        insert_dynamic(&alter_table_cmds, (uchar*) prev_alter);
+      else
+        insert_dynamic(&tables4rebuild, (uchar*) prev);
+    }
     else
       insert_dynamic(&tables4repair, prev);
   }
@@ -931,7 +971,8 @@
 
   if (opt_auto_repair &&
       (my_init_dynamic_array(&tables4repair, sizeof(char)*(NAME_LEN*2+2),16,64) ||
-       my_init_dynamic_array(&tables4rebuild, sizeof(char)*(NAME_LEN*2+2),16,64)))
+       my_init_dynamic_array(&tables4rebuild, sizeof(char)*(NAME_LEN*2+2),16,64) ||
+       my_init_dynamic_array(&alter_table_cmds, MAX_ALTER_STR_SIZE, 0, 1)))
   {
     first_error = 1;
     goto end;
@@ -959,6 +1000,8 @@
     }
     for (i = 0; i < tables4rebuild.elements ; i++)
       rebuild_table((char*) dynamic_array_ptr(&tables4rebuild, i));
+    for (i = 0; i < alter_table_cmds.elements ; i++)
+      run_query((char*) dynamic_array_ptr(&alter_table_cmds, i));
   }
  end:
   dbDisconnect(current_host);

=== modified file 'Percona-Server/client/mysqldump.c'
--- Percona-Server/client/mysqldump.c	2013-05-12 06:39:35 +0000
+++ Percona-Server/client/mysqldump.c	2013-05-12 06:41:27 +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
@@ -2392,10 +2392,10 @@
           {
             if (opt_xml)
             {
-              if (i)                            /* Procedures. */
+              if (i)                            // Procedures.
                 print_xml_row(sql_file, "routine", routine_res, &row,
                               "Create Procedure");
-              else                              /* Functions. */
+              else                              // Functions.
                 print_xml_row(sql_file, "routine", routine_res, &row,
                               "Create Function");
               continue;

=== modified file 'Percona-Server/client/mysqltest.cc'
--- Percona-Server/client/mysqltest.cc	2013-03-05 12:46:43 +0000
+++ Percona-Server/client/mysqltest.cc	2013-05-12 06:41:27 +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
@@ -1336,7 +1336,7 @@
 void free_used_memory()
 {
   uint i;
-  DBUG_ENTER("free_used_memory");
+  // Do not use DBUG_ENTER("free_used_memory"); here, see below.
 
   if (connections)
     close_connections();
@@ -2024,18 +2024,9 @@
     size_t reject_length;
     dirname_part(reject_file, result_file_name, &reject_length);
 
-    if (access(reject_file, W_OK) == 0)
-    {
-      /* Result file directory is writable, save reject file there */
-      fn_format(reject_file, result_file_name, NULL,
-                ".reject", MY_REPLACE_EXT);
-    }
-    else
-    {
-      /* Put reject file in opt_logdir */
-      fn_format(reject_file, result_file_name, opt_logdir,
+    /* Put reject file in opt_logdir */
+    fn_format(reject_file, result_file_name, opt_logdir,
                 ".reject", MY_REPLACE_DIR | MY_REPLACE_EXT);
-    }
 
     if (my_copy(log_file.file_name(), reject_file, MYF(0)) != 0)
       die("Failed to copy '%s' to '%s', errno: %d",
@@ -5503,6 +5494,7 @@
   char *con_options;
   my_bool con_ssl= 0, con_compress= 0;
   my_bool con_pipe= 0, con_shm= 0, con_cleartext_enable= 0;
+  my_bool con_secure_auth= 1;
   struct st_connection* con_slot;
 
   static DYNAMIC_STRING ds_connection_name;
@@ -5594,6 +5586,8 @@
       con_shm= 1;
     else if (!strncmp(con_options, "CLEARTEXT", 9))
       con_cleartext_enable= 1;
+    else if (!strncmp(con_options, "SKIPSECUREAUTH",14))
+      con_secure_auth= 0;
     else
       die("Illegal option to connect: %.*s", 
           (int) (end - con_options), con_options);
@@ -5705,6 +5699,10 @@
     mysql_options(&con_slot->mysql, MYSQL_ENABLE_CLEARTEXT_PLUGIN,
                   (char*) &con_cleartext_enable);
 
+  if (!con_secure_auth)
+    mysql_options(&con_slot->mysql, MYSQL_SECURE_AUTH,
+                  (char*) &con_secure_auth);
+
   /* Special database to allow one to connect without a database name */
   if (ds_database.length && !strcmp(ds_database.str,"*NO-ONE*"))
     dynstr_set(&ds_database, "");

=== modified file 'Percona-Server/client/sql_string.cc'
--- Percona-Server/client/sql_string.cc	2013-05-12 06:39:35 +0000
+++ Percona-Server/client/sql_string.cc	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2011, 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
@@ -736,7 +736,7 @@
 {
   if (from->Alloced_length >= from_length)
     return from;
-  if (from->alloced || !to || from == to)
+  if ((from->alloced && (from->Alloced_length != 0)) || !to || from == to)
   {
     (void) from->realloc(from_length);
     return from;

=== modified file 'Percona-Server/cmake/build_configurations/mysql_release.cmake'
--- Percona-Server/cmake/build_configurations/mysql_release.cmake	2012-08-22 01:40:20 +0000
+++ Percona-Server/cmake/build_configurations/mysql_release.cmake	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/cmake/configure.pl'
--- Percona-Server/cmake/configure.pl	2012-12-04 08:24:59 +0000
+++ Percona-Server/cmake/configure.pl	2013-05-12 06:41:27 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/cmake/cpu_info.cmake'
--- Percona-Server/cmake/cpu_info.cmake	2012-05-30 07:57:41 +0000
+++ Percona-Server/cmake/cpu_info.cmake	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2011, 2012 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/cmake/create_initial_db.cmake.in'
--- Percona-Server/cmake/create_initial_db.cmake.in	2012-10-03 14:07:49 +0000
+++ Percona-Server/cmake/create_initial_db.cmake.in	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 
 SET(WITH_SSL_PATH "@WITH_SSL_PATH@")
 SET(CRYPTO_LIBRARY "@CRYPTO_LIBRARY@")
-SET(OPENSSL_LIBRARY "@OPENSSL_LIBRARIES@")
+SET(OPENSSL_LIBRARY "@OPENSSL_LIBRARY@")
 
 SET(WIN32 "@WIN32@")
 

=== modified file 'Percona-Server/cmake/dtrace.cmake'
--- Percona-Server/cmake/dtrace.cmake	2013-05-12 06:39:35 +0000
+++ Percona-Server/cmake/dtrace.cmake	2013-05-12 06:41:27 +0000
@@ -74,13 +74,6 @@
    ${CMAKE_BINARY_DIR}/include/probes_mysql_dtrace.h
    ${CMAKE_BINARY_DIR}/include/probes_mysql_nodtrace.h
   )
-  IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-   # Systemtap object
-   EXECUTE_PROCESS(
-     COMMAND ${DTRACE} -G -s ${CMAKE_SOURCE_DIR}/include/probes_mysql.d.base
-     -o ${CMAKE_BINARY_DIR}/probes_mysql.o
-   )
-  ENDIF()
   ADD_CUSTOM_TARGET(gen_dtrace_header
   DEPENDS  
   ${CMAKE_BINARY_DIR}/include/probes_mysql.d
@@ -99,12 +92,7 @@
   IF(ENABLE_DTRACE)
     ADD_DEPENDENCIES(${target} gen_dtrace_header)
 
-    IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-      TARGET_LINK_LIBRARIES(${target}  ${CMAKE_BINARY_DIR}/probes_mysql.o)
-    ENDIF()
-
-    # On Solaris, invoke dtrace -G to generate object file and
-    # link it together with target.
+    # Invoke dtrace to generate object file and link it together with target.
     IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
       SET(objdir ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${target}.dir)
       SET(outfile ${objdir}/${target}_dtrace.o)
@@ -121,6 +109,17 @@
           -P ${CMAKE_SOURCE_DIR}/cmake/dtrace_prelink.cmake
         WORKING_DIRECTORY ${objdir}
       )
+    ELSEIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+      SET(outfile "${CMAKE_BINARY_DIR}/probes_mysql.o")
+      # Systemtap object
+      EXECUTE_PROCESS(
+        COMMAND ${DTRACE} -G -s ${CMAKE_SOURCE_DIR}/include/probes_mysql.d.base
+        -o ${outfile}
+        )
+    ENDIF()
+
+    # Do not try to extend the library if we have not built the .o file
+    IF(outfile)
       # Add full  object path to linker flags
       GET_TARGET_PROPERTY(target_type ${target} TYPE)
       IF(NOT target_type MATCHES "STATIC")
@@ -132,12 +131,12 @@
         # but maybe one day this will be fixed.
         GET_TARGET_PROPERTY(target_location ${target} LOCATION)
         ADD_CUSTOM_COMMAND(
-         TARGET ${target} POST_BUILD
-         COMMAND ${CMAKE_AR} r  ${target_location} ${outfile}
-	 COMMAND ${CMAKE_RANLIB} ${target_location}
-        )
-       # Used in DTRACE_INSTRUMENT_WITH_STATIC_LIBS
-       SET(TARGET_OBJECT_DIRECTORY_${target}  ${objdir} CACHE INTERNAL "")
+          TARGET ${target} POST_BUILD
+          COMMAND ${CMAKE_AR} r  ${target_location} ${outfile}
+	  COMMAND ${CMAKE_RANLIB} ${target_location}
+          )
+        # Used in DTRACE_INSTRUMENT_WITH_STATIC_LIBS
+        SET(TARGET_OBJECT_DIRECTORY_${target}  ${objdir} CACHE INTERNAL "")
       ENDIF()
     ENDIF()
   ENDIF()

=== modified file 'Percona-Server/cmake/install_macros.cmake'
--- Percona-Server/cmake/install_macros.cmake	2012-02-16 09:51:14 +0000
+++ Percona-Server/cmake/install_macros.cmake	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2011, 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

=== modified file 'Percona-Server/cmake/libevent.cmake'
--- Percona-Server/cmake/libevent.cmake	2012-02-28 13:00:44 +0000
+++ Percona-Server/cmake/libevent.cmake	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2011 Oracle and/or its affiliates. All Rights Reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/cmake/libutils.cmake'
--- Percona-Server/cmake/libutils.cmake	2012-10-16 06:21:51 +0000
+++ Percona-Server/cmake/libutils.cmake	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -126,7 +126,7 @@
 
 MACRO(MERGE_STATIC_LIBS TARGET OUTPUT_NAME LIBS_TO_MERGE)
   # To produce a library we need at least one source file.
-  # It is created by ADD_CUSTOM_COMMAND below and will helps 
+  # It is created by ADD_CUSTOM_COMMAND below and will
   # also help to track dependencies.
   SET(SOURCE_FILE ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_depends.c)
   ADD_LIBRARY(${TARGET} STATIC ${SOURCE_FILE})
@@ -158,6 +158,7 @@
   IF(OSLIBS)
     LIST(REMOVE_DUPLICATES OSLIBS)
     TARGET_LINK_LIBRARIES(${TARGET} ${OSLIBS})
+    MESSAGE(STATUS "Library ${TARGET} depends on OSLIBS ${OSLIBS}")
   ENDIF()
 
   # Make the generated dummy source file depended on all static input

=== modified file 'Percona-Server/cmake/maintainer.cmake'
--- Percona-Server/cmake/maintainer.cmake	2012-08-22 01:40:20 +0000
+++ Percona-Server/cmake/maintainer.cmake	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/cmake/make_dist.cmake.in'
--- Percona-Server/cmake/make_dist.cmake.in	2012-08-22 01:40:20 +0000
+++ Percona-Server/cmake/make_dist.cmake.in	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/cmake/mysql_version.cmake'
--- Percona-Server/cmake/mysql_version.cmake	2013-01-18 04:53:12 +0000
+++ Percona-Server/cmake/mysql_version.cmake	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/cmake/os/Darwin.cmake'
--- Percona-Server/cmake/os/Darwin.cmake	2012-10-08 08:16:12 +0000
+++ Percona-Server/cmake/os/Darwin.cmake	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/cmake/os/Windows.cmake'
--- Percona-Server/cmake/os/Windows.cmake	2012-08-22 01:40:20 +0000
+++ Percona-Server/cmake/os/Windows.cmake	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/cmake/package_name.cmake'
--- Percona-Server/cmake/package_name.cmake	2013-01-18 04:53:12 +0000
+++ Percona-Server/cmake/package_name.cmake	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/cmake/plugin.cmake'
--- Percona-Server/cmake/plugin.cmake	2012-10-24 16:08:19 +0000
+++ Percona-Server/cmake/plugin.cmake	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/cmake/readline.cmake'
--- Percona-Server/cmake/readline.cmake	2012-03-01 12:32:57 +0000
+++ Percona-Server/cmake/readline.cmake	2013-05-12 06:41:27 +0000
@@ -1,5 +1,4 @@
-# Copyright (c) 2009, 2010 Sun Microsystems, Inc.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/cmake/ssl.cmake'
--- Percona-Server/cmake/ssl.cmake	2012-12-04 08:24:59 +0000
+++ Percona-Server/cmake/ssl.cmake	2013-05-12 06:41:27 +0000
@@ -105,9 +105,13 @@
       UNSET(OPENSSL_APPLINK_C)
       UNSET(OPENSSL_APPLINK_C CACHE)
     ENDIF()
-    IF (OPENSSL_LIBRARIES)
-      UNSET(OPENSSL_LIBRARIES)
-      UNSET(OPENSSL_LIBRARIES CACHE)
+    IF (OPENSSL_LIBRARY)
+      UNSET(OPENSSL_LIBRARY)
+      UNSET(OPENSSL_LIBRARY CACHE)
+    ENDIF()
+    IF (CRYPTO_LIBRARY)
+      UNSET(CRYPTO_LIBRARY)
+      UNSET(CRYPTO_LIBRARY CACHE)
     ENDIF()
   ELSEIF(WITH_SSL STREQUAL "system" OR
          WITH_SSL STREQUAL "yes" OR
@@ -140,15 +144,19 @@
 
     # On mac this list is <.dylib;.so;.a>
     # We prefer static libraries, so we revert it here.
-    LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
-    MESSAGE(STATUS "suffixes <${CMAKE_FIND_LIBRARY_SUFFIXES}>")
-    FIND_LIBRARY(OPENSSL_LIBRARIES
+    IF (WITH_SSL_PATH)
+      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
+      MESSAGE(STATUS "suffixes <${CMAKE_FIND_LIBRARY_SUFFIXES}>")
+    ENDIF()
+    FIND_LIBRARY(OPENSSL_LIBRARY
                  NAMES ssl ssleay32 ssleay32MD
                  HINTS ${OPENSSL_ROOT_DIR}/lib)
     FIND_LIBRARY(CRYPTO_LIBRARY
                  NAMES crypto libeay32
                  HINTS ${OPENSSL_ROOT_DIR}/lib)
-    LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
+    IF (WITH_SSL_PATH)
+      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
+    ENDIF()
 
     # Verify version number. Version information looks like:
     #   #define OPENSSL_VERSION_NUMBER 0x1000103fL
@@ -163,7 +171,7 @@
     )
 
     IF(OPENSSL_INCLUDE_DIR AND
-       OPENSSL_LIBRARIES   AND
+       OPENSSL_LIBRARY   AND
        CRYPTO_LIBRARY      AND
        OPENSSL_MAJOR_VERSION STREQUAL "1"
       )
@@ -172,8 +180,32 @@
       SET(OPENSSL_FOUND FALSE)
     ENDIF()
 
+    # If we are invoked with -DWITH_SSL=/path/to/custom/openssl
+    # and we have found static libraries, then link them statically
+    # into our executables and libraries.
+    # Adding IMPORTED_LOCATION allows MERGE_STATIC_LIBS
+    # to get LOCATION and do correct dependency analysis.
+    SET(MY_CRYPTO_LIBRARY "${CRYPTO_LIBRARY}")
+    SET(MY_OPENSSL_LIBRARY "${OPENSSL_LIBRARY}")
+    IF (WITH_SSL_PATH)
+      GET_FILENAME_COMPONENT(CRYPTO_EXT "${CRYPTO_LIBRARY}" EXT)
+      GET_FILENAME_COMPONENT(OPENSSL_EXT "${OPENSSL_LIBRARY}" EXT)
+      IF (CRYPTO_EXT STREQUAL ".a")
+        SET(MY_CRYPTO_LIBRARY imported_crypto)
+        ADD_LIBRARY(imported_crypto STATIC IMPORTED)
+        SET_TARGET_PROPERTIES(imported_crypto
+          PROPERTIES IMPORTED_LOCATION "${CRYPTO_LIBRARY}")
+      ENDIF()
+      IF (OPENSSL_EXT STREQUAL ".a")
+        SET(MY_OPENSSL_LIBRARY imported_openssl)
+        ADD_LIBRARY(imported_openssl STATIC IMPORTED)
+        SET_TARGET_PROPERTIES(imported_openssl
+          PROPERTIES IMPORTED_LOCATION "${OPENSSL_LIBRARY}")
+      ENDIF()
+    ENDIF()
+
     MESSAGE(STATUS "OPENSSL_INCLUDE_DIR = ${OPENSSL_INCLUDE_DIR}")
-    MESSAGE(STATUS "OPENSSL_LIBRARIES = ${OPENSSL_LIBRARIES}")
+    MESSAGE(STATUS "OPENSSL_LIBRARY = ${OPENSSL_LIBRARY}")
     MESSAGE(STATUS "CRYPTO_LIBRARY = ${CRYPTO_LIBRARY}")
     MESSAGE(STATUS "OPENSSL_MAJOR_VERSION = ${OPENSSL_MAJOR_VERSION}")
 
@@ -183,7 +215,7 @@
                         HAVE_SHA512_DIGEST_LENGTH)
     IF(OPENSSL_FOUND AND HAVE_SHA512_DIGEST_LENGTH)
       SET(SSL_SOURCES "")
-      SET(SSL_LIBRARIES ${OPENSSL_LIBRARIES} ${CRYPTO_LIBRARY})
+      SET(SSL_LIBRARIES ${MY_OPENSSL_LIBRARY} ${MY_CRYPTO_LIBRARY})
       IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
         SET(SSL_LIBRARIES ${SSL_LIBRARIES} ${LIBSOCKET})
       ENDIF()
@@ -216,7 +248,7 @@
 MACRO (COPY_OPENSSL_DLLS target_name)
   IF (WIN32 AND WITH_SSL_PATH)
     GET_FILENAME_COMPONENT(CRYPTO_NAME "${CRYPTO_LIBRARY}" NAME_WE)
-    GET_FILENAME_COMPONENT(OPENSSL_NAME "${OPENSSL_LIBRARIES}" NAME_WE)
+    GET_FILENAME_COMPONENT(OPENSSL_NAME "${OPENSSL_LIBRARY}" NAME_WE)
     FILE(GLOB HAVE_CRYPTO_DLL "${WITH_SSL_PATH}/bin/${CRYPTO_NAME}.dll")
     FILE(GLOB HAVE_OPENSSL_DLL "${WITH_SSL_PATH}/bin/${OPENSSL_NAME}.dll")
     IF (HAVE_CRYPTO_DLL AND HAVE_OPENSSL_DLL)

=== modified file 'Percona-Server/cmake/zlib.cmake'
--- Percona-Server/cmake/zlib.cmake	2011-06-30 15:46:53 +0000
+++ Percona-Server/cmake/zlib.cmake	2013-05-12 06:41:27 +0000
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
 
 MACRO (MYSQL_USE_BUNDLED_ZLIB)
-  SET(ZLIB_LIBRARY  zlib)
+  SET(ZLIB_LIBRARY zlib CACHE INTERNAL "Bundled zlib library")
   SET(ZLIB_INCLUDE_DIR  ${CMAKE_SOURCE_DIR}/zlib)
   SET(ZLIB_FOUND  TRUE)
   SET(WITH_ZLIB "bundled" CACHE STRING "Use bundled zlib")
@@ -57,13 +57,17 @@
      INCLUDE(CheckFunctionExists)
       SET(CMAKE_REQUIRED_LIBRARIES z)
       CHECK_FUNCTION_EXISTS(crc32 HAVE_CRC32)
+      CHECK_FUNCTION_EXISTS(compressBound HAVE_COMPRESSBOUND)
+      CHECK_FUNCTION_EXISTS(deflateBound HAVE_DEFLATEBOUND)
       SET(CMAKE_REQUIRED_LIBRARIES)
-      IF(HAVE_CRC32)
-        SET(ZLIB_LIBRARY z CACHE INTERNAL "System zlib library")
-        SET(WITH_ZLIB "system" CACHE STRING "Which zlib to use (possible values are 'bundled' or 'system')")
+      IF(HAVE_CRC32 AND HAVE_COMPRESSBOUND AND HAVE_DEFLATEBOUND)
+        SET(ZLIB_LIBRARY ${ZLIB_LIBRARIES} CACHE INTERNAL "System zlib library")
+        SET(WITH_ZLIB "system" CACHE STRING
+          "Which zlib to use (possible values are 'bundled' or 'system')")
         SET(ZLIB_SOURCES "")
       ELSE()
         SET(ZLIB_FOUND FALSE CACHE INTERNAL "Zlib found but not usable")
+        MESSAGE(STATUS "system zlib found but not usable")
       ENDIF()
     ENDIF()
     IF(NOT ZLIB_FOUND)

=== modified file 'Percona-Server/cmd-line-utils/libedit/CMakeLists.txt'
--- Percona-Server/cmd-line-utils/libedit/CMakeLists.txt	2011-10-21 12:44:35 +0000
+++ Percona-Server/cmd-line-utils/libedit/CMakeLists.txt	2013-05-12 06:41:27 +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
@@ -186,6 +186,6 @@
   ${AHDR} 
   ${LIBEDIT_EXTRA_SOURCES}
 )
-ADD_LIBRARY(edit ${LIBEDIT_SOURCES})
+ADD_CONVENIENCE_LIBRARY(edit ${LIBEDIT_SOURCES})
 TARGET_LINK_LIBRARIES(edit ${CURSES_LIBRARY})
 

=== modified file 'Percona-Server/cmd-line-utils/libedit/np/unvis.c'
--- Percona-Server/cmd-line-utils/libedit/np/unvis.c	2011-10-29 18:08:40 +0000
+++ Percona-Server/cmd-line-utils/libedit/np/unvis.c	2013-05-12 06:41:27 +0000
@@ -87,7 +87,9 @@
 #define S_NUMBER	13	/* collecting number */
 #define S_STRING	14	/* collecting string */
 
+#ifndef isoctal
 #define	isoctal(c)	(((u_char)(c)) >= '0' && ((u_char)(c)) <= '7')
+#endif
 #define xtod(c)		(isdigit(c) ? (c - '0') : ((tolower(c) - 'a') + 10))
 #define XTOD(c)		(isdigit(c) ? (c - '0') : ((c - 'A') + 10))
 

=== modified file 'Percona-Server/cmd-line-utils/libedit/np/vis.c'
--- Percona-Server/cmd-line-utils/libedit/np/vis.c	2011-10-28 14:40:46 +0000
+++ Percona-Server/cmd-line-utils/libedit/np/vis.c	2013-05-12 06:41:27 +0000
@@ -91,7 +91,9 @@
 #undef BELL
 #define BELL '\a'
 
+#ifndef isoctal
 #define isoctal(c)	(((u_char)(c)) >= '0' && ((u_char)(c)) <= '7')
+#endif
 #define iswhite(c)	(c == ' ' || c == '\t' || c == '\n')
 #define issafe(c)	(c == '\b' || c == BELL || c == '\r')
 #define xtoa(c)		"0123456789abcdef"[c]

=== modified file 'Percona-Server/config.h.cmake'
--- Percona-Server/config.h.cmake	2013-05-12 06:39:35 +0000
+++ Percona-Server/config.h.cmake	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2011, 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
@@ -495,7 +495,7 @@
 #define MACHINE_TYPE "@MYSQL_MACHINE_TYPE@"
 #cmakedefine HAVE_DTRACE 1
 
-#cmakedefine SIGNAL_WITH_VIO_CLOSE 1
+#cmakedefine SIGNAL_WITH_VIO_SHUTDOWN 1
 
 /* Windows stuff, mostly functions, that have Posix analogs but named differently */
 #cmakedefine S_IROTH @S_IROTH@

=== modified file 'Percona-Server/configure.cmake'
--- Percona-Server/configure.cmake	2013-03-05 12:46:43 +0000
+++ Percona-Server/configure.cmake	2013-05-12 06:41:27 +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
@@ -55,7 +55,7 @@
 # As a consequence of ALARMs no longer being used, thread
 # notification for KILL must close the socket to wake up
 # other threads.
-SET(SIGNAL_WITH_VIO_CLOSE 1)
+SET(SIGNAL_WITH_VIO_SHUTDOWN 1)
 
 # Always enable -Wall for gnu C/C++
 IF(CMAKE_COMPILER_IS_GNUCXX)
@@ -65,6 +65,15 @@
   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
 ENDIF()
 
+IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  SET(CMAKE_CXX_FLAGS
+    "${CMAKE_CXX_FLAGS} -Wall -Wno-null-conversion -Wno-unused-private-field")
+ENDIF()
+IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
+  SET(CMAKE_C_FLAGS
+    "${CMAKE_C_FLAGS} -Wall -Wno-null-conversion -Wno-unused-private-field")
+ENDIF()
+
 # The default C++ library for SunPro is really old, and not standards compliant.
 # http://developers.sun.com/solaris/articles/cmp_stlport_libCstd.html
 # Use stlport rather than Rogue Wave.
@@ -217,6 +226,11 @@
     IF(HAVE_LIBWRAP)
       SET(MYSYS_LIBWRAP_SOURCE  ${CMAKE_SOURCE_DIR}/mysys/my_libwrap.c)
       SET(LIBWRAP "wrap")
+    ELSE()
+      MESSAGE(FATAL_ERROR 
+      "WITH_LIBWRAP is defined, but can not find a working libwrap. "
+      "Make sure both the header files (tcpd.h) "
+      "and the library (libwrap) are installed.")
     ENDIF()
   ENDIF()
 ENDIF()

=== modified file 'Percona-Server/extra/charset2html.c'
--- Percona-Server/extra/charset2html.c	2010-10-27 11:32:32 +0000
+++ Percona-Server/extra/charset2html.c	2013-05-12 06:41:27 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2002-2004, 2007, 2008 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/comp_err.c'
--- Percona-Server/extra/comp_err.c	2013-05-12 06:39:35 +0000
+++ Percona-Server/extra/comp_err.c	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/perror.c'
--- Percona-Server/extra/perror.c	2012-08-07 13:56:51 +0000
+++ Percona-Server/extra/perror.c	2013-05-12 06:41:27 +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
@@ -136,7 +136,7 @@
   /*
     If you got compilation error here about compile_time_assert array, check
     that every HA_ERR_xxx constant has a corresponding error message in
-    handler_error_messages[] list (check mysys/ma_handler_errors.h and
+    handler_error_messages[] list (check mysys/my_handler_errors.h and
     include/my_base.h).
   */
   compile_time_assert(HA_ERR_FIRST + array_elements(handler_error_messages) ==

=== modified file 'Percona-Server/extra/yassl/CMakeLists.txt'
--- Percona-Server/extra/yassl/CMakeLists.txt	2012-03-21 15:59:46 +0000
+++ Percona-Server/extra/yassl/CMakeLists.txt	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/examples/client/client.cpp'
--- Percona-Server/extra/yassl/examples/client/client.cpp	2012-08-22 01:40:20 +0000
+++ Percona-Server/extra/yassl/examples/client/client.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2006 MySQL AB
+   Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/examples/echoclient/echoclient.cpp'
--- Percona-Server/extra/yassl/examples/echoclient/echoclient.cpp	2012-08-22 01:40:20 +0000
+++ Percona-Server/extra/yassl/examples/echoclient/echoclient.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2006 MySQL AB
+   Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/examples/echoserver/echoserver.cpp'
--- Percona-Server/extra/yassl/examples/echoserver/echoserver.cpp	2012-08-22 01:40:20 +0000
+++ Percona-Server/extra/yassl/examples/echoserver/echoserver.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2006 MySQL AB
+   Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/examples/server/server.cpp'
--- Percona-Server/extra/yassl/examples/server/server.cpp	2012-08-22 01:40:20 +0000
+++ Percona-Server/extra/yassl/examples/server/server.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2006 MySQL AB
+   Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/include/buffer.hpp'
--- Percona-Server/extra/yassl/include/buffer.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/include/buffer.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/include/cert_wrapper.hpp'
--- Percona-Server/extra/yassl/include/cert_wrapper.hpp	2012-08-22 01:40:20 +0000
+++ Percona-Server/extra/yassl/include/cert_wrapper.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/include/crypto_wrapper.hpp'
--- Percona-Server/extra/yassl/include/crypto_wrapper.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/include/crypto_wrapper.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/include/factory.hpp'
--- Percona-Server/extra/yassl/include/factory.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/include/factory.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/include/handshake.hpp'
--- Percona-Server/extra/yassl/include/handshake.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/include/handshake.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/include/lock.hpp'
--- Percona-Server/extra/yassl/include/lock.hpp	2013-02-12 07:47:19 +0000
+++ Percona-Server/extra/yassl/include/lock.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/include/log.hpp'
--- Percona-Server/extra/yassl/include/log.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/include/log.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/include/openssl/prefix_ssl.h'
--- Percona-Server/extra/yassl/include/openssl/prefix_ssl.h	2012-03-21 15:59:46 +0000
+++ Percona-Server/extra/yassl/include/openssl/prefix_ssl.h	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/include/openssl/ssl.h'
--- Percona-Server/extra/yassl/include/openssl/ssl.h	2013-02-12 07:47:19 +0000
+++ Percona-Server/extra/yassl/include/openssl/ssl.h	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/include/socket_wrapper.hpp'
--- Percona-Server/extra/yassl/include/socket_wrapper.hpp	2012-08-22 01:40:20 +0000
+++ Percona-Server/extra/yassl/include/socket_wrapper.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/include/timer.hpp'
--- Percona-Server/extra/yassl/include/timer.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/include/timer.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/include/yassl.hpp'
--- Percona-Server/extra/yassl/include/yassl.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/include/yassl.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/include/yassl_error.hpp'
--- Percona-Server/extra/yassl/include/yassl_error.hpp	2013-02-12 07:47:19 +0000
+++ Percona-Server/extra/yassl/include/yassl_error.hpp	2013-05-12 06:41:27 +0000
@@ -1,6 +1,5 @@
 /*
-   Copyright (c) 2005-2007 MySQL AB, 2010 Sun Microsystems, Inc.
-   Use is subject to license terms.
+   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -53,7 +52,8 @@
     badVersion_error    = 117,
     compress_error      = 118,
     decompress_error    = 119,
-    pms_version_error   = 120
+    pms_version_error   = 120,
+    sanityCipher_error  = 121
 
     // !!!! add error message to .cpp !!!!
 

=== modified file 'Percona-Server/extra/yassl/include/yassl_imp.hpp'
--- Percona-Server/extra/yassl/include/yassl_imp.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/include/yassl_imp.hpp	2013-05-12 06:41:27 +0000
@@ -1,6 +1,5 @@
 /*
-   Copyright (c) 2005-2007 MySQL AB, 2008 Sun Microsystems, Inc.
-   Use is subject to license terms.
+   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/include/yassl_int.hpp'
--- Percona-Server/extra/yassl/include/yassl_int.hpp	2013-01-18 04:53:12 +0000
+++ Percona-Server/extra/yassl/include/yassl_int.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/include/yassl_types.hpp'
--- Percona-Server/extra/yassl/include/yassl_types.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/include/yassl_types.hpp	2013-05-12 06:41:27 +0000
@@ -1,6 +1,5 @@
 /*
-   Copyright (c) 2005-2007 MySQL AB, 2008 Sun Microsystems, Inc.
-   Use is subject to license terms.
+   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -220,7 +219,11 @@
 const int MAX_RECORD_SIZE   = 16384; // 2^14, max size by standard
 const int COMPRESS_EXTRA    = 1024;  // extra compression possible addition
 const int SESSION_FLUSH_COUNT = 256;  // when to flush session cache
-
+const int MAX_PAD_SIZE        = 256;  // max TLS padding size
+const int COMPRESS_CONSTANT   =  13;  // compression calculation constant
+const int COMPRESS_UPPER      =  55;  // compression calculation numerator
+const int COMPRESS_LOWER      =  64;  // compression calculation denominator
+const int COMPRESS_DUMMY_SIZE =  64;  // compression dummy round size 
 
 typedef uint8 Cipher;             // first byte is always 0x00 for SSLv3 & TLS
 

=== modified file 'Percona-Server/extra/yassl/src/buffer.cpp'
--- Percona-Server/extra/yassl/src/buffer.cpp	2013-01-18 04:53:12 +0000
+++ Percona-Server/extra/yassl/src/buffer.cpp	2013-05-12 06:41:27 +0000
@@ -1,6 +1,5 @@
 /*
-   Copyright (c) 2005-2007 MySQL AB, 2009 Sun Microsystems, Inc.
-   Use is subject to license terms.
+   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/src/cert_wrapper.cpp'
--- Percona-Server/extra/yassl/src/cert_wrapper.cpp	2013-02-12 07:47:19 +0000
+++ Percona-Server/extra/yassl/src/cert_wrapper.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/src/crypto_wrapper.cpp'
--- Percona-Server/extra/yassl/src/crypto_wrapper.cpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/src/crypto_wrapper.cpp	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/src/handshake.cpp'
--- Percona-Server/extra/yassl/src/handshake.cpp	2013-02-12 07:47:19 +0000
+++ Percona-Server/extra/yassl/src/handshake.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -220,12 +220,45 @@
 }
 
 
+// sanity checks on encrypted message size
+static int sanity_check_message(SSL& ssl, uint msgSz)
+{
+    uint minSz = 0;
+
+    if (ssl.getSecurity().get_parms().cipher_type_ == block) {
+        uint blockSz = ssl.getCrypto().get_cipher().get_blockSize();
+        if (msgSz % blockSz)
+            return -1;
+
+        minSz = ssl.getSecurity().get_parms().hash_size_ + 1;  // pad byte too
+        if (blockSz > minSz)
+            minSz = blockSz;
+
+        if (ssl.isTLSv1_1())
+            minSz += blockSz;   // explicit IV
+    }
+    else {      // stream
+        minSz = ssl.getSecurity().get_parms().hash_size_;
+    }
+
+    if (msgSz < minSz)
+        return -1;
+
+    return 0;
+}
+
+
 // decrypt input message in place, store size in case needed later
 void decrypt_message(SSL& ssl, input_buffer& input, uint sz)
 {
     input_buffer plain(sz);
     opaque*      cipher = input.get_buffer() + input.get_current();
 
+    if (sanity_check_message(ssl, sz) != 0) {
+        ssl.SetError(sanityCipher_error);
+        return;
+    }
+
     ssl.useCrypto().use_cipher().decrypt(plain.get_buffer(), cipher, sz);
     memcpy(cipher, plain.get_buffer(), sz);
     ssl.useSecurity().use_parms().encrypt_size_ = sz;
@@ -769,6 +802,8 @@
                     return 0;
                 }
                 decrypt_message(ssl, buffer, hdr.length_);
+                if (ssl.GetError())
+                    return 0;
             }
                 
             mySTL::auto_ptr<Message> msg(mf.CreateObject(hdr.type_));

=== modified file 'Percona-Server/extra/yassl/src/lock.cpp'
--- Percona-Server/extra/yassl/src/lock.cpp	2013-02-12 07:47:19 +0000
+++ Percona-Server/extra/yassl/src/lock.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/src/log.cpp'
--- Percona-Server/extra/yassl/src/log.cpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/src/log.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/src/make.bat'
--- Percona-Server/extra/yassl/src/make.bat	2012-03-21 14:27:34 +0000
+++ Percona-Server/extra/yassl/src/make.bat	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-REM Copyright (C) 2006, 2007 MySQL AB
+REM Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 REM 
 REM This program is free software; you can redistribute it and/or modify
 REM it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/src/socket_wrapper.cpp'
--- Percona-Server/extra/yassl/src/socket_wrapper.cpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/src/socket_wrapper.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/src/ssl.cpp'
--- Percona-Server/extra/yassl/src/ssl.cpp	2013-02-12 07:47:19 +0000
+++ Percona-Server/extra/yassl/src/ssl.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/src/template_instnt.cpp'
--- Percona-Server/extra/yassl/src/template_instnt.cpp	2012-07-24 13:24:00 +0000
+++ Percona-Server/extra/yassl/src/template_instnt.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/src/timer.cpp'
--- Percona-Server/extra/yassl/src/timer.cpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/src/timer.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/src/yassl.cpp'
--- Percona-Server/extra/yassl/src/yassl.cpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/src/yassl.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/src/yassl_error.cpp'
--- Percona-Server/extra/yassl/src/yassl_error.cpp	2013-02-12 07:47:19 +0000
+++ Percona-Server/extra/yassl/src/yassl_error.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -144,6 +144,10 @@
         strncpy(buffer, "bad PreMasterSecret version error", max);
         break;
 
+    case sanityCipher_error :
+        strncpy(buffer, "sanity check on cipher text size error", max);
+        break;
+
         // openssl errors
     case SSL_ERROR_WANT_READ :
         strncpy(buffer, "the read operation would block", max);

=== modified file 'Percona-Server/extra/yassl/src/yassl_imp.cpp'
--- Percona-Server/extra/yassl/src/yassl_imp.cpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/src/yassl_imp.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -972,30 +972,193 @@
 }
 
 
+// check all bytes for equality 
+static int constant_compare(const byte* a, const byte* b, int len)
+{
+    int good = 0;
+    int bad  = 0;
+
+    for (int i = 0; i < len; i++) {
+        if (a[i] == b[i])
+            good++;
+        else
+            bad++;
+    }
+
+    if (good == len)
+        return 0;
+    else
+        return 0 - bad;  // failure
+}
+
+
+// check bytes for pad value
+static int pad_check(const byte* input, byte pad, int len)
+{
+    int good = 0;
+    int bad  = 0;
+
+    for (int i = 0; i < len; i++) {
+        if (input[i] == pad)
+            good++;
+        else
+            bad++;
+    }
+
+    if (good == len)
+        return 0;
+    else
+        return 0 - bad;  // failure
+}
+
+
+// get number of compression rounds
+static inline int get_rounds(int pLen, int padLen, int t)
+{
+    int  roundL1 = 1;  // round ups 
+    int  roundL2 = 1;
+
+    int L1 = COMPRESS_CONSTANT + pLen - t;
+    int L2 = COMPRESS_CONSTANT + pLen - padLen - 1 - t;
+
+    L1 -= COMPRESS_UPPER;
+    L2 -= COMPRESS_UPPER;
+
+    if ( (L1 % COMPRESS_LOWER) == 0)
+        roundL1 = 0;
+    if ( (L2 % COMPRESS_LOWER) == 0)
+        roundL2 = 0;
+
+    L1 /= COMPRESS_LOWER;
+    L2 /= COMPRESS_LOWER;
+
+    L1 += roundL1;
+    L2 += roundL2;
+
+    return L1 - L2;
+}
+
+
+// do compression rounds on dummy data
+static inline void compress_rounds(SSL& ssl, int rounds, const byte* dummy)
+{
+    if (rounds) {
+        Digest* digest = NULL;
+
+        MACAlgorithm ma = ssl.getSecurity().get_parms().mac_algorithm_;
+        if (ma == sha) 
+            digest = NEW_YS SHA;
+        else if (ma == md5)
+            digest = NEW_YS MD5;
+        else if (ma == rmd)
+            digest = NEW_YS RMD;
+        else
+            return;
+
+        for (int i = 0; i < rounds; i++)
+            digest->update(dummy, COMPRESS_LOWER);
+
+        ysDelete(digest);    
+    }
+}
+
+
+// timing resistant pad verification
+static int timing_verify(SSL& ssl, const byte* input, int padLen, int t,
+                         int pLen)
+{
+    byte verify[SHA_LEN];
+    byte dummy[MAX_PAD_SIZE];
+
+    memset(dummy, 1, sizeof(dummy));
+
+    if ( (t + padLen + 1) > pLen) {
+        pad_check(dummy, (byte)padLen, MAX_PAD_SIZE);
+        if (ssl.isTLS())
+            TLS_hmac(ssl, verify, input, pLen - t, application_data, 1);
+        else
+            hmac(ssl, verify, input, pLen - t, application_data, 1);
+        constant_compare(verify, input + pLen - t, t);
+
+        return -1;
+    }
+
+    if (pad_check(input + pLen - (padLen + 1), (byte)padLen, padLen + 1) != 0) {
+        pad_check(dummy, (byte)padLen, MAX_PAD_SIZE - padLen - 1);
+        if (ssl.isTLS())
+            TLS_hmac(ssl, verify, input, pLen - t, application_data, 1);
+        else
+            hmac(ssl, verify, input, pLen - t, application_data, 1);
+        constant_compare(verify, input + pLen - t, t);
+
+        return -1;
+    }
+
+    pad_check(dummy, (byte)padLen, MAX_PAD_SIZE - padLen - 1);
+    if (ssl.isTLS())
+        TLS_hmac(ssl, verify, input, pLen - padLen - 1 - t, application_data,1);
+    else
+        hmac(ssl, verify, input, pLen - padLen - 1 - t, application_data, 1);
+
+    compress_rounds(ssl, get_rounds(pLen, padLen, t), dummy);
+
+    if (constant_compare(verify, input + (pLen - padLen - 1 - t), t) != 0)
+        return -1;
+
+    return 0;
+}
+
+
 // Process handler for Data
 void Data::Process(input_buffer& input, SSL& ssl)
 {
     int msgSz = ssl.getSecurity().get_parms().encrypt_size_;
     int pad   = 0, padSz = 0;
     int ivExtra = 0;
+    int digestSz = ssl.getCrypto().get_digest().get_digestSize();
+    const byte* rawData = input.get_buffer() + input.get_current();
+    opaque verify[SHA_LEN];
 
     if (ssl.getSecurity().get_parms().cipher_type_ == block) {
         if (ssl.isTLSv1_1())  // IV
             ivExtra = ssl.getCrypto().get_cipher().get_blockSize();
         pad = *(input.get_buffer() + input.get_current() + msgSz -ivExtra - 1);
         padSz = 1;
-    }
-    int digestSz = ssl.getCrypto().get_digest().get_digestSize();
+
+        if (ssl.isTLS()) {
+            if (timing_verify(ssl, rawData, pad,digestSz, msgSz-ivExtra) != 0) {
+                ssl.SetError(verify_error);
+                return;
+            }
+        }
+        else {   // SSLv3, some don't do this padding right
+            int sz3 = msgSz - digestSz - pad - 1; 
+            hmac(ssl, verify, rawData, sz3, application_data, true);
+            if (constant_compare(verify, rawData + sz3, digestSz) != 0) {
+                ssl.SetError(verify_error);
+                return;
+            }
+        } 
+    }
+    else {  // stream
+        int streamSz = msgSz - digestSz; 
+        if (ssl.isTLS())
+            TLS_hmac(ssl, verify, rawData, streamSz, application_data, true);
+        else
+            hmac(ssl, verify, rawData, streamSz, application_data, true);
+        if (constant_compare(verify, rawData + streamSz, digestSz) != 0) {
+            ssl.SetError(verify_error);
+            return;
+        }
+    }
+
     int dataSz = msgSz - ivExtra - digestSz - pad - padSz;
-    opaque verify[SHA_LEN];
 
     if (dataSz < 0) {
         ssl.SetError(bad_input);
         return;
     }
 
-    const byte* rawData = input.get_buffer() + input.get_current();
-
     // read data
     if (dataSz) {                               // could be compressed
         if (ssl.CompressionOn()) {
@@ -1013,27 +1176,10 @@
             input.read(data->get_buffer(), dataSz);
             data->add_size(dataSz);
         }
-
-        if (ssl.isTLS())
-            TLS_hmac(ssl, verify, rawData, dataSz, application_data, true);
-        else
-            hmac(ssl, verify, rawData, dataSz, application_data, true);
-    }
-
-    // read mac and skip fill
-    opaque mac[SHA_LEN];
-    input.read(mac, digestSz);
-    input.set_current(input.get_current() + pad + padSz);
-
-    // verify
-    if (dataSz) {
-        if (memcmp(mac, verify, digestSz)) {
-            ssl.SetError(verify_error);
-            return;
-        }
-    }
-    else 
-        ssl.get_SEQIncrement(true);  // even though no data, increment verify
+    }
+
+    // advance past mac and fill
+    input.set_current(input.get_current() + digestSz + pad + padSz);
 }
 
 

=== modified file 'Percona-Server/extra/yassl/src/yassl_int.cpp'
--- Percona-Server/extra/yassl/src/yassl_int.cpp	2013-01-18 04:53:12 +0000
+++ Percona-Server/extra/yassl/src/yassl_int.cpp	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/benchmark/benchmark.cpp'
--- Percona-Server/extra/yassl/taocrypt/benchmark/benchmark.cpp	2012-08-22 01:40:20 +0000
+++ Percona-Server/extra/yassl/taocrypt/benchmark/benchmark.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2006, 2007 MySQL AB
+   Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/benchmark/make.bat'
--- Percona-Server/extra/yassl/taocrypt/benchmark/make.bat	2012-03-21 14:27:34 +0000
+++ Percona-Server/extra/yassl/taocrypt/benchmark/make.bat	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-REM Copyright (C) 2006, 2007 MySQL AB
+REM Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 REM 
 REM This program is free software; you can redistribute it and/or modify
 REM it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/include/aes.hpp'
--- Percona-Server/extra/yassl/taocrypt/include/aes.hpp	2013-02-12 07:47:19 +0000
+++ Percona-Server/extra/yassl/taocrypt/include/aes.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/include/algebra.hpp'
--- Percona-Server/extra/yassl/taocrypt/include/algebra.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/include/algebra.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/include/arc4.hpp'
--- Percona-Server/extra/yassl/taocrypt/include/arc4.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/include/arc4.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/include/asn.hpp'
--- Percona-Server/extra/yassl/taocrypt/include/asn.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/include/asn.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -112,7 +112,7 @@
     MAX_LENGTH_SZ =  5,    
     MAX_SEQ_SZ    =  5,    // enum(seq|con) + length(4)
     MAX_ALGO_SIZE =  9,
-    MAX_DIGEST_SZ = 25,    // SHA + enum(Bit or Octet) + length(4)
+    MAX_DIGEST_SZ = 69,    // SHA512 + enum(Bit or Octet) + length(4)
     DSA_SIG_SZ    = 40,
     ASN_NAME_MAX  = 512    // max total of all included names
 };
@@ -258,8 +258,11 @@
 
 
 enum ContentType { HUH = 651 };
-enum SigType  { SHAwDSA = 517, MD2wRSA = 646, MD5wRSA = 648, SHAwRSA =649};
-enum HashType { MD2h = 646, MD5h = 649, SHAh = 88 };
+enum SigType  { SHAwDSA = 517, MD2wRSA = 646, MD5wRSA = 648, SHAwRSA = 649,
+                SHA256wRSA = 655, SHA384wRSA = 656, SHA512wRSA = 657,
+                SHA256wDSA = 416 };
+enum HashType { MD2h = 646, MD5h = 649, SHAh = 88, SHA256h = 414,
+                SHA384h = 415, SHA512h = 416 };
 enum KeyType  { DSAk = 515, RSAk = 645 };     // sums of algo OID
 
 

=== modified file 'Percona-Server/extra/yassl/taocrypt/include/block.hpp'
--- Percona-Server/extra/yassl/taocrypt/include/block.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/include/block.hpp	2013-05-12 06:41:27 +0000
@@ -1,6 +1,5 @@
 /*
-   Copyright (c) 2005-2007 MySQL AB, 2009 Sun Microsystems, Inc.
-   Use is subject to license terms.
+   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/include/blowfish.hpp'
--- Percona-Server/extra/yassl/taocrypt/include/blowfish.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/include/blowfish.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/include/coding.hpp'
--- Percona-Server/extra/yassl/taocrypt/include/coding.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/include/coding.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/include/des.hpp'
--- Percona-Server/extra/yassl/taocrypt/include/des.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/include/des.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/include/dh.hpp'
--- Percona-Server/extra/yassl/taocrypt/include/dh.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/include/dh.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/include/dsa.hpp'
--- Percona-Server/extra/yassl/taocrypt/include/dsa.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/include/dsa.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/include/error.hpp'
--- Percona-Server/extra/yassl/taocrypt/include/error.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/include/error.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/include/file.hpp'
--- Percona-Server/extra/yassl/taocrypt/include/file.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/include/file.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/include/hash.hpp'
--- Percona-Server/extra/yassl/taocrypt/include/hash.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/include/hash.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/include/hc128.hpp'
--- Percona-Server/extra/yassl/taocrypt/include/hc128.hpp	2012-05-17 12:10:48 +0000
+++ Percona-Server/extra/yassl/taocrypt/include/hc128.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/include/hmac.hpp'
--- Percona-Server/extra/yassl/taocrypt/include/hmac.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/include/hmac.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/include/integer.hpp'
--- Percona-Server/extra/yassl/taocrypt/include/integer.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/include/integer.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/include/kernelc.hpp'
--- Percona-Server/extra/yassl/taocrypt/include/kernelc.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/include/kernelc.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/include/md2.hpp'
--- Percona-Server/extra/yassl/taocrypt/include/md2.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/include/md2.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/include/md4.hpp'
--- Percona-Server/extra/yassl/taocrypt/include/md4.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/include/md4.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/include/md5.hpp'
--- Percona-Server/extra/yassl/taocrypt/include/md5.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/include/md5.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/include/misc.hpp'
--- Percona-Server/extra/yassl/taocrypt/include/misc.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/include/misc.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/include/modarith.hpp'
--- Percona-Server/extra/yassl/taocrypt/include/modarith.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/include/modarith.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/include/modes.hpp'
--- Percona-Server/extra/yassl/taocrypt/include/modes.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/include/modes.hpp	2013-05-12 06:41:27 +0000
@@ -1,6 +1,5 @@
 /*
-   Copyright (c) 2005-2007 MySQL AB, 2009 Sun Microsystems, Inc.
-   Use is subject to license terms.
+   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/include/pwdbased.hpp'
--- Percona-Server/extra/yassl/taocrypt/include/pwdbased.hpp	2013-02-12 07:47:19 +0000
+++ Percona-Server/extra/yassl/taocrypt/include/pwdbased.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/include/rabbit.hpp'
--- Percona-Server/extra/yassl/taocrypt/include/rabbit.hpp	2012-05-17 12:10:48 +0000
+++ Percona-Server/extra/yassl/taocrypt/include/rabbit.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/include/random.hpp'
--- Percona-Server/extra/yassl/taocrypt/include/random.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/include/random.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/include/ripemd.hpp'
--- Percona-Server/extra/yassl/taocrypt/include/ripemd.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/include/ripemd.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/include/rsa.hpp'
--- Percona-Server/extra/yassl/taocrypt/include/rsa.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/include/rsa.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/include/runtime.hpp'
--- Percona-Server/extra/yassl/taocrypt/include/runtime.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/include/runtime.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/include/sha.hpp'
--- Percona-Server/extra/yassl/taocrypt/include/sha.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/include/sha.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -158,6 +158,12 @@
     void Transform();
 };
 
+enum { MAX_SHA2_DIGEST_SIZE = 64 };   // SHA512
+
+#else
+
+enum { MAX_SHA2_DIGEST_SIZE = 32 };   // SHA256
+
 #endif // WORD64_AVAILABLE
 
 

=== modified file 'Percona-Server/extra/yassl/taocrypt/include/twofish.hpp'
--- Percona-Server/extra/yassl/taocrypt/include/twofish.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/include/twofish.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/include/type_traits.hpp'
--- Percona-Server/extra/yassl/taocrypt/include/type_traits.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/include/type_traits.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/include/types.hpp'
--- Percona-Server/extra/yassl/taocrypt/include/types.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/include/types.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/mySTL/algorithm.hpp'
--- Percona-Server/extra/yassl/taocrypt/mySTL/algorithm.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/mySTL/algorithm.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/mySTL/helpers.hpp'
--- Percona-Server/extra/yassl/taocrypt/mySTL/helpers.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/mySTL/helpers.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/mySTL/list.hpp'
--- Percona-Server/extra/yassl/taocrypt/mySTL/list.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/mySTL/list.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/mySTL/memory.hpp'
--- Percona-Server/extra/yassl/taocrypt/mySTL/memory.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/mySTL/memory.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/mySTL/memory_array.hpp'
--- Percona-Server/extra/yassl/taocrypt/mySTL/memory_array.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/mySTL/memory_array.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/mySTL/pair.hpp'
--- Percona-Server/extra/yassl/taocrypt/mySTL/pair.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/mySTL/pair.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/mySTL/stdexcept.hpp'
--- Percona-Server/extra/yassl/taocrypt/mySTL/stdexcept.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/mySTL/stdexcept.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/mySTL/vector.hpp'
--- Percona-Server/extra/yassl/taocrypt/mySTL/vector.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/mySTL/vector.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/src/aes.cpp'
--- Percona-Server/extra/yassl/taocrypt/src/aes.cpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/src/aes.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/src/aestables.cpp'
--- Percona-Server/extra/yassl/taocrypt/src/aestables.cpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/src/aestables.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/src/algebra.cpp'
--- Percona-Server/extra/yassl/taocrypt/src/algebra.cpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/src/algebra.cpp	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/src/arc4.cpp'
--- Percona-Server/extra/yassl/taocrypt/src/arc4.cpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/src/arc4.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/src/asn.cpp'
--- Percona-Server/extra/yassl/taocrypt/src/asn.cpp	2013-03-05 12:46:43 +0000
+++ Percona-Server/extra/yassl/taocrypt/src/asn.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -986,12 +986,26 @@
         hasher.reset(NEW_TC SHA);
         ht = SHAh;
     }
+    else if (signatureOID_ == SHA256wRSA || signatureOID_ == SHA256wDSA) {
+        hasher.reset(NEW_TC SHA256);
+        ht = SHA256h;
+    }
+#ifdef WORD64_AVAILABLE
+    else if (signatureOID_ == SHA384wRSA) {
+        hasher.reset(NEW_TC SHA384);
+        ht = SHA384h;
+    }
+    else if (signatureOID_ == SHA512wRSA) {
+        hasher.reset(NEW_TC SHA512);
+        ht = SHA512h;
+    }
+#endif
     else {
         source_.SetError(UNKOWN_SIG_E);
         return false;
     }
 
-    byte digest[SHA::DIGEST_SIZE];      // largest size
+    byte digest[MAX_SHA2_DIGEST_SIZE];      // largest size
 
     hasher->Update(source_.get_buffer() + certBegin_, sigIndex_ - certBegin_);
     hasher->Final(digest);
@@ -1064,7 +1078,14 @@
                                       0x02, 0x05, 0x05, 0x00  };
     static const byte md2AlgoID[] = { 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d,
                                       0x02, 0x02, 0x05, 0x00};
-
+    static const byte sha256AlgoID[] = { 0x60, 0x86, 0x48, 0x01, 0x65, 0x03,
+                                         0x04, 0x02, 0x01, 0x05, 0x00 };
+#ifdef WORD64_AVAILABLE
+    static const byte sha384AlgoID[] = { 0x60, 0x86, 0x48, 0x01, 0x65, 0x03,
+                                         0x04, 0x02, 0x02, 0x05, 0x00 };
+    static const byte sha512AlgoID[] = { 0x60, 0x86, 0x48, 0x01, 0x65, 0x03,
+                                         0x04, 0x02, 0x03, 0x05, 0x00 };
+#endif
     int algoSz = 0;
     const byte* algoName = 0;
 
@@ -1074,6 +1095,23 @@
         algoName = shaAlgoID;
         break;
 
+    case SHA256h:
+        algoSz = sizeof(sha256AlgoID);
+        algoName = sha256AlgoID;
+        break;
+
+#ifdef WORD64_AVAILABLE
+    case SHA384h:
+        algoSz = sizeof(sha384AlgoID);
+        algoName = sha384AlgoID;
+        break;
+
+    case SHA512h:
+        algoSz = sizeof(sha512AlgoID);
+        algoName = sha512AlgoID;
+        break;
+#endif
+
     case MD2h:
         algoSz = sizeof(md2AlgoID);
         algoName = md2AlgoID;

=== modified file 'Percona-Server/extra/yassl/taocrypt/src/bftables.cpp'
--- Percona-Server/extra/yassl/taocrypt/src/bftables.cpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/src/bftables.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/src/blowfish.cpp'
--- Percona-Server/extra/yassl/taocrypt/src/blowfish.cpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/src/blowfish.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/src/coding.cpp'
--- Percona-Server/extra/yassl/taocrypt/src/coding.cpp	2013-02-12 07:47:19 +0000
+++ Percona-Server/extra/yassl/taocrypt/src/coding.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/src/des.cpp'
--- Percona-Server/extra/yassl/taocrypt/src/des.cpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/src/des.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/src/dh.cpp'
--- Percona-Server/extra/yassl/taocrypt/src/dh.cpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/src/dh.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/src/dsa.cpp'
--- Percona-Server/extra/yassl/taocrypt/src/dsa.cpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/src/dsa.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/src/file.cpp'
--- Percona-Server/extra/yassl/taocrypt/src/file.cpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/src/file.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/src/hash.cpp'
--- Percona-Server/extra/yassl/taocrypt/src/hash.cpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/src/hash.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/src/hc128.cpp'
--- Percona-Server/extra/yassl/taocrypt/src/hc128.cpp	2012-05-17 12:10:48 +0000
+++ Percona-Server/extra/yassl/taocrypt/src/hc128.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/src/integer.cpp'
--- Percona-Server/extra/yassl/taocrypt/src/integer.cpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/src/integer.cpp	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/src/make.bat'
--- Percona-Server/extra/yassl/taocrypt/src/make.bat	2012-03-21 14:27:34 +0000
+++ Percona-Server/extra/yassl/taocrypt/src/make.bat	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-REM Copyright (C) 2006, 2007 MySQL AB
+REM Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 REM 
 REM This program is free software; you can redistribute it and/or modify
 REM it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/src/md2.cpp'
--- Percona-Server/extra/yassl/taocrypt/src/md2.cpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/src/md2.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/src/md4.cpp'
--- Percona-Server/extra/yassl/taocrypt/src/md4.cpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/src/md4.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/src/md5.cpp'
--- Percona-Server/extra/yassl/taocrypt/src/md5.cpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/src/md5.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/src/misc.cpp'
--- Percona-Server/extra/yassl/taocrypt/src/misc.cpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/src/misc.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/src/rabbit.cpp'
--- Percona-Server/extra/yassl/taocrypt/src/rabbit.cpp	2012-05-17 12:10:48 +0000
+++ Percona-Server/extra/yassl/taocrypt/src/rabbit.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/src/random.cpp'
--- Percona-Server/extra/yassl/taocrypt/src/random.cpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/src/random.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/src/ripemd.cpp'
--- Percona-Server/extra/yassl/taocrypt/src/ripemd.cpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/src/ripemd.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/src/rsa.cpp'
--- Percona-Server/extra/yassl/taocrypt/src/rsa.cpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/src/rsa.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/src/sha.cpp'
--- Percona-Server/extra/yassl/taocrypt/src/sha.cpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/src/sha.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/src/template_instnt.cpp'
--- Percona-Server/extra/yassl/taocrypt/src/template_instnt.cpp	2012-05-17 12:10:48 +0000
+++ Percona-Server/extra/yassl/taocrypt/src/template_instnt.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/src/tftables.cpp'
--- Percona-Server/extra/yassl/taocrypt/src/tftables.cpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/src/tftables.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/src/twofish.cpp'
--- Percona-Server/extra/yassl/taocrypt/src/twofish.cpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/taocrypt/src/twofish.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/test/make.bat'
--- Percona-Server/extra/yassl/taocrypt/test/make.bat	2012-03-21 14:27:34 +0000
+++ Percona-Server/extra/yassl/taocrypt/test/make.bat	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-REM Copyright (C) 2006, 2007 MySQL AB
+REM Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 REM 
 REM This program is free software; you can redistribute it and/or modify
 REM it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/test/memory.cpp'
--- Percona-Server/extra/yassl/taocrypt/test/memory.cpp	2013-02-12 07:47:19 +0000
+++ Percona-Server/extra/yassl/taocrypt/test/memory.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/taocrypt/test/test.cpp'
--- Percona-Server/extra/yassl/taocrypt/test/test.cpp	2012-08-22 01:40:20 +0000
+++ Percona-Server/extra/yassl/taocrypt/test/test.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2006, 2007 MySQL AB
+   Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/testsuite/make.bat'
--- Percona-Server/extra/yassl/testsuite/make.bat	2012-03-21 14:27:34 +0000
+++ Percona-Server/extra/yassl/testsuite/make.bat	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-REM Copyright (C) 2006, 2007 MySQL AB
+REM Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 REM 
 REM This program is free software; you can redistribute it and/or modify
 REM it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/testsuite/test.hpp'
--- Percona-Server/extra/yassl/testsuite/test.hpp	2012-10-16 06:21:51 +0000
+++ Percona-Server/extra/yassl/testsuite/test.hpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/extra/yassl/testsuite/testsuite.cpp'
--- Percona-Server/extra/yassl/testsuite/testsuite.cpp	2012-08-22 01:40:20 +0000
+++ Percona-Server/extra/yassl/testsuite/testsuite.cpp	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2006, 2007 MySQL AB
+   Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/include/errmsg.h'
--- Percona-Server/include/errmsg.h	2013-04-15 07:19:08 +0000
+++ Percona-Server/include/errmsg.h	2013-05-12 06:41:27 +0000
@@ -1,7 +1,7 @@
 #ifndef ERRMSG_INCLUDED
 #define ERRMSG_INCLUDED
 
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/include/ft_global.h'
--- Percona-Server/include/ft_global.h	2012-08-22 01:40:20 +0000
+++ Percona-Server/include/ft_global.h	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/include/m_ctype.h'
--- Percona-Server/include/m_ctype.h	2013-01-18 04:53:12 +0000
+++ Percona-Server/include/m_ctype.h	2013-05-12 06:41:27 +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

=== modified file 'Percona-Server/include/m_string.h'
--- Percona-Server/include/m_string.h	2013-05-12 06:39:35 +0000
+++ Percona-Server/include/m_string.h	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/include/my_atomic.h'
--- Percona-Server/include/my_atomic.h	2012-12-07 12:43:40 +0000
+++ Percona-Server/include/my_atomic.h	2013-05-12 06:41:27 +0000
@@ -1,7 +1,7 @@
 #ifndef MY_ATOMIC_INCLUDED
 #define MY_ATOMIC_INCLUDED
 
-/* Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/include/my_base.h'
--- Percona-Server/include/my_base.h	2013-01-18 04:53:12 +0000
+++ Percona-Server/include/my_base.h	2013-05-12 06:41:27 +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
@@ -478,7 +478,8 @@
 #define HA_ERR_TABLE_IN_FK_CHECK  183    /* Table being used in foreign key check */
 #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_LAST               185    /* Copy of last error nr */
+#define HA_ERR_ROW_IN_WRONG_PARTITION 186 /* Row in wrong partition */
+#define HA_ERR_LAST               186    /* Copy of last error nr */
 
 /* Number of different errors */
 #define HA_ERR_ERRORS            (HA_ERR_LAST - HA_ERR_FIRST + 1)

=== modified file 'Percona-Server/include/my_dbug.h'
--- Percona-Server/include/my_dbug.h	2012-09-26 13:52:56 +0000
+++ Percona-Server/include/my_dbug.h	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. 
+/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. 
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/include/my_pthread.h'
--- Percona-Server/include/my_pthread.h	2013-01-18 04:53:12 +0000
+++ Percona-Server/include/my_pthread.h	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, 2012 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/include/my_sys.h'
--- Percona-Server/include/my_sys.h	2013-05-12 06:39:35 +0000
+++ Percona-Server/include/my_sys.h	2013-05-12 06:41:27 +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
@@ -247,6 +247,7 @@
 extern void (*error_handler_hook)(uint my_err, const char *str,myf MyFlags);
 extern void (*fatal_error_handler_hook)(uint my_err, const char *str,
 				       myf MyFlags);
+extern void(*sql_print_warning_hook)(const char *format,...);
 extern uint my_file_limit;
 extern ulong my_thread_stack_size;
 
@@ -676,6 +677,7 @@
                             va_list ap);
 extern int my_error_register(const char** (*get_errmsgs) (),
                              int first, int last);
+extern void my_printf_warning (const char * format, ...);
 extern const char **my_error_unregister(int first, int last);
 extern void my_message(uint my_err, const char *str,myf MyFlags);
 extern void my_message_stderr(uint my_err, const char *str, myf MyFlags);

=== modified file 'Percona-Server/include/my_time.h'
--- Percona-Server/include/my_time.h	2012-08-22 01:40:20 +0000
+++ Percona-Server/include/my_time.h	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/include/my_user.h'
--- Percona-Server/include/my_user.h	2010-10-27 11:32:32 +0000
+++ Percona-Server/include/my_user.h	2013-05-12 06:41:27 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2005 MySQL AB
+/* Copyright (c) 2005-2007 MySQL AB
+   Use is subject to license terms
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/include/my_xml.h'
--- Percona-Server/include/my_xml.h	2012-07-04 09:28:24 +0000
+++ Percona-Server/include/my_xml.h	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/include/mysql.h'
--- Percona-Server/include/mysql.h	2013-02-12 07:47:19 +0000
+++ Percona-Server/include/mysql.h	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/include/mysql/plugin.h'
--- Percona-Server/include/mysql/plugin.h	2013-05-12 06:39:35 +0000
+++ Percona-Server/include/mysql/plugin.h	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2005, 2011, 2012 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -551,6 +551,7 @@
                            unsigned int max_query_len);
 /* Increments the row counter, see THD::row_count */
 void thd_inc_row_count(MYSQL_THD thd);
+int thd_allow_batch(MYSQL_THD thd);
 
 void increment_thd_innodb_stats(MYSQL_THD thd,
                     unsigned long long trx_id,

=== modified file 'Percona-Server/include/mysql/plugin_audit.h.pp'
--- Percona-Server/include/mysql/plugin_audit.h.pp	2013-05-12 06:39:35 +0000
+++ Percona-Server/include/mysql/plugin_audit.h.pp	2013-05-12 06:41:27 +0000
@@ -233,6 +233,7 @@
 char *thd_security_context(void* thd, char *buffer, unsigned int length,
                            unsigned int max_query_len);
 void thd_inc_row_count(void* thd);
+int thd_allow_batch(void* thd);
 void increment_thd_innodb_stats(void* thd,
                     unsigned long long trx_id,
                     long io_reads,

=== modified file 'Percona-Server/include/mysql/plugin_auth.h.pp'
--- Percona-Server/include/mysql/plugin_auth.h.pp	2013-05-12 06:39:35 +0000
+++ Percona-Server/include/mysql/plugin_auth.h.pp	2013-05-12 06:41:27 +0000
@@ -233,6 +233,7 @@
 char *thd_security_context(void* thd, char *buffer, unsigned int length,
                            unsigned int max_query_len);
 void thd_inc_row_count(void* thd);
+int thd_allow_batch(void* thd);
 void increment_thd_innodb_stats(void* thd,
                     unsigned long long trx_id,
                     long io_reads,

=== modified file 'Percona-Server/include/mysql/plugin_auth_common.h'
--- Percona-Server/include/mysql/plugin_auth_common.h	2012-02-07 14:35:13 +0000
+++ Percona-Server/include/mysql/plugin_auth_common.h	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 #ifndef MYSQL_PLUGIN_AUTH_COMMON_INCLUDED
-/* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/include/mysql/plugin_ftparser.h.pp'
--- Percona-Server/include/mysql/plugin_ftparser.h.pp	2013-05-12 06:39:35 +0000
+++ Percona-Server/include/mysql/plugin_ftparser.h.pp	2013-05-12 06:41:27 +0000
@@ -186,6 +186,7 @@
 char *thd_security_context(void* thd, char *buffer, unsigned int length,
                            unsigned int max_query_len);
 void thd_inc_row_count(void* thd);
+int thd_allow_batch(void* thd);
 void increment_thd_innodb_stats(void* thd,
                     unsigned long long trx_id,
                     long io_reads,

=== modified file 'Percona-Server/include/mysql/psi/mysql_file.h'
--- Percona-Server/include/mysql/psi/mysql_file.h	2012-10-16 06:21:51 +0000
+++ Percona-Server/include/mysql/psi/mysql_file.h	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/include/mysql/psi/mysql_idle.h'
--- Percona-Server/include/mysql/psi/mysql_idle.h	2012-08-22 01:40:20 +0000
+++ Percona-Server/include/mysql/psi/mysql_idle.h	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.   
+/* Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.   
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/include/mysql/psi/mysql_stage.h'
--- Percona-Server/include/mysql/psi/mysql_stage.h	2012-08-22 01:40:20 +0000
+++ Percona-Server/include/mysql/psi/mysql_stage.h	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.   
+/* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.   
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/include/mysql/psi/psi.h'
--- Percona-Server/include/mysql/psi/psi.h	2013-01-18 04:53:12 +0000
+++ Percona-Server/include/mysql/psi/psi.h	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-/* 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
@@ -1372,7 +1372,7 @@
   @param info the process into string
   @param info_len the process into string length
 */
-typedef void (*set_thread_info_v1_t)(const char* info, int info_len);
+typedef void (*set_thread_info_v1_t)(const char* info, uint info_len);
 
 /**
   Attach a thread instrumentation to the running thread.

=== modified file 'Percona-Server/include/mysql/psi/psi_abi_v1.h.pp'
--- Percona-Server/include/mysql/psi/psi_abi_v1.h.pp	2013-01-18 04:53:12 +0000
+++ Percona-Server/include/mysql/psi/psi_abi_v1.h.pp	2013-05-12 06:41:27 +0000
@@ -357,7 +357,7 @@
 typedef void (*set_thread_command_v1_t)(int command);
 typedef void (*set_thread_start_time_v1_t)(time_t start_time);
 typedef void (*set_thread_state_v1_t)(const char* state);
-typedef void (*set_thread_info_v1_t)(const char* info, int info_len);
+typedef void (*set_thread_info_v1_t)(const char* info, uint info_len);
 typedef void (*set_thread_v1_t)(struct PSI_thread *thread);
 typedef void (*delete_current_thread_v1_t)(void);
 typedef void (*delete_thread_v1_t)(struct PSI_thread *thread);

=== modified file 'Percona-Server/include/mysql/service_my_snprintf.h'
--- Percona-Server/include/mysql/service_my_snprintf.h	2011-06-30 15:46:53 +0000
+++ Percona-Server/include/mysql/service_my_snprintf.h	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 #ifndef MYSQL_SERVICE_MY_SNPRINTF_INCLUDED
-/* Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -49,6 +49,7 @@
         string will be quoted according to MySQL identifier quoting rules.
 
   Both <width> and <precision> can be specified as numbers or '*'.
+  If an asterisk is used, an argument of type int is consumed.
 
   <length modifier> can be 'l', 'll', or 'z'.
 

=== modified file 'Percona-Server/include/mysql/services.h'
--- Percona-Server/include/mysql/services.h	2012-08-22 01:40:20 +0000
+++ Percona-Server/include/mysql/services.h	2013-05-12 06:41:27 +0000
@@ -1,5 +1,5 @@
 #ifndef MYSQL_SERVICES_INCLUDED
-/* Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/include/mysql_version.h.in'
--- Percona-Server/include/mysql_version.h.in	2007-09-13 14:19:46 +0000
+++ Percona-Server/include/mysql_version.h.in	2013-05-12 06:41:27 +0000
@@ -1,4 +1,5 @@
-/* Copyright Abandoned 1996, 1999, 2001 MySQL AB
+/* Copyright (c) 1996, 1999-2004, 2007 MySQL AB
+   Use is subject to license terms
    This file is public domain and comes with NO WARRANTY of any kind */
 
 /* Version numbers for protocol & mysqld */

=== modified file 'Percona-Server/include/password.h'
--- Percona-Server/include/password.h	2012-08-22 01:40:20 +0000
+++ Percona-Server/include/password.h	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2011, 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

=== modified file 'Percona-Server/include/service_versions.h'
--- Percona-Server/include/service_versions.h	2012-08-22 01:40:20 +0000
+++ Percona-Server/include/service_versions.h	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/include/sha1.h'
--- Percona-Server/include/sha1.h	2012-08-22 01:40:20 +0000
+++ Percona-Server/include/sha1.h	2013-05-12 06:41:27 +0000
@@ -1,8 +1,7 @@
 #ifndef SHA1_INCLUDED
 #define SHA1_INCLUDED
 
-/* Copyright (c) 2002, 2006 MySQL AB, 2009 Sun Microsystems, Inc.
-   Use is subject to license terms.
+/* Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/include/sslopt-longopts.h'
--- Percona-Server/include/sslopt-longopts.h	2012-08-16 15:00:09 +0000
+++ Percona-Server/include/sslopt-longopts.h	2013-05-12 06:41:27 +0000
@@ -1,7 +1,7 @@
 #ifndef SSLOPT_LONGOPTS_INCLUDED
 #define SSLOPT_LONGOPTS_INCLUDED
 
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/include/violite.h'
--- Percona-Server/include/violite.h	2013-05-12 06:39:35 +0000
+++ Percona-Server/include/violite.h	2013-05-12 06:41:27 +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
@@ -37,8 +37,8 @@
 
 enum enum_vio_type
 {
-  VIO_CLOSED, VIO_TYPE_TCPIP, VIO_TYPE_SOCKET, VIO_TYPE_NAMEDPIPE,
-  VIO_TYPE_SSL, VIO_TYPE_SHARED_MEMORY
+  VIO_TYPE_TCPIP, VIO_TYPE_SOCKET, VIO_TYPE_NAMEDPIPE, VIO_TYPE_SSL, 
+  VIO_TYPE_SHARED_MEMORY
 };
 
 /**
@@ -71,19 +71,19 @@
 #define HANDLE void *
 #endif /* __WIN__ */
 
-void	vio_delete(Vio* vio);
-int	vio_close(Vio* vio);
+void    vio_delete(Vio* vio);
+int vio_shutdown(Vio* vio, int how);
 my_bool vio_reset(Vio* vio, enum enum_vio_type type,
                   my_socket sd, void *ssl, uint flags);
-size_t	vio_read(Vio *vio, uchar *	buf, size_t size);
+size_t  vio_read(Vio *vio, uchar *	buf, size_t size);
 size_t  vio_read_buff(Vio *vio, uchar * buf, size_t size);
-size_t	vio_write(Vio *vio, const uchar * buf, size_t size);
+size_t  vio_write(Vio *vio, const uchar * buf, size_t size);
 /* setsockopt TCP_NODELAY at IPPROTO_TCP level, when possible */
-int	vio_fastsend(Vio *vio);
+int vio_fastsend(Vio *vio);
 /* setsockopt SO_KEEPALIVE at SOL_SOCKET level, when possible */
-int	vio_keepalive(Vio *vio, my_bool	onoff);
+int vio_keepalive(Vio *vio, my_bool	onoff);
 /* Whenever we should retry the last read/write operation. */
-my_bool	vio_should_retry(Vio *vio);
+my_bool vio_should_retry(Vio *vio);
 /* Check that operation was timed out */
 my_bool vio_was_timeout(Vio *vio);
 /* Short text description of the socket for those, who are curious.. */
@@ -161,36 +161,36 @@
 
 struct st_VioSSLFd
 *new_VioSSLConnectorFd(const char *key_file, const char *cert_file,
-		       const char *ca_file,  const char *ca_path,
-		       const char *cipher, enum enum_ssl_init_error *error,
+                       const char *ca_file,  const char *ca_path,
+                       const char *cipher, enum enum_ssl_init_error *error,
                        const char *crl_file, const char *crl_path);
 struct st_VioSSLFd
 *new_VioSSLAcceptorFd(const char *key_file, const char *cert_file,
-		      const char *ca_file,const char *ca_path,
-		      const char *cipher, enum enum_ssl_init_error *error,
+                      const char *ca_file,const char *ca_path,
+                      const char *cipher, enum enum_ssl_init_error *error,
                       const char *crl_file, const char *crl_path);
 void free_vio_ssl_acceptor_fd(struct st_VioSSLFd *fd);
 #endif /* ! EMBEDDED_LIBRARY */
 #endif /* HAVE_OPENSSL */
 
+void ssl_start(void);
 void vio_end(void);
 
-#ifdef	__cplusplus
+#ifdef  __cplusplus
 }
 #endif
 
 #if !defined(DONT_MAP_VIO)
-#define vio_delete(vio) 			(vio)->viodelete(vio)
-#define vio_errno(vio)	 			(vio)->vioerrno(vio)
+#define vio_delete(vio)                         (vio)->viodelete(vio)
+#define vio_errno(vio)                          (vio)->vioerrno(vio)
 #define vio_read(vio, buf, size)                ((vio)->read)(vio,buf,size)
 #define vio_write(vio, buf, size)               ((vio)->write)(vio, buf, size)
-#define vio_fastsend(vio)			(vio)->fastsend(vio)
-#define vio_keepalive(vio, set_keep_alive)	(vio)->viokeepalive(vio, set_keep_alive)
-#define vio_should_retry(vio) 			(vio)->should_retry(vio)
+#define vio_fastsend(vio)                       (vio)->fastsend(vio)
+#define vio_keepalive(vio, set_keep_alive)  (vio)->viokeepalive(vio, set_keep_alive)
+#define vio_should_retry(vio)                   (vio)->should_retry(vio)
 #define vio_was_timeout(vio)                    (vio)->was_timeout(vio)
-#define vio_close(vio)				((vio)->vioclose)(vio)
-#define vio_shutdown(vio,how)     ((vio)->shutdown)(vio,how)
-#define vio_peer_addr(vio, buf, prt, buflen)	(vio)->peer_addr(vio, buf, prt, buflen)
+#define vio_shutdown(vio,how)                   ((vio)->vioshutdown)(vio,how)
+#define vio_peer_addr(vio, buf, prt, buflen)    (vio)->peer_addr(vio, buf, prt, buflen)
 #define vio_io_wait(vio, event, timeout)        (vio)->io_wait(vio, event, timeout)
 #define vio_is_connected(vio)                   (vio)->is_connected(vio)
 #endif /* !defined(DONT_MAP_VIO) */
@@ -221,13 +221,14 @@
 /* This structure is for every connection on both sides */
 struct st_vio
 {
-  MYSQL_SOCKET  mysql_socket;     /* Instrumented socket */
-  my_bool		localhost;	/* Are we from localhost? */
-  struct sockaddr_storage	local;		/* Local internet address */
-  struct sockaddr_storage	remote;		/* Remote internet address */
+  MYSQL_SOCKET  mysql_socket;           /* Instrumented socket */
+  my_bool       localhost;              /* Are we from localhost? */
+  struct sockaddr_storage   local;      /* Local internet address */
+  struct sockaddr_storage   remote;     /* Remote internet address */
   int addrLen;                          /* Length of remote address */
-  enum enum_vio_type	type;		/* Type of connection */
-  char			desc[VIO_DESCRIPTION_SIZE]; /* Description string. This
+  enum enum_vio_type    type;           /* Type of connection */
+  my_bool               inactive; /* Connection inactive (has been shutdown) */
+  char                  desc[VIO_DESCRIPTION_SIZE]; /* Description string. This
                                                       member MUST NOT be
                                                       used directly, but only
                                                       via function
@@ -238,7 +239,16 @@
   char                  *read_end;      /* end of unfetched data */
   int                   read_timeout;   /* Timeout value (ms) for read ops. */
   int                   write_timeout;  /* Timeout value (ms) for write ops. */
-  /* function pointers. They are similar for socket/SSL/whatever */
+  
+  /* 
+     VIO vtable interface to be implemented by VIO's like SSL, Socket,
+     Named Pipe, etc.
+  */
+  
+  /* 
+     viodelete is responsible for cleaning up the VIO object by freeing 
+     internal buffers, closing descriptors, handles. 
+  */
   void    (*viodelete)(Vio*);
   int     (*vioerrno)(Vio*);
   size_t  (*read)(Vio*, uchar *, size_t);
@@ -250,9 +260,13 @@
   void    (*in_addr)(Vio*, struct sockaddr_storage*);
   my_bool (*should_retry)(Vio*);
   my_bool (*was_timeout)(Vio*);
-  int     (*vioclose)(Vio*);
+  /* 
+     vioshutdown is resposnible to shutdown/close the channel, so that no 
+     further communications can take place, however any related buffers,
+     descriptors, handles can remain valid after a shutdown.
+  */
+  int     (*vioshutdown)(Vio*, int);
   my_bool (*is_connected)(Vio*);
-  int     (*shutdown)(Vio *, int);
   my_bool (*has_data) (Vio*);
   int (*io_wait)(Vio*, enum enum_vio_io_event, int);
   my_bool (*connect)(Vio*, struct sockaddr *, socklen_t, int);
@@ -262,7 +276,7 @@
   HANDLE hPipe;
 #endif
 #ifdef HAVE_OPENSSL
-  void	  *ssl_arg;
+  void    *ssl_arg;
 #endif
 #ifdef HAVE_SMEM
   HANDLE  handle_file_map;

=== modified file 'Percona-Server/include/welcome_copyright_notice.h'
--- Percona-Server/include/welcome_copyright_notice.h	2012-12-20 11:34:11 +0000
+++ Percona-Server/include/welcome_copyright_notice.h	2013-05-12 06:41:27 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'Percona-Server/libmysql/CMakeLists.txt'
--- Percona-Server/libmysql/CMakeLists.txt	2013-04-15 07:19:08 +0000
+++ Percona-Server/libmysql/CMakeLists.txt	2013-05-12 06:41:27 +0000
@@ -173,7 +173,6 @@
 ENDIF()
 
 # Merge several convenience libraries into one big mysqlclient
-# and link them together into shared library.
 MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development)
 
 # Visual Studio users need debug  static library for debug projects
@@ -197,7 +196,11 @@
 ENDIF()
 
 IF(NOT DISABLE_SHARED)
-  MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries)
+  # Merge several convenience libraries into one big mysqlclient
+  # and link them together into shared library.
+  MERGE_LIBRARIES(libmysql SHARED ${LIBS}
+    EXPORTS ${CLIENT_API_FUNCTIONS}
+    COMPONENT SharedLibraries)
   IF(UNIX)
     # libtool compatability
     IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)

=== modified file 'Percona-Server/libmysql/libmysql.c'
--- Percona-Server/libmysql/libmysql.c	2013-03-05 12:46:43 +0000
+++ Percona-Server/libmysql/libmysql.c	2013-05-12 06:41:27 +0000
@@ -2119,7 +2119,14 @@
       DBUG_RETURN(1);
     }
 
-    net_clear(net, 1);				/* Sets net->write_pos */
+    if (net->vio)
+      net_clear(net, 1);          /* Sets net->write_pos */
+    else
+    {
+      set_stmt_errmsg(stmt, net);
+      DBUG_RETURN(1);             
+    }
+
     /* Reserve place for null-marker bytes */
     null_count= (stmt->param_count+7) /8;
     if (my_realloc_str(net, null_count + 1))

=== modified file 'Percona-Server/libmysqld/lib_sql.cc'
--- Percona-Server/libmysqld/lib_sql.cc	2013-03-05 12:46:43 +0000
+++ Percona-Server/libmysqld/lib_sql.cc	2013-05-12 06:41:27 +0000
@@ -659,7 +659,7 @@
   /* Signal successful initialization */
   mysql_mutex_lock(&LOCK_server_started);
   mysqld_server_started= 1;
-  mysql_cond_signal(&COND_server_started);
+  mysql_cond_broadcast(&COND_server_started);
   mysql_mutex_unlock(&LOCK_server_started);
 
 #ifdef WITH_NDBCLUSTER_STORAGE_ENGINE

=== modified file 'Percona-Server/mysql-test/collections/default.daily'
--- Percona-Server/mysql-test/collections/default.daily	2013-02-12 07:47:19 +0000
+++ Percona-Server/mysql-test/collections/default.daily	2013-05-12 06:41:27 +0000
@@ -18,6 +18,9 @@
 # Additional modes for rpl. Multi-Threaded Slave
 perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=rpl_MTS-debug --vardir=var-mts-rpl-debug --experimental=collections/default.experimental --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl
 
+# 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

=== modified file 'Percona-Server/mysql-test/collections/default.experimental'
--- Percona-Server/mysql-test/collections/default.experimental	2013-02-12 07:47:19 +0000
+++ Percona-Server/mysql-test/collections/default.experimental	2013-05-12 06:41:27 +0000
@@ -9,18 +9,14 @@
 main.mysqlslap @windows                  # Bug#11761520 2010-08-10 alik mysqlslap fails sporadically starting from Dahlia
 
 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
-main.kill @freebsd                       # Bug#12619719 2011-08-04 Occasional failure in PB2
-main.kill @darwin                        # Bug#12619719 2012-07-12 Occasional failure in PB2
 
 innodb.innodb_monitor                    # Bug#12320827 2011-08-04 Occasional failure in 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_parallel_switch_sequential       # BUG#13626976 2012-02-07 dlenev 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
 
-rpl.rpl_mixed_mts_rec_crash_safe @solaris          # Bug#12902514 2011-08-19 andrei mts recovery tests are slow
-rpl.rpl_mixed_mts_rec_crash_safe_checksum @solaris # Bug#12902514 2011-08-19 andrei same as rpl_mixed_mts_rec_crash_safe
-rpl.rpl_mixed_mts_crash_safe @solaris              # Bug#12902514 2011-08-19 andrei same as rpl_mixed_mts_rec_crash_safe
+

=== modified file 'Percona-Server/mysql-test/collections/default.push'
--- Percona-Server/mysql-test/collections/default.push	2013-02-12 07:47:19 +0000
+++ Percona-Server/mysql-test/collections/default.push	2013-05-12 06:41:27 +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=main_ps_row-debug --vardir=var-main-ps_row --suite=main --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=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 

=== modified file 'Percona-Server/mysql-test/collections/default.release.in'
--- Percona-Server/mysql-test/collections/default.release.in	2013-02-12 07:47:19 +0000
+++ Percona-Server/mysql-test/collections/default.release.in	2013-05-12 06:41:27 +0000
@@ -5,7 +5,7 @@
 # include default.weekly
 
 perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=debug      --vardir=var-debug --skip-rpl --report-features --debug-server
-perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=normal     --vardir=var-normal --report-features
+perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=normal     --vardir=var-normal --report-features --unit-tests
 perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=ps         --vardir=var-ps --ps-protocol
 perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=funcs1+ps  --vardir=var-funcs_1_ps --suite=funcs_1  --ps-protocol
 perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=funcs2     --vardir=var-funcs2     --suite=funcs_2

=== modified file 'Percona-Server/mysql-test/collections/default.weekly'
--- Percona-Server/mysql-test/collections/default.weekly	2013-03-05 12:46:43 +0000
+++ Percona-Server/mysql-test/collections/default.weekly	2013-05-12 06:41:27 +0000
@@ -52,12 +52,12 @@
 
 # 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=main_ps_row_4k_size --vardir=var-main-ps_row --suite=main --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=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=main_ps_row_8k_size --vardir=var-main-ps_row --suite=main --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=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
 
 

=== modified file 'Percona-Server/mysql-test/collections/disabled-gtid-on.list'
--- Percona-Server/mysql-test/collections/disabled-gtid-on.list	2012-10-24 08:43:19 +0000
+++ Percona-Server/mysql-test/collections/disabled-gtid-on.list	2013-05-12 06:41:27 +0000
@@ -1,169 +1,5 @@
-rpl_loaddata_s : Skipped and the reason requires further analysis.
-rpl_server_id2 : Skipped and the reason requires furhter analysis.
-rpl_server_id_ignore : Skipped and the reason requires further analysis.
-rpl_insert : Skipped and the reason requires furhter analysis.
-rpl_mix_insert_delayed : Skipped and the reason requires furhter analysis.
-rpl_row_mysqlbinlog : Skipped and the reason requires furhter analysis.
-rpl_typeconv : Skipped and the reason requires furhter analysis.
-rpl_slave_start: Skipped and the reason requires furhter analysis.
-rpl_change_master_crash_safe : Skipped and the reason requires furhter analysis.
-rpl_change_master : Skipped and the reason requires furhter analysis.
-rpl_extra_col_slave_innodb : Skipped and the reason requires furhter analysis..
-rpl_extra_col_slave_myisam : Skipped and the reason requires furhter analysis.
-rpl_seconds_behind_master : Skipped and the reason requires furhter analysis.
-rpl_loaddata_fatal : Skipped and the reason requires furhter analysis.
-rpl_row_delayed_ins : Skipped and the reason requires furhter analysis.
-rpl_row_max_relay_size : Skipped and the reason requires furhter analysis.
-rpl_stm_000001 : Skipped and the reason requires furhter analysis.
-rpl_filter_tables_not_exist : Skipped and the reason requires furhter analysis.
-rpl_ssl1 :  Skipped and the reason requires furhter analysis.
-rpl_circular_for_4_hosts : Skipped and the reason requires furhter analysis.
-rpl_loaddata : Skipped and the reason requires furhter analysis.
-rpl_heartbeat_2slaves : Skipped and the reason requires furhter analysis.
-mysql_client_test : Skipped and the reason requires furhter analysis.
-binlog_base64_flag : Skipped and the reason requires furhter analysis.
-binlog_old_versions : Skipped and the reason requires furhter analysis.
-rpl_row_img_eng_full : Skipped and the reason requires furhter analysis.
-skip_log_bin : Skipped and the reason requires furhter analysis.
-flush2 : Skipped and the reason requires furhter analysis.
-mysqldump-no-binlog : Skipped and the reason requires furhter analysis.
-delayed: Skipped and the reason requires further analysis.
-no_binlog: Skipped and the reason requires further analysis.
-openssl_1: Skipped and the reason requires further analysis.
-innodb-replace: Skipped and the reason requires further analysis.
-read_only_innodb: Skipped and the reason requires further analysis.
-sys_vars.delayed_insert_limit_func: Skipped and the reason requires further analysis.
-sp-lock: Skipped and the reason requires further analysis.
-lock_sync: Skipped and the reason requires further analysis.
-
-
-
-rpl_gtid_mode : Skipped due to problems in the test.
-binlog_gtid_errors : Skipped due to problems in the test.
-binlog_enforce_gtid_consistency : Skipped due to problems in the test.
-rpl_gtid_execution : Skipped due to problems in the test.
-
-
-
-rpl_get_master_version_and_clock : Skipped due to clashes in debug. 
-rpl_init_slave_errors : Skipped due to clashes in debug.
-rpl_corruption : Skipped due to clashes in debug.
-rpl_show_slave_running : Skipped due to clashes in debug.
-rpl_mysqlbinlog_gtid_on : Skipped due to clashes in debug.
-rpl_mts_debug : Skipped due to clashes in debug.
-rpl_row_4_bytes : Skipped due to clashes in debug.
-rpl_row_find_row_debug : Skipped due to clashes in debug.
-rpl_known_bugs_detection : Skipped due to clashes in debug.
-rpl_slave_load_remove_tmpfile : Skipped due to clashes in debug.
-binlog_index : Skipped due to clashes in debug.
-binlog_write_error : Skipped due to clashes in debug.
-rpl_show_errors : Skipped due to clashes in debug.
-rpl_bug33931    : Skipped due to clashes in debug.
-rpl_checksum : Skipped due to clashes in debug.
-rpl_checksum_cache: Skipped due to clashes in debug.
-
-
-
-rpl_row_crash_safe : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_stm_mixed_crash_safe : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-flush_block_commit_notembedded : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-multi_update : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-mysqlbinlog_start_stop : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-partition_binlog : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-user_var-binlog : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-binlog_checksum : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-binlog_crash_safe_master_checksum : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-binlog_database : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-binlog_delete_and_flush_index : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-binlog_drop_if_exists : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-binlog_implicit_commit : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-binlog_innodb : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-binlog_innodb_row : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-binlog_killed : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-binlog_mixed_load_data : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-binlog_mysqlbinlog_filter : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-binlog_rewrite : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-binlog_row_ctype_ucs : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-binlog_row_drop_tbl : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-binlog_row_drop_tmp_tbl : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-binlog_server_id : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-binlog_statement_insert_delayed : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-binlog_stm_blackhole : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-binlog_stm_ctype_ucs : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-binlog_stm_do_db : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-binlog_stm_drop_tbl : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-binlog_stm_drop_tmp_tbl : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-binlog_stm_ps : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-binlog_stm_row : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-binlog_stm_user_variables : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-binlog_mix : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-binlog_row : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-binlog_stm : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-relaylog : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_auto_increment_update_failure : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_conditional_comments : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_do_db_filter : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_do_grant : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_do_table_filter_insensitive : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_do_table_filter_sensitive : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_drop_temp : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_ignore_db_filter : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_ignore_table_filter_insensitive : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_ignore_table_filter_sensitive : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_innodb_mixed_ddl : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_innodb_mixed_dml : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_loaddata_map : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_mixed_mts_crash_safe : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_row_mts_crash_safe : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_stm_mts_crash_safe : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_mixed_mts_rec_crash_safe : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_row_mts_rec_crash_safe : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_stm_mts_rec_crash_safe : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_mixed_mts_rec_crash_safe_checksum : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_rbr_to_sbr : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_rewrt_db : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_rewrite_db_filter : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_row_drop : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_row_event_max_size : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_row_flsh_tbls : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_stm_flsh_tbls : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_slave_skip : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_stm_auto_increment_bug33029 : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_stm_loaddata_concurrent : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_stm_multi_query : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_stm_user_variables : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_user : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_row_basic_11bugs : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-rpl_crash_safe_master : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-binlog_truncate_myisam : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs.
-
-
-
-rpl_stm_insert_delayed : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs and positions. Check extra/rpl_tests/rpl_insert_delayed.test.
-rpl_row_insert_delayed : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs and positions. Check extra/rpl_tests/rpl_insert_delayed.test.
-rpl_mixed_insert_delayed : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs and positions. Check extra/rpl_tests/rpl_insert_delayed.test.
-
-
-
-rpl_insert_ignore : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs and positions. Check mysql-test/extra/rpl_tests/rpl_insert_ignore.test.
-
-
-
-rpl_row_log : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs and positions. Check mysql-test/extra/rpl_tests/rpl_log.test.
-rpl_stm_log : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs and positions. Check mysql-test/extra/rpl_tests/rpl_log.test.
-rpl_row_log_innodb : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs and positions. Check mysql-test/extra/rpl_tests/rpl_log.test.
-
-
-
-binlog_killed : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs and positions.
-binlog_killed_simulate : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs and positions.
-rpl_binlog_errors : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs and positions.
-rpl_dual_pos_advance : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs and positions.
-rpl_grant_plugin : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs and positions.
-rpl_stm_mix_show_relaylog_events : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs and positions.
-rpl_row_show_relaylog_events : Skipped because SHOW BINLOG/RELAY EVENTS produce different outputs and positions.
-
-
-
-rpl_cross_version : Disabled because the not_gtid_enabled.inc does not work.
-rpl_server_uuid : Disabled because the not_gtid_enabled.inc does not work.
+binlog.binlog_variables_relay_log_index        : No need to test. Binary log off.
+binlog.binlog_variables_relay_log              : No need to test. Binary log off.
+binlog.binlog_base64_flag                      : No need to test. Binary log off.
+binlog.binlog_hexdump                          : No need to test. Binary log off.
+binlog.binlog_old_versions                     : No need to test. Binary log off.

=== added file 'Percona-Server/mysql-test/extra/binlog_tests/binlog_implicit_commit.inc'
--- Percona-Server/mysql-test/extra/binlog_tests/binlog_implicit_commit.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/extra/binlog_tests/binlog_implicit_commit.inc	2013-05-12 06:41:27 +0000
@@ -0,0 +1,60 @@
+# The purpose of this test is to test that setting autocommit does a
+# commit of outstanding transactions and nothing is left pending in
+# the transaction cache.
+
+# We need a transactional engine, so let's use InnoDB
+CREATE TABLE t1 (id INT) ENGINE = InnoDB;
+
+# Testing SET AUTOCOMMIT
+SET BINLOG_FORMAT = STATEMENT;
+
+let $cleanup = COMMIT;
+
+let $prepare = SET AUTOCOMMIT = 0;
+let $statement = SET AUTOCOMMIT = 1;
+source extra/binlog_tests/implicit.test;
+
+let $prepare = SET AUTOCOMMIT = 1;
+let $statement = SET AUTOCOMMIT = 1;
+source extra/binlog_tests/implicit.test;
+
+let $prepare = SET AUTOCOMMIT = 0;
+let $statement = SET AUTOCOMMIT = 0;
+source extra/binlog_tests/implicit.test;
+
+let $prepare = SET AUTOCOMMIT = 1;
+let $statement = SET AUTOCOMMIT = 0;
+source extra/binlog_tests/implicit.test;
+
+SET BINLOG_FORMAT = ROW;
+let $prepare = SET AUTOCOMMIT = 0;
+let $statement = SET AUTOCOMMIT = 1;
+source extra/binlog_tests/implicit.test;
+
+let $prepare = SET AUTOCOMMIT = 1;
+let $statement = SET AUTOCOMMIT = 1;
+source extra/binlog_tests/implicit.test;
+
+let $prepare = SET AUTOCOMMIT = 0;
+let $statement = SET AUTOCOMMIT = 0;
+source extra/binlog_tests/implicit.test;
+
+let $prepare = SET AUTOCOMMIT = 1;
+let $statement = SET AUTOCOMMIT = 0;
+source extra/binlog_tests/implicit.test;
+
+RESET MASTER;
+SET AUTOCOMMIT = 0;
+INSERT INTO t1 VALUES (1);
+source include/show_binlog_events.inc;
+LOCK TABLES t1 WRITE;
+source include/show_binlog_events.inc;
+INSERT INTO t1 VALUES (2);
+source include/show_binlog_events.inc;
+UNLOCK TABLES;
+source include/show_binlog_events.inc;
+COMMIT;
+source include/show_binlog_events.inc;
+
+# Cleaning up
+DROP TABLE t1;

=== added file 'Percona-Server/mysql-test/extra/binlog_tests/binlog_innodb.inc'
--- Percona-Server/mysql-test/extra/binlog_tests/binlog_innodb.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/extra/binlog_tests/binlog_innodb.inc	2013-05-12 06:41:27 +0000
@@ -0,0 +1,171 @@
+
+SET BINLOG_FORMAT=MIXED;
+
+RESET MASTER;
+
+CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=INNODB;
+INSERT INTO t1 VALUES (1,1),(2,2),(3,3),(4,4),(5,5),(6,6);
+
+SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ;
+BEGIN;
+# Should be logged as statement
+UPDATE t1 SET b = 2*a WHERE a > 1;
+COMMIT;
+
+SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
+BEGIN;
+# Should be logged as rows
+UPDATE t1 SET b = a * a WHERE a > 3;
+COMMIT;
+
+# Check that errors are generated when trying to use READ COMMITTED
+# transaction isolation level in STATEMENT binlog mode.
+
+SET BINLOG_FORMAT=STATEMENT;
+
+SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+BEGIN;
+error ER_BINLOG_STMT_MODE_AND_ROW_ENGINE;
+UPDATE t1 SET b = 1*a WHERE a > 1;
+COMMIT;
+
+SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
+BEGIN;
+error ER_BINLOG_STMT_MODE_AND_ROW_ENGINE;
+UPDATE t1 SET b = 2*a WHERE a > 2;
+COMMIT;
+
+SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ;
+BEGIN;
+UPDATE t1 SET b = 3*a WHERE a > 3;
+COMMIT;
+
+SET SESSION TRANSACTION ISOLATION LEVEL SERIALIZABLE;
+BEGIN;
+UPDATE t1 SET b = 4*a WHERE a > 4;
+COMMIT;
+
+SET BINLOG_FORMAT=MIXED;
+
+SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+BEGIN;
+UPDATE t1 SET b = 1*a WHERE a > 1;
+COMMIT;
+
+SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
+BEGIN;
+UPDATE t1 SET b = 2*a WHERE a > 2;
+COMMIT;
+
+SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ;
+BEGIN;
+UPDATE t1 SET b = 3*a WHERE a > 3;
+COMMIT;
+
+SET SESSION TRANSACTION ISOLATION LEVEL SERIALIZABLE;
+BEGIN;
+UPDATE t1 SET b = 4*a WHERE a > 4;
+COMMIT;
+
+SET BINLOG_FORMAT=ROW;
+
+SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+BEGIN;
+UPDATE t1 SET b = 1*a WHERE a > 1;
+COMMIT;
+
+SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
+BEGIN;
+UPDATE t1 SET b = 2*a WHERE a > 2;
+COMMIT;
+
+SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ;
+BEGIN;
+UPDATE t1 SET b = 3*a WHERE a > 3;
+COMMIT;
+
+SET SESSION TRANSACTION ISOLATION LEVEL SERIALIZABLE;
+BEGIN;
+UPDATE t1 SET b = 4*a WHERE a > 4;
+COMMIT;
+
+source include/show_binlog_events.inc;
+
+DROP TABLE t1;
+
+
+#
+# Let us test binlog_cache_use and binlog_cache_disk_use status vars.
+# Actually this test has nothing to do with innodb per se, it just requires
+# transactional table.
+#
+flush status;
+show status like "binlog_cache_use";
+show status like "binlog_cache_disk_use";
+
+create table t1 (a int) engine=innodb;
+
+# Now we are going to create transaction which is long enough so its
+# transaction binlog will be flushed to disk...
+let $1=2000;
+disable_query_log;
+begin;
+while ($1)
+{
+ eval insert into t1 values( $1 );
+ dec $1;
+}
+commit;
+enable_query_log;
+show status like "binlog_cache_use";
+show status like "binlog_cache_disk_use";
+
+# Transaction which should not be flushed to disk and so should not
+# increase binlog_cache_disk_use.
+begin;
+delete from t1;
+commit;
+show status like "binlog_cache_use";
+show status like "binlog_cache_disk_use";
+drop table t1;
+
+#
+# Bug#27716  	multi-update did partially and has not binlogged
+#
+
+CREATE TABLE `t1` (
+  `a` int(11) NOT NULL auto_increment,
+  `b` int(11) default NULL,
+  PRIMARY KEY  (`a`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
+
+CREATE TABLE `t2` (
+  `a` int(11) NOT NULL auto_increment,
+  `b` int(11) default NULL,
+  PRIMARY KEY  (`a`)
+) ENGINE=INNODB DEFAULT CHARSET=latin1 ;
+
+# A. testing multi_update::send_eof() execution branch
+insert into t1 values (1,1),(2,2);
+insert into t2 values (1,1),(4,4);
+reset master;
+--error ER_DUP_ENTRY
+UPDATE t2,t1 SET t2.a=t1.a+2;
+# check
+select * from t2 /* must be (3,1), (4,4) */;
+--echo # There must no UPDATE in binlog;
+source include/show_binlog_events.inc;
+
+# B. testing multi_update::send_error() execution branch
+delete from t1;
+delete from t2;
+insert into t1 values (1,2),(3,4),(4,4);
+insert into t2 values (1,2),(3,4),(4,4);
+reset master;
+--error ER_DUP_ENTRY
+UPDATE t2,t1  SET t2.a=t2.b where t2.a=t1.a;
+--echo # There must be no UPDATE query event;
+source include/show_binlog_events.inc;
+
+# cleanup bug#27716
+drop table t1, t2;

=== added file 'Percona-Server/mysql-test/extra/binlog_tests/binlog_mysqlbinlog_row.inc'
--- Percona-Server/mysql-test/extra/binlog_tests/binlog_mysqlbinlog_row.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/extra/binlog_tests/binlog_mysqlbinlog_row.inc	2013-05-12 06:41:27 +0000
@@ -0,0 +1,484 @@
+--echo #
+--echo # Preparatory cleanup.
+--echo #
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+--echo #
+--echo # We need a fixed timestamp to avoid varying results.
+--echo #
+SET timestamp=1000000000;
+
+--echo #
+--echo # Delete all existing binary logs.
+--echo #
+RESET MASTER;
+
+
+CREATE TABLE t1 (c01 BIT);
+INSERT INTO t1 VALUES (0);
+INSERT INTO t1 VALUES (1);
+DROP TABLE t1;
+
+CREATE TABLE t1 (c01 BIT(7));
+INSERT INTO t1 VALUES (1);
+INSERT INTO t1 VALUES (2);
+INSERT INTO t1 VALUES (4);
+INSERT INTO t1 VALUES (8);
+INSERT INTO t1 VALUES (16);
+INSERT INTO t1 VALUES (32);
+INSERT INTO t1 VALUES (64);
+INSERT INTO t1 VALUES (127);
+DELETE FROM t1 WHERE c01=127;
+UPDATE t1 SET c01=15 WHERE c01=16;
+DROP TABLE t1;
+
+CREATE TABLE t1 (a BIT(20), b CHAR(2));
+INSERT INTO t1 VALUES (b'00010010010010001001', 'ab');
+DROP TABLE t1;
+
+CREATE TABLE t1 (c02 BIT(64));
+INSERT INTO t1 VALUES (1);
+INSERT INTO t1 VALUES (2);
+INSERT INTO t1 VALUES (128);
+INSERT INTO t1 VALUES (b'1111111111111111111111111111111111111111111111111111111111111111');
+DROP TABLE t1;
+
+
+CREATE TABLE t1 (c03 TINYINT);
+INSERT INTO t1 VALUES (1),(2),(3);
+INSERT INTO t1 VALUES (-128);
+UPDATE t1 SET c03=2 WHERE c03=1;
+DELETE FROM t1 WHERE c03=-128;
+DROP TABLE t1;
+
+CREATE TABLE t1 (c04 TINYINT UNSIGNED);
+INSERT INTO t1 VALUES (128), (255);
+UPDATE t1 SET c04=2 WHERE c04=1;
+DELETE FROM t1 WHERE c04=255;
+DROP TABLE t1;
+
+CREATE TABLE t1 (c06 BOOL);
+INSERT INTO t1 VALUES (TRUE);
+DELETE FROM t1 WHERE c06=TRUE;
+DROP TABLE t1;
+
+CREATE TABLE t1 (c07 SMALLINT);
+INSERT INTO t1 VALUES (1234);
+DELETE FROM t1 WHERE c07=1234;
+DROP TABLE t1;
+
+CREATE TABLE t1 (c08 SMALLINT UNSIGNED);
+INSERT INTO t1 VALUES (32768), (65535);
+UPDATE t1 SET c08=2 WHERE c08=32768;
+DELETE FROM t1 WHERE c08=65535;
+DROP TABLE t1;
+
+CREATE TABLE t1 (c10 MEDIUMINT);
+INSERT INTO t1 VALUES (12345);
+DELETE FROM t1 WHERE c10=12345;
+DROP TABLE t1;
+
+CREATE TABLE t1 (c11 MEDIUMINT UNSIGNED);
+INSERT INTO t1 VALUES (8388608), (16777215);
+UPDATE t1 SET c11=2 WHERE c11=8388608;
+DELETE FROM t1 WHERE c11=16777215;
+DROP TABLE t1;
+
+CREATE TABLE t1 (c13 INT);
+INSERT INTO t1 VALUES (123456);
+DELETE FROM t1 WHERE c13=123456;
+DROP TABLE t1;
+
+CREATE TABLE t1 (c14 INT UNSIGNED);
+INSERT INTO t1 VALUES (2147483648), (4294967295);
+UPDATE t1 SET c14=2 WHERE c14=2147483648;
+DELETE FROM t1 WHERE c14=4294967295;
+DROP TABLE t1;
+
+CREATE TABLE t1 (c16 BIGINT);
+INSERT INTO t1 VALUES (1234567890);
+DELETE FROM t1 WHERE c16=1234567890;
+DROP TABLE t1;
+
+CREATE TABLE t1 (c17 BIGINT UNSIGNED);
+INSERT INTO t1 VALUES (9223372036854775808), (18446744073709551615);
+UPDATE t1 SET c17=2 WHERE c17=9223372036854775808;
+DELETE FROM t1 WHERE c17=18446744073709551615;
+DROP TABLE t1;
+
+CREATE TABLE t1 (c19 FLOAT);
+INSERT INTO t1 VALUES (123.2234);
+DELETE FROM t1 WHERE c19>123;
+DROP TABLE t1;
+
+CREATE TABLE t1 (c22 DOUBLE);
+INSERT INTO t1 VALUES (123434.22344545);
+DELETE FROM t1 WHERE c22>123434;
+DROP TABLE t1;
+
+#
+
+CREATE TABLE t1 (c25 DECIMAL(10,5));
+INSERT INTO t1 VALUES (124.45);
+INSERT INTO t1 VALUES (-543.21);
+DELETE FROM t1 WHERE c25=124.45;
+DROP TABLE t1;
+
+#
+
+CREATE TABLE t1 (c28 DATE);
+INSERT INTO t1 VALUES ('2001-02-03');
+DELETE FROM t1 WHERE c28='2001-02-03';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c29 DATETIME);
+INSERT INTO t1 VALUES ('2001-02-03 10:20:30');
+DELETE FROM t1 WHERE c29='2001-02-03 10:20:30';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c30 TIMESTAMP);
+INSERT INTO t1 VALUES ('2001-02-03 10:20:30');
+DELETE FROM t1 WHERE c30='2001-02-03 10:20:30';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c31 TIME);
+INSERT INTO t1 VALUES ('11:22:33');
+DELETE FROM t1 WHERE c31='11:22:33';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c32 YEAR);
+INSERT INTO t1 VALUES ('2001');
+DELETE FROM t1 WHERE c32=2001;
+DROP TABLE t1;
+
+#
+
+CREATE TABLE t1 (c33 CHAR);
+INSERT INTO t1 VALUES ('a');
+DELETE FROM t1 WHERE c33='a';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c34 CHAR(0));
+INSERT INTO t1 VALUES ('');
+DELETE FROM t1 WHERE c34='';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c35 CHAR(1));
+INSERT INTO t1 VALUES ('b');
+DELETE FROM t1 WHERE c35='b';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c36 CHAR(255));
+INSERT INTO t1 VALUES (repeat('c',255));
+DELETE FROM t1 WHERE c36>'c';
+DROP TABLE t1;
+
+#
+
+CREATE TABLE t1 (c37 NATIONAL CHAR);
+INSERT INTO t1 VALUES ('a');
+DELETE FROM t1 WHERE c37='a';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c38 NATIONAL CHAR(0));
+INSERT INTO t1 VALUES ('');
+DELETE FROM t1 WHERE c38='';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c39 NATIONAL CHAR(1));
+INSERT INTO t1 VALUES ('a');
+DELETE FROM t1 WHERE c39='a';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c40 NATIONAL CHAR(255));
+INSERT INTO t1 VALUES (repeat('a', 255));
+INSERT INTO t1 VALUES (repeat(_latin1 0xDF, 255));
+DELETE FROM t1 WHERE c40>'a';
+DROP TABLE t1;
+
+#
+
+CREATE TABLE t1 (c41 CHAR CHARACTER SET UCS2);
+INSERT INTO t1 VALUES ('a');
+DELETE FROM t1 WHERE c41='a';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c42 CHAR(0) CHARACTER SET UCS2);
+INSERT INTO t1 VALUES ('');
+DELETE FROM t1 WHERE c42='';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c43 CHAR(1) CHARACTER SET UCS2);
+INSERT INTO t1 VALUES ('a');
+DELETE FROM t1 WHERE c43='a';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c44 CHAR(255) CHARACTER SET UCS2);
+INSERT INTO t1 VALUES (repeat('a', 255));
+INSERT INTO t1 VALUES (repeat(_latin1 0xDF, 255));
+DELETE FROM t1 WHERE c44>'a';
+DROP TABLE t1;
+
+#
+
+CREATE TABLE t1 (c45 VARCHAR(0));
+INSERT INTO t1 VALUES ('');
+DELETE FROM t1 WHERE c45='';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c46 VARCHAR(1));
+INSERT INTO t1 VALUES ('a');
+DELETE FROM t1 WHERE c46='a';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c47 VARCHAR(255));
+INSERT INTO t1 VALUES (repeat('a',255));
+DELETE FROM t1 WHERE c47>'a';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c48 VARCHAR(261));
+INSERT INTO t1 VALUES (repeat('a',261));
+DELETE FROM t1 WHERE c48>'a';
+DROP TABLE t1;
+
+#
+
+CREATE TABLE t1 (c49 NATIONAL VARCHAR(0));
+INSERT INTO t1 VALUES ('');
+DELETE FROM t1 WHERE c49='';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c50 NATIONAL VARCHAR(1));
+INSERT INTO t1 VALUES ('a');
+DELETE FROM t1 WHERE c50='a';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c51 NATIONAL VARCHAR(255));
+INSERT INTO t1 VALUES (repeat('a',255));
+INSERT INTO t1 VALUES (repeat(_latin1 0xDF, 255));
+DELETE FROM t1 WHERE c51>'a';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c52 NATIONAL VARCHAR(261));
+INSERT INTO t1 VALUES (repeat('a',261));
+INSERT INTO t1 VALUES (repeat(_latin1 0xDF, 261));
+DELETE FROM t1 WHERE c52>'a';
+DROP TABLE t1;
+
+#
+
+CREATE TABLE t1 (c53 VARCHAR(0) CHARACTER SET ucs2);
+INSERT INTO t1 VALUES ('');
+DELETE FROM t1 WHERE c53='';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c54 VARCHAR(1) CHARACTER SET ucs2);
+INSERT INTO t1 VALUES ('a');
+DELETE FROM t1 WHERE c54='a';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c55 VARCHAR(255) CHARACTER SET ucs2);
+INSERT INTO t1 VALUES (repeat('ab', 127));
+DELETE FROM t1 WHERE c55>'a';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c56 VARCHAR(261) CHARACTER SET ucs2);
+INSERT INTO t1 VALUES (repeat('ab', 130));
+DELETE FROM t1 WHERE c56>'a';
+DROP TABLE t1;
+
+#
+
+CREATE TABLE t1 (c57 BINARY);
+INSERT INTO t1 VALUES (0x00);
+INSERT INTO t1 VALUES (0x02);
+INSERT INTO t1 VALUES ('a');
+DELETE FROM t1 WHERE c57='a';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c58 BINARY(0));
+INSERT INTO t1 VALUES ('');
+DELETE FROM t1 WHERE c58='';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c59 BINARY(1));
+INSERT INTO t1 VALUES (0x00);
+INSERT INTO t1 VALUES (0x02);
+INSERT INTO t1 VALUES ('a');
+DELETE FROM t1 WHERE c59='a';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c60 BINARY(255));
+INSERT INTO t1 VALUES (0x00);
+INSERT INTO t1 VALUES (0x02);
+INSERT INTO t1 VALUES (repeat('a\0',120));
+DELETE FROM t1 WHERE c60<0x02;
+DROP TABLE t1;
+
+#
+
+CREATE TABLE t1 (c61 VARBINARY(0));
+INSERT INTO t1 VALUES ('');
+DELETE FROM t1 WHERE c61='';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c62 VARBINARY(1));
+INSERT INTO t1 VALUES (0x00);
+INSERT INTO t1 VALUES (0x02);
+INSERT INTO t1 VALUES ('a');
+DELETE FROM t1 WHERE c62=0x02;
+DROP TABLE t1;
+
+CREATE TABLE t1 (c63 VARBINARY(255));
+INSERT INTO t1 VALUES (0x00);
+INSERT INTO t1 VALUES (0x02);
+INSERT INTO t1 VALUES (repeat('a\0',120));
+DELETE FROM t1 WHERE c63=0x02;
+DROP TABLE t1;
+
+#
+
+CREATE TABLE t1 (c65 TINYBLOB);
+INSERT INTO t1 VALUES ('tinyblob1');
+DELETE FROM t1 WHERE c65='tinyblob1';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c68 BLOB);
+INSERT INTO t1 VALUES ('blob1');
+DELETE FROM t1 WHERE c68='blob1';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c71 MEDIUMBLOB);
+INSERT INTO t1 VALUES ('mediumblob1');
+DELETE FROM t1 WHERE c71='mediumblob1';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c74 LONGBLOB);
+INSERT INTO t1 VALUES ('longblob1');
+DELETE FROM t1 WHERE c74='longblob1';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c66 TINYTEXT);
+INSERT INTO t1 VALUES ('tinytext1');
+DELETE FROM t1 WHERE c66='tinytext1';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c69 TEXT);
+INSERT INTO t1 VALUES ('text1');
+DELETE FROM t1 WHERE c69='text1';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c72 MEDIUMTEXT);
+INSERT INTO t1 VALUES ('mediumtext1');
+DELETE FROM t1 WHERE c72='mediumtext1';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c75 LONGTEXT);
+INSERT INTO t1 VALUES ('longtext1');
+DELETE FROM t1 WHERE c75='longtext1';
+DROP TABLE t1;
+
+#
+
+CREATE TABLE t1 (c67 TINYTEXT CHARACTER SET UCS2);
+INSERT INTO t1 VALUES ('tinytext1');
+DELETE FROM t1 WHERE c67='tinytext1';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c70 TEXT CHARACTER SET UCS2);
+INSERT INTO t1 VALUES ('text1');
+DELETE FROM t1 WHERE c70='text1';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c73 MEDIUMTEXT CHARACTER SET UCS2);
+INSERT INTO t1 VALUES ('mediumtext1');
+DELETE FROM t1 WHERE c73='mediumtext1';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c76 LONGTEXT CHARACTER SET UCS2);
+INSERT INTO t1 VALUES ('longtext1');
+DELETE FROM t1 WHERE c76='longtext1';
+DROP TABLE t1;
+
+#
+
+CREATE TABLE t1 (c77 ENUM('a','b','c'));
+INSERT INTO t1 VALUES ('b');
+DELETE FROM t1 WHERE c77='b';
+DROP TABLE t1;
+
+#
+
+CREATE TABLE t1 (c78 SET('a','b','c','d','e','f'));
+INSERT INTO t1 VALUES ('a,b');
+INSERT INTO t1 VALUES ('a,c');
+INSERT INTO t1 VALUES ('b,c');
+INSERT INTO t1 VALUES ('a,b,c');
+INSERT INTO t1 VALUES ('a,b,c,d');
+INSERT INTO t1 VALUES ('a,b,c,d,e');
+INSERT INTO t1 VALUES ('a,b,c,d,e,f');
+DELETE FROM t1 WHERE c78='a,b';
+DROP TABLE t1;
+
+#
+# Start of FSP-enabled data types
+#
+SET time_zone='+00:00';
+SET timestamp=UNIX_TIMESTAMP('2002-02-02 20:20:20') + 0.123456;
+SET @t='00:00:01.123456'; 
+CREATE TABLE t1 (
+  c79 TIME(6), c80 TIME(5), c81 TIME(4),
+  c82 TIME(3), c83 TIME(2), c84 TIME(1)
+);
+INSERT INTO t1 VALUES (@t, @t, @t, @t, @t, @t);
+INSERT INTO t1 VALUES (NOW(), NOW(), NOW(), NOW(), NOW(), NOW());
+INSERT INTO t1 VALUES (NOW(6), NOW(6), NOW(6), NOW(6), NOW(6), NOW(6));
+DROP TABLE t1;
+
+SET @ts='2001-01-01 00:00:00.123456';
+CREATE TABLE t1 (
+  c85 DATETIME(6), c86 DATETIME(5), c87 DATETIME(4),
+  c88 DATETIME(3), c89 DATETIME(2), c90 DATETIME(1)
+);
+INSERT INTO t1 VALUES (@ts, @ts, @ts, @ts, @ts, @ts);
+INSERT INTO t1 VALUES (NOW(), NOW(), NOW(), NOW(), NOW(), NOW());
+INSERT INTO t1 VALUES (NOW(6), NOW(6), NOW(6), NOW(6), NOW(6), NOW(6));
+DROP TABLE t1;
+
+SET @ts='2001-01-01 00:00:00.123456';
+CREATE TABLE t1 (
+  c85 TIMESTAMP(6), c86 TIMESTAMP(5), c87 TIMESTAMP(4),
+  c88 TIMESTAMP(3), c89 TIMESTAMP(2), c90 TIMESTAMP(1)
+);
+INSERT INTO t1 VALUES (@ts, @ts, @ts, @ts, @ts, @ts);
+INSERT INTO t1 VALUES (NOW(), NOW(), NOW(), NOW(), NOW(), NOW());
+INSERT INTO t1 VALUES (NOW(6), NOW(6), NOW(6), NOW(6), NOW(6), NOW(6));
+DROP TABLE t1;
+
+SET timestamp=1000000000;
+SET time_zone=default;
+#
+# End of FSP-enabled data types
+#
+
+
+#
+# Check multi-table update
+#
+CREATE TABLE t1 (a int NOT NULL DEFAULT 0, b int NOT NULL DEFAULT 0);
+CREATE TABLE t2 (a int NOT NULL DEFAULT 0, b int NOT NULL DEFAULT 0);
+INSERT INTO t1 SET a=1;
+INSERT INTO t1 SET b=1;
+INSERT INTO t2 SET a=1;
+INSERT INTO t2 SET b=1;
+UPDATE t1, t2 SET t1.a=10, t2.a=20;
+DROP TABLE t1,t2;
+
+flush logs;
+
+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 #/ /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

=== added file 'Percona-Server/mysql-test/extra/binlog_tests/binlog_mysqlbinlog_start_stop.inc'
--- Percona-Server/mysql-test/extra/binlog_tests/binlog_mysqlbinlog_start_stop.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/extra/binlog_tests/binlog_mysqlbinlog_start_stop.inc	2013-05-12 06:41:27 +0000
@@ -0,0 +1,91 @@
+# ==== Purpose ====
+#
+# Test the --[start|stop]-[position|datetime] options to mysqlbinlog,
+# with/without --read-from-remote-server, with one or two binary logs
+# as input.
+#
+# ==== Implementation ====
+
+# TODO: Need to look at making row based version once new binlog client is complete.
+
+CREATE TABLE t1 (a INT);
+RESET MASTER;
+
+# We need to set fixed timestamps in this test.
+# Use a date in the future to keep a growing timestamp along the
+# binlog (including the Start_log_event). This test will work 
+# unchanged everywhere, because mysql-test-run has fixed TZ, which it
+# exports (so mysqlbinlog has same fixed TZ).
+--let $datetime_1= 2031-01-01 12:00:00
+eval SET TIMESTAMP= UNIX_TIMESTAMP("$datetime_1");
+INSERT INTO t1 VALUES(1);
+--let $pos_1= query_get_value(SHOW MASTER STATUS, Position, 1)
+
+--let $datetime_2= 2032-01-01 12:00:00
+eval SET TIMESTAMP= UNIX_TIMESTAMP("$datetime_2");
+INSERT INTO t1 VALUES(2);
+--let $pos_2= query_get_value(SHOW MASTER STATUS, Position, 1)
+
+eval SET TIMESTAMP= UNIX_TIMESTAMP("2033-01-01 12:00:00");
+INSERT INTO t1 VALUES(3);
+
+--let $file_1= query_get_value(SHOW MASTER STATUS, File, 1)
+FLUSH LOGS;
+
+SET TIMESTAMP= UNIX_TIMESTAMP("2034-01-01 12:00:00");
+INSERT INTO t1 VALUES(4);
+--let $pos_3= query_get_value(SHOW MASTER STATUS, Position, 1)
+--let $datetime_3= 2035-01-01 12:00:00
+eval SET TIMESTAMP= UNIX_TIMESTAMP("$datetime_3");
+INSERT INTO t1 VALUES(5);
+
+--let $file_2= query_get_value(SHOW MASTER STATUS, File, 1)
+FLUSH LOGS;
+
+--let $MYSQLD_DATADIR= `select @@datadir`
+
+--echo
+--echo ==== Local ====
+
+--let $start_position= $pos_1
+--let $start_datetime= $datetime_1
+
+--let $stop_position= $pos_2
+--let $stop_datetime= $datetime_2
+--let $extra_options= $MYSQLD_DATADIR/$file_1
+--source extra/binlog_tests/mysqlbinlog_start_stop_1.inc
+
+--echo
+--echo ==== Local with 2 binlogs on command line ====
+# This is to verify that some options apply only to first, or last binlog
+
+--let $stop_position= $pos_3
+--let $stop_datetime= $datetime_3
+--let $extra_options= $MYSQLD_DATADIR/$file_1 $MYSQLD_DATADIR/$file_2
+--source extra/binlog_tests/mysqlbinlog_start_stop_1.inc
+
+--echo
+--echo ==== Remote ====
+
+--let $stop_position= $pos_2
+--let $stop_datetime= $datetime_2
+--let $extra_options= --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT $file_1
+--source extra/binlog_tests/mysqlbinlog_start_stop_1.inc
+
+--echo
+--echo ==== Remote with 2 binlogs on command line ====
+
+--let $stop_position= $pos_3
+--let $stop_datetime= $datetime_3
+--let $extra_options= --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT $file_1 $file_2
+--source extra/binlog_tests/mysqlbinlog_start_stop_1.inc
+
+# ==== to-last-log ====
+
+--let $extra_options= --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT $file_1
+--let $option= --to-last-log
+--source extra/binlog_tests/mysqlbinlog_start_stop_2.inc
+
+--echo
+--echo ==== clean up ====
+DROP TABLE t1;

=== modified file 'Percona-Server/mysql-test/extra/binlog_tests/blackhole.test'
--- Percona-Server/mysql-test/extra/binlog_tests/blackhole.test	2010-11-17 10:16:13 +0000
+++ Percona-Server/mysql-test/extra/binlog_tests/blackhole.test	2013-05-12 06:41:27 +0000
@@ -199,7 +199,7 @@
 insert into t1 values (NULL), (33), (NULL);
 set insert_id= 5;
 insert into t1 values (55), (NULL);
-source include/show_binlog_events2.inc;
+source include/show_binlog_events.inc;
 
 # cleanup
 drop table t1;

=== modified file 'Percona-Server/mysql-test/extra/binlog_tests/mysqlbinlog_row_engine.inc'
--- Percona-Server/mysql-test/extra/binlog_tests/mysqlbinlog_row_engine.inc	2013-01-18 04:53:12 +0000
+++ Percona-Server/mysql-test/extra/binlog_tests/mysqlbinlog_row_engine.inc	2013-05-12 06:41:27 +0000
@@ -1809,6 +1809,10 @@
   ('2008-03-08','VARCHAR-03-08',38),
   ('2008-03-09','VARCHAR-03-09',39);
 
+ANALYZE TABLE t1;
+ANALYZE TABLE t2;
+ANALYZE TABLE t3;
+
 --echo #
 --echo # Multi-table update.
 --echo #

=== modified file 'Percona-Server/mysql-test/extra/binlog_tests/mysqlbinlog_start_stop_2.inc'
--- Percona-Server/mysql-test/extra/binlog_tests/mysqlbinlog_start_stop_2.inc	2012-01-06 20:00:48 +0000
+++ Percona-Server/mysql-test/extra/binlog_tests/mysqlbinlog_start_stop_2.inc	2013-05-12 06:41:27 +0000
@@ -30,5 +30,5 @@
 --echo ---- $option_text ----
 
 # Print output
---replace_regex /SET @@SESSION.GTID_NEXT= '.*'/SET @@SESSION.GTID_NEXT= 'GTID';/ /([0-9A-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 'Percona-Server/mysql-test/extra/rpl_tests/delayed_slave_wait_on_query.inc'
--- Percona-Server/mysql-test/extra/rpl_tests/delayed_slave_wait_on_query.inc	2012-02-17 19:46:49 +0000
+++ Percona-Server/mysql-test/extra/rpl_tests/delayed_slave_wait_on_query.inc	2013-05-12 06:41:27 +0000
@@ -31,11 +31,11 @@
 
 --let $assert_text= Query $query_number should not be executed
 --let $assert_cond= MAX(b) < $query_number FROM t1
---source include/rpl_assert.inc
+--source include/assert.inc
 
 --let $assert_text= Status should be 'Waiting until MASTER_DELAY...'
 --let $assert_cond= "[SHOW SLAVE STATUS, Slave_SQL_Running_State, 1]" LIKE "Waiting until MASTER_DELAY%"
---source include/rpl_assert.inc
+--source include/assert.inc
 
 --echo # sleep 1*T
 --sleep $time1
@@ -45,11 +45,11 @@
 
 --let $assert_text= Query $query_number should be executed
 --let $assert_cond= MAX(b) = $query_number FROM t1
---source include/rpl_assert.inc
+--source include/assert.inc
 
 --let $assert_text= Status should be 'Has read all relay log...'
 --let $assert_cond= "[SHOW SLAVE STATUS, Slave_SQL_Running_State, 1]" LIKE "Slave has read all relay log%"
---source include/rpl_assert.inc
+--source include/assert.inc
 
 
 --source include/check_slave_is_running.inc

=== modified file 'Percona-Server/mysql-test/extra/rpl_tests/rpl_deadlock.test'
--- Percona-Server/mysql-test/extra/rpl_tests/rpl_deadlock.test	2012-07-26 16:05:43 +0000
+++ Percona-Server/mysql-test/extra/rpl_tests/rpl_deadlock.test	2013-05-12 06:41:27 +0000
@@ -25,7 +25,8 @@
 SHOW CREATE TABLE t1;
 SHOW CREATE TABLE t2;
 SHOW CREATE TABLE t3;
-SHOW VARIABLES LIKE 'slave_transaction_retries';
+SELECT @@GLOBAL.slave_transaction_retries;
+SELECT @@GLOBAL.innodb_lock_wait_timeout;
 --source include/stop_slave.inc
 
 connection master;
@@ -50,7 +51,7 @@
 # Save variable 'Slave_retried_transactions' before deadlock
 let $slave_retried_transactions= query_get_value(SHOW GLOBAL STATUS LIKE 'Slave_retried_transactions', Value, 1);
 --connection slave2
-START SLAVE;
+--source include/start_slave.inc
 --connection slave
 # Wait until SQL thread blocked: variable 'Slave_retried_transactions' will incremented
 let $status_var= Slave_retried_transactions;
@@ -60,13 +61,12 @@
 --source include/wait_for_status_var.inc
 SELECT COUNT(*) FROM t2;
 COMMIT;
+source include/check_slave_is_running.inc;
 sync_with_master;
 
 # Check the data
 SELECT * FROM t1;
 SELECT * FROM t3;
-# Check that no error is reported
-source include/check_slave_is_running.inc;
 --echo
 
 # 2) Test lock wait timeout
@@ -181,7 +181,9 @@
 
 let $slave_sql_errno= 1205; # ER_LOCK_TIMEOUT
 let $show_slave_sql_error= 0;
+let $rpl_debug= 1;
 source include/wait_for_slave_sql_error.inc;
+let $rpl_debug= 0;
 
 rollback;
 

=== modified file 'Percona-Server/mysql-test/extra/rpl_tests/rpl_mts_crash_safe.inc'
--- Percona-Server/mysql-test/extra/rpl_tests/rpl_mts_crash_safe.inc	2013-01-18 04:53:12 +0000
+++ Percona-Server/mysql-test/extra/rpl_tests/rpl_mts_crash_safe.inc	2013-05-12 06:41:27 +0000
@@ -118,7 +118,10 @@
   --echo ** fixing gaps **
   --let $rpl_server_number= 2