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

[Alexey Kopytov]

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

    Fix for bug #1262439 “Compiling using Bison 3.0 does not work”.

http://jenkins.percona.com/view/PXB%202.2/job/percona-xtrabackup-2.2-param/128/

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-03-20 12:24:00 +0000
+++ CMakeLists.txt	2014-04-28 14:59:06 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, 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
@@ -398,14 +398,15 @@
   SET(DEFAULT_SYSCONFDIR "${SYSCONFDIR}")
 ENDIF()
 
-OPTION(TMPDIR
-"PATH to MySQL TMP dir. If unspecified, defaults to P_tmpdir in <stdio.h>" OFF)
-IF(TMPDIR)
+SET(TMPDIR "P_tmpdir"
+  CACHE PATH
+  "PATH to MySQL TMP dir. Defaults to the P_tmpdir macro in <stdio.h>")
+IF(TMPDIR STREQUAL "P_tmpdir")
+  # Do not quote it, to refer to the P_tmpdir macro.
+  SET(DEFAULT_TMPDIR "P_tmpdir")
+ELSE()
   # Quote it, to make it a const char string.
   SET(DEFAULT_TMPDIR "\"${TMPDIR}\"")
-ELSE()
-  # Do not quote it, to refer to the P_tmpdir macro in <stdio.h>.
-  SET(DEFAULT_TMPDIR "P_tmpdir")
 ENDIF()
 
 # Run platform tests

=== modified file 'VERSION'
--- VERSION	2014-03-20 12:24:00 +0000
+++ VERSION	2014-04-28 14:59:06 +0000
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=6
-MYSQL_VERSION_PATCH=16
+MYSQL_VERSION_PATCH=17
 MYSQL_VERSION_EXTRA=

=== modified file 'client/mysql.cc'
--- client/mysql.cc	2014-01-09 11:48:43 +0000
+++ client/mysql.cc	2014-04-28 14:59:06 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -1315,9 +1315,9 @@
 
   put_info("Welcome to the MySQL monitor.  Commands end with ; or \\g.",
 	   INFO_INFO);
-  sprintf((char*) glob_buffer.ptr(),
-	  "Your MySQL connection id is %lu\nServer version: %s\n",
-	  mysql_thread_id(&mysql), server_version_string(&mysql));
+  snprintf((char*) glob_buffer.ptr(), glob_buffer.alloced_length(),
+	   "Your MySQL connection id is %lu\nServer version: %s\n",
+	   mysql_thread_id(&mysql), server_version_string(&mysql));
   put_info((char*) glob_buffer.ptr(),INFO_INFO);
 
   put_info(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"), INFO_INFO);

=== modified file 'client/mysql_config_editor.cc'
--- client/mysql_config_editor.cc	2013-01-23 11:16:25 +0000
+++ client/mysql_config_editor.cc	2014-04-28 14:59:06 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2014, 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
@@ -776,7 +776,7 @@
   {
     verbose_msg("File exists.\n");
 
-    file_size= stat_info.st_size;
+    file_size= (size_t) stat_info.st_size;
 
 #ifdef _WIN32
     if (1)
@@ -943,7 +943,7 @@
 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);
@@ -1295,7 +1295,7 @@
 
   @param plain     [in]   Plain text to be encrypted.
   @param plain_len [in]   Length of the plain text.
-  @param cipher    [in]   Encrypted cipher text.
+  @param cipher    [out]  Encrypted cipher text.
 
   @return                 -1 if error encountered,
                           length encrypted, otherwise.
@@ -1306,9 +1306,12 @@
   DBUG_ENTER("encrypt_buffer");
   int aes_len;
 
-  aes_len= my_aes_get_size(plain_len);
+  aes_len= my_aes_get_size(plain_len, my_aes_128_ecb);
 
-  if (my_aes_encrypt(plain, plain_len, cipher, my_key, LOGIN_KEY_LEN) == aes_len)
+  if (my_aes_encrypt((const unsigned char *) plain, plain_len,
+                     (unsigned char *) cipher,
+                     (const unsigned char *) my_key, LOGIN_KEY_LEN,
+                     my_aes_128_ecb, NULL) == aes_len)
     DBUG_RETURN(aes_len);
 
   verbose_msg("Error! Couldn't encrypt the buffer.\n");
@@ -1321,7 +1324,7 @@
 
   @param cipher     [in]  Cipher text to be decrypted.
   @param cipher_len [in]  Length of the cipher text.
-  @param plain      [in]  Decrypted plain text.
+  @param plain      [out] Decrypted plain text.
 
   @return                 -1 if error encountered,
                           length decrypted, otherwise.
@@ -1332,8 +1335,11 @@
   DBUG_ENTER("decrypt_buffer");
   int aes_length;
 
-  if ((aes_length= my_aes_decrypt(cipher, cipher_len, (char *) plain,
-                                  my_key, LOGIN_KEY_LEN)) > 0)
+  if ((aes_length= my_aes_decrypt((const unsigned char *) cipher, cipher_len,
+                                  (unsigned char *) plain,
+                                  (const unsigned char *) my_key,
+                                  LOGIN_KEY_LEN,
+                                  my_aes_128_ecb, NULL)) > 0)
     DBUG_RETURN(aes_length);
 
   verbose_msg("Error! Couldn't decrypt the buffer.\n");

=== modified file 'client/mysql_upgrade.c'
--- client/mysql_upgrade.c	2013-11-27 08:36:11 +0000
+++ client/mysql_upgrade.c	2014-04-28 14:59:06 +0000
@@ -476,6 +476,7 @@
   */
   if (run_tool(tool_executable_name,
                &ds_tmp, /* Get output from command, discard*/
+               "--no-defaults",
                "--help",
                "2>&1",
                IF_WIN("> NUL", "> /dev/null"),

=== modified file 'client/mysqladmin.cc'
--- client/mysqladmin.cc	2013-03-19 14:59:50 +0000
+++ client/mysqladmin.cc	2014-04-28 14:59:06 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -40,7 +40,7 @@
 static int interval=0;
 static my_bool option_force=0,interrupted=0,new_line=0,
                opt_compress=0, opt_relative=0, opt_verbose=0, opt_vertical=0,
-               tty_password= 0, opt_nobeep;
+               tty_password= 0, opt_nobeep, opt_secure_auth= TRUE;
 static my_bool debug_info_flag= 0, debug_check_flag= 0;
 static uint tcp_port = 0, option_wait = 0, option_silent=0, nr_iterations;
 static uint opt_count_iterations= 0, my_end_arg;
@@ -181,6 +181,9 @@
    "Currently only works with extended-status.",
    &opt_relative, &opt_relative, 0, GET_BOOL, NO_ARG, 0, 0, 0,
   0, 0, 0},
+  {"secure-auth", OPT_SECURE_AUTH, "Refuse client connecting to server if it"
+    " uses old (pre-4.1.1) protocol.", &opt_secure_auth,
+    &opt_secure_auth, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
 #ifdef HAVE_SMEM
   {"shared-memory-base-name", OPT_SHARED_MEMORY_BASE_NAME,
    "Base name of shared memory.", &shared_memory_base_name, &shared_memory_base_name,
@@ -349,6 +352,8 @@
 
   if (opt_bind_addr)
     mysql_options(&mysql,MYSQL_OPT_BIND,opt_bind_addr);
+  if (!opt_secure_auth)
+    mysql_options(&mysql, MYSQL_SECURE_AUTH,(char*)&opt_secure_auth);
   if (opt_compress)
     mysql_options(&mysql,MYSQL_OPT_COMPRESS,NullS);
   if (opt_connect_timeout)

=== modified file 'client/mysqlbinlog.cc'
--- client/mysqlbinlog.cc	2013-11-27 08:36:11 +0000
+++ client/mysqlbinlog.cc	2014-04-28 14:59:06 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -131,6 +131,7 @@
 static uint my_end_arg;
 static const char* sock= 0;
 static char *opt_plugin_dir= 0, *opt_default_auth= 0;
+static my_bool opt_secure_auth= TRUE;
 
 #ifdef HAVE_SMEM
 static char *shared_memory_base_name= 0;
@@ -1472,6 +1473,9 @@
    "prefix for the file names.",
    &output_file, &output_file, 0, GET_STR, REQUIRED_ARG,
    0, 0, 0, 0, 0, 0},
+  {"secure-auth", OPT_SECURE_AUTH, "Refuse client connecting to server if it"
+    " uses old (pre-4.1.1) protocol.", &opt_secure_auth,
+    &opt_secure_auth, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
   {"server-id", OPT_SERVER_ID,
    "Extract only binlog entries created by the server having the given id.",
    &server_id, &server_id, 0, GET_ULONG,
@@ -1833,6 +1837,8 @@
     mysql_options(mysql, MYSQL_OPT_PROTOCOL, (char*) &opt_protocol);
   if (opt_bind_addr)
     mysql_options(mysql, MYSQL_OPT_BIND, opt_bind_addr);
+  if (!opt_secure_auth)
+    mysql_options(mysql, MYSQL_SECURE_AUTH,(char*)&opt_secure_auth);
 #ifdef HAVE_SMEM
   if (shared_memory_base_name)
     mysql_options(mysql, MYSQL_SHARED_MEMORY_BASE_NAME,

=== modified file 'client/mysqlcheck.c'
--- client/mysqlcheck.c	2014-01-06 06:03:08 +0000
+++ client/mysqlcheck.c	2014-04-28 14:59:06 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -41,7 +41,7 @@
                opt_silent = 0, opt_auto_repair = 0, ignore_errors = 0,
                tty_password= 0, opt_frm= 0, debug_info_flag= 0, debug_check_flag= 0,
                opt_fix_table_names= 0, opt_fix_db_names= 0, opt_upgrade= 0,
-               opt_write_binlog= 1;
+               opt_write_binlog= 1, opt_secure_auth=TRUE;
 static uint verbose = 0, opt_mysql_port=0;
 static int my_end_arg;
 static char * opt_mysql_unix_port = 0;
@@ -144,6 +144,9 @@
    "when commands should not be sent to replication slaves.",
    &opt_write_binlog, &opt_write_binlog, 0, GET_BOOL, NO_ARG,
    1, 0, 0, 0, 0, 0},
+  {"secure-auth", OPT_SECURE_AUTH, "Refuse client connecting to server if it"
+    " uses old (pre-4.1.1) protocol.", &opt_secure_auth,
+    &opt_secure_auth, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
   {"optimize", 'o', "Optimize table.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0,
    0, 0},
   {"password", 'p',
@@ -891,6 +894,8 @@
     mysql_options(&mysql_connection,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);
   if (opt_bind_addr)
     mysql_options(&mysql_connection, MYSQL_OPT_BIND, opt_bind_addr);
+  if (!opt_secure_auth)
+    mysql_options(&mysql_connection, MYSQL_SECURE_AUTH,(char*)&opt_secure_auth);
 #ifdef HAVE_SMEM
   if (shared_memory_base_name)
     mysql_options(&mysql_connection,MYSQL_SHARED_MEMORY_BASE_NAME,shared_memory_base_name);

=== modified file 'client/mysqldump.c'
--- client/mysqldump.c	2014-03-20 12:24:00 +0000
+++ client/mysqldump.c	2014-04-28 14:59:06 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -109,7 +109,8 @@
                 opt_slave_apply= 0, 
                 opt_include_master_host_port= 0,
                 opt_events= 0, opt_comments_used= 0,
-                opt_alltspcs=0, opt_notspcs= 0, opt_drop_trigger= 0;
+                opt_alltspcs=0, opt_notspcs= 0, opt_drop_trigger= 0,
+                opt_secure_auth= 1;
 static my_bool insert_pat_inited= 0, debug_info_flag= 0, debug_check_flag= 0;
 static ulong opt_max_allowed_packet, opt_net_buffer_length;
 static MYSQL mysql_connection,*mysql=0;
@@ -508,6 +509,9 @@
   {"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},
+  {"secure-auth", OPT_SECURE_AUTH, "Refuse client connecting to server if it"
+    " uses old (pre-4.1.1) protocol.", &opt_secure_auth,
+    &opt_secure_auth, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
 #include <sslopt-longopts.h>
   {"tab",'T',
    "Create tab-separated textfile for each table to given path. (Create .sql "
@@ -1519,6 +1523,8 @@
     mysql_options(&mysql_connection,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);
   if (opt_bind_addr)
     mysql_options(&mysql_connection,MYSQL_OPT_BIND,opt_bind_addr);
+  if (!opt_secure_auth)
+    mysql_options(&mysql_connection,MYSQL_SECURE_AUTH,(char*)&opt_secure_auth);
 #ifdef HAVE_SMEM
   if (shared_memory_base_name)
     mysql_options(&mysql_connection,MYSQL_SHARED_MEMORY_BASE_NAME,shared_memory_base_name);

=== modified file 'client/mysqlimport.c'
--- client/mysqlimport.c	2012-08-07 13:56:51 +0000
+++ client/mysqlimport.c	2014-04-28 14:59:06 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -47,7 +47,7 @@
 
 static my_bool	verbose=0,lock_tables=0,ignore_errors=0,opt_delete=0,
 		replace=0,silent=0,ignore=0,opt_compress=0,
-                opt_low_priority= 0, tty_password= 0;
+                opt_low_priority= 0, tty_password= 0, opt_secure_auth= 1;
 static my_bool debug_info_flag= 0, debug_check_flag= 0;
 static uint opt_use_threads=0, opt_local_file=0, my_end_arg= 0;
 static char	*opt_password=0, *current_user=0,
@@ -161,6 +161,9 @@
    0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"replace", 'r', "If duplicate unique key was found, replace old row.",
    &replace, &replace, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+  {"secure-auth", OPT_SECURE_AUTH, "Refuse client connecting to server if it"
+    " uses old (pre-4.1.1) protocol.",
+    &opt_secure_auth, &opt_secure_auth, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
 #ifdef HAVE_SMEM
   {"shared-memory-base-name", OPT_SHARED_MEMORY_BASE_NAME,
    "Base name of shared memory.", &shared_memory_base_name, &shared_memory_base_name,
@@ -440,6 +443,8 @@
     mysql_options(mysql,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);
   if (opt_bind_addr)
     mysql_options(mysql,MYSQL_OPT_BIND,opt_bind_addr);
+  if (!opt_secure_auth)
+    mysql_options(mysql, MYSQL_SECURE_AUTH,(char*)&opt_secure_auth);
 #ifdef HAVE_SMEM
   if (shared_memory_base_name)
     mysql_options(mysql,MYSQL_SHARED_MEMORY_BASE_NAME,shared_memory_base_name);

=== modified file 'client/mysqlshow.c'
--- client/mysqlshow.c	2012-08-07 13:56:51 +0000
+++ client/mysqlshow.c	2014-04-28 14:59:06 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -38,6 +38,7 @@
 static uint opt_verbose=0;
 static char *default_charset= (char*) MYSQL_AUTODETECT_CHARSET_NAME;
 static char *opt_plugin_dir= 0, *opt_default_auth= 0;
+static my_bool opt_secure_auth= TRUE;
 
 #ifdef HAVE_SMEM 
 static char *shared_memory_base_name=0;
@@ -132,6 +133,8 @@
     mysql_options(&mysql,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);
   if (opt_bind_addr)
     mysql_options(&mysql,MYSQL_OPT_BIND,opt_bind_addr);
+  if (!opt_secure_auth)
+    mysql_options(&mysql, MYSQL_SECURE_AUTH,(char*)&opt_secure_auth);
 #ifdef HAVE_SMEM
   if (shared_memory_base_name)
     mysql_options(&mysql,MYSQL_SHARED_MEMORY_BASE_NAME,shared_memory_base_name);
@@ -244,6 +247,9 @@
   {"protocol", OPT_MYSQL_PROTOCOL, 
    "The protocol to use for connection (tcp, socket, pipe, memory).",
    0, 0, 0, GET_STR,  REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  {"secure-auth", OPT_SECURE_AUTH, "Refuse client connecting to server if it"
+    " uses old (pre-4.1.1) protocol.", &opt_secure_auth,
+    &opt_secure_auth, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
 #ifdef HAVE_SMEM
   {"shared-memory-base-name", OPT_SHARED_MEMORY_BASE_NAME,
    "Base name of shared memory.", &shared_memory_base_name,

=== modified file 'client/mysqlslap.c'
--- client/mysqlslap.c	2012-08-07 13:56:51 +0000
+++ client/mysqlslap.c	2014-04-28 14:59:06 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2014, 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,6 +126,7 @@
             *post_system= NULL,
             *opt_mysql_unix_port= NULL;
 static char *opt_plugin_dir= 0, *opt_default_auth= 0;
+static my_bool opt_secure_auth= TRUE;
 static uint opt_enable_cleartext_plugin= 0;
 static my_bool using_opt_enable_cleartext_plugin= 0;
 
@@ -346,6 +347,8 @@
 #endif
   if (opt_protocol)
     mysql_options(&mysql,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);
+  if (!opt_secure_auth && slap_connect(&mysql))
+    mysql_options(&mysql, MYSQL_SECURE_AUTH,(char*)&opt_secure_auth);
 #ifdef HAVE_SMEM
   if (shared_memory_base_name)
     mysql_options(&mysql,MYSQL_SHARED_MEMORY_BASE_NAME,shared_memory_base_name);
@@ -684,6 +687,9 @@
   {"query", 'q', "Query to run or file containing query to run.",
     &user_supplied_query, &user_supplied_query,
     0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  {"secure-auth", OPT_SECURE_AUTH, "Refuse client connecting to server if it"
+    " uses old (pre-4.1.1) protocol.", &opt_secure_auth,
+    &opt_secure_auth, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
 #ifdef HAVE_SMEM
   {"shared-memory-base-name", OPT_SHARED_MEMORY_BASE_NAME,
     "Base name of shared memory.", &shared_memory_base_name,

=== modified file 'cmake/libutils.cmake'
--- cmake/libutils.cmake	2014-01-06 05:23:19 +0000
+++ cmake/libutils.cmake	2014-04-28 14:59:06 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2014, 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 'extra/yassl/README'
--- extra/yassl/README	2012-11-21 13:46:01 +0000
+++ extra/yassl/README	2014-04-28 14:59:06 +0000
@@ -12,7 +12,36 @@
 
 *** end Note ***
 
-yaSSL Release notes, version 2.2.2 (7/5/2012)
+yaSSL Release notes, version 2.3.0 (12/5/2013)
+
+  This release of yaSSL updates asm for newer GCC versions.
+
+See normal  build instructions below under 1.0.6.
+See libcurl build instructions below under 1.3.0 and note in 1.5.8.
+
+
+*****************yaSSL Release notes, version 2.2.3b (4/23/2013)
+
+    This release of yaSSL updates the test certificates as they were expired
+
+See normal  build instructions below under 1.0.6.
+See libcurl build instructions below under 1.3.0 and note in 1.5.8.
+
+
+*****************yaSSL Release notes, version 2.2.2d (2/5/2013)
+
+    This release of yaSSL contains countermeasuers for the Lucky 13 TLS 1.1
+    CBC timing padding attack identified by Nadhem AlFardan and Kenneth Paterson
+    see: http://www.isg.rhul.ac.uk/tls/
+
+    It also adds SHA2 certificate verification and better checks for malicious
+    input.
+
+See normal  build instructions below under 1.0.6.
+See libcurl build instructions below under 1.3.0 and note in 1.5.8.
+
+
+*****************yaSSL Release notes, version 2.2.2 (7/5/2012)
 
     This release of yaSSL contains bug fixes and more security checks around
     malicious certificates.

=== modified file 'extra/yassl/certs/ca-cert.pem'
--- extra/yassl/certs/ca-cert.pem	2012-05-17 12:10:48 +0000
+++ extra/yassl/certs/ca-cert.pem	2014-04-28 14:59:06 +0000
@@ -1,56 +1,87 @@
+-----BEGIN CERTIFICATE-----
+MIIEnjCCA4agAwIBAgIJAOnQp195JfQ8MA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
+VQQGEwJVUzEQMA4GA1UECBMHTW9udGFuYTEQMA4GA1UEBxMHQm96ZW1hbjERMA8G
+A1UEChMIU2F3dG9vdGgxEzARBgNVBAsTCkNvbnN1bHRpbmcxFjAUBgNVBAMTDXd3
+dy55YXNzbC5jb20xHTAbBgkqhkiG9w0BCQEWDmluZm9AeWFzc2wuY29tMB4XDTEx
+MTAyNDE4MTgxNVoXDTE0MDcyMDE4MTgxNVowgZAxCzAJBgNVBAYTAlVTMRAwDgYD
+VQQIEwdNb250YW5hMRAwDgYDVQQHEwdCb3plbWFuMREwDwYDVQQKEwhTYXd0b290
+aDETMBEGA1UECxMKQ29uc3VsdGluZzEWMBQGA1UEAxMNd3d3Lnlhc3NsLmNvbTEd
+MBsGCSqGSIb3DQEJARYOaW5mb0B5YXNzbC5jb20wggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQC/DMotFLIehEJbzTgfSvJNdRDxtjWf38p9A5jTrN4DZu4q
+8diwfW4HVAsQmCFNgMsSIOfMT95FfclydzLqypC7aVIQAy+o85XF8YtiVhvvZ2+k
+EEGVrQqb46XAsNJwdlAwW6joCCx87aeieo04KRysx+3yfJWwlYJ9SVw4zXcl772A
+dVOUPD3KY1ufFbXTHRMvGdE823Y6zLh9yeXC19pAb9gh3HMbQi1TnP4a/H2rejY/
+mN6EfAVnzmoUOIep8Yy1aMtof3EgK/WgY/VWL6Mm0rdvsVoX1ziZCP6TWG/+wxNJ
+CBYLp01nAFIxZyNOmO1RRR25BNkL7Ngos0u97TZ5AgMBAAGjgfgwgfUwHQYDVR0O
+BBYEFCeOZxF0wyYdP+0zY7Ok2B0w5ejVMIHFBgNVHSMEgb0wgbqAFCeOZxF0wyYd
+P+0zY7Ok2B0w5ejVoYGWpIGTMIGQMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHTW9u
+dGFuYTEQMA4GA1UEBxMHQm96ZW1hbjERMA8GA1UEChMIU2F3dG9vdGgxEzARBgNV
+BAsTCkNvbnN1bHRpbmcxFjAUBgNVBAMTDXd3dy55YXNzbC5jb20xHTAbBgkqhkiG
+9w0BCQEWDmluZm9AeWFzc2wuY29tggkA6dCnX3kl9DwwDAYDVR0TBAUwAwEB/zAN
+BgkqhkiG9w0BAQUFAAOCAQEAX4YU9FGLvKVOMNperJr4bNkmS5P54xyJb57us513
+PokgdqPm6IYVIdviM7I01dCf88Gkh5Jc+dH/MC+OA7yzPAwyo5BfGpAer53zntcH
+Aql9J2ZjL68Y16wYmIyDjzjzC6w2EHX7ynYTUFsCj3O/46Dug1IlVM4mzpy9L3mr
+G2C4kvEDwPw7CNnArdVyCCWAYS3cn6eDYgdH4AdMSwcwBKmHHFV/BxLQy0Jdy89m
+ARoX7vkPYLfbb2jlTkFibtNvYE9LJ97PGAfxE13LP6klRNpSXMgE4VYS9SqQTtHi
+rwG1I6HsMdp7Y2nEuPPnzqE9wNtt87LZRsifw7hwWh9/yg==
+-----END CERTIFICATE-----
 Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number:
-            8a:37:22:65:73:f5:aa:e8
-        Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=US, ST=Montana, L=Bozeman, O=sawtooth, OU=consulting, CN=www.sawtooth-consulting.com/emailAddress=[e-mail]
+            e9:d0:a7:5f:79:25:f4:3c
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.yassl.com/emailAddress=[e-mail]
         Validity
-            Not Before: Jun 30 18:47:10 2010 GMT
-            Not After : Mar 26 18:47:10 2013 GMT
-        Subject: C=US, ST=Montana, L=Bozeman, O=sawtooth, OU=consulting, CN=www.sawtooth-consulting.com/emailAddress=[e-mail]
+            Not Before: Oct 24 18:18:15 2011 GMT
+            Not After : Jul 20 18:18:15 2014 GMT
+        Subject: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.yassl.com/emailAddress=[e-mail]
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-            RSA Public Key: (512 bit)
-                Modulus (512 bit):
-                    00:97:30:b9:1a:92:ef:25:4f:ca:4c:11:31:95:1a:
-                    e1:c0:10:19:0a:20:b9:37:80:1a:57:38:02:4e:1b:
-                    c5:0f:28:4f:da:e3:c9:16:aa:50:bd:4a:fb:b7:71:
-                    c7:35:cc:63:81:c1:dd:9d:33:f9:38:16:88:32:a0:
-                    aa:56:23:03:a3
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:bf:0c:ca:2d:14:b2:1e:84:42:5b:cd:38:1f:4a:
+                    f2:4d:75:10:f1:b6:35:9f:df:ca:7d:03:98:d3:ac:
+                    de:03:66:ee:2a:f1:d8:b0:7d:6e:07:54:0b:10:98:
+                    21:4d:80:cb:12:20:e7:cc:4f:de:45:7d:c9:72:77:
+                    32:ea:ca:90:bb:69:52:10:03:2f:a8:f3:95:c5:f1:
+                    8b:62:56:1b:ef:67:6f:a4:10:41:95:ad:0a:9b:e3:
+                    a5:c0:b0:d2:70:76:50:30:5b:a8:e8:08:2c:7c:ed:
+                    a7:a2:7a:8d:38:29:1c:ac:c7:ed:f2:7c:95:b0:95:
+                    82:7d:49:5c:38:cd:77:25:ef:bd:80:75:53:94:3c:
+                    3d:ca:63:5b:9f:15:b5:d3:1d:13:2f:19:d1:3c:db:
+                    76:3a:cc:b8:7d:c9:e5:c2:d7:da:40:6f:d8:21:dc:
+                    73:1b:42:2d:53:9c:fe:1a:fc:7d:ab:7a:36:3f:98:
+                    de:84:7c:05:67:ce:6a:14:38:87:a9:f1:8c:b5:68:
+                    cb:68:7f:71:20:2b:f5:a0:63:f5:56:2f:a3:26:d2:
+                    b7:6f:b1:5a:17:d7:38:99:08:fe:93:58:6f:fe:c3:
+                    13:49:08:16:0b:a7:4d:67:00:52:31:67:23:4e:98:
+                    ed:51:45:1d:b9:04:d9:0b:ec:d8:28:b3:4b:bd:ed:
+                    36:79
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Subject Key Identifier: 
-                3B:66:FD:A0:40:C6:F4:E2:70:CF:21:1A:0C:4F:67:FE:B7:4B:42:09
+                27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
             X509v3 Authority Key Identifier: 
-                keyid:3B:66:FD:A0:40:C6:F4:E2:70:CF:21:1A:0C:4F:67:FE:B7:4B:42:09
-                DirName:/C=US/ST=Montana/L=Bozeman/O=sawtooth/OU=consulting/CN=www.sawtooth-consulting.com/emailAddress=[e-mail]
-                serial:8A:37:22:65:73:F5:AA:E8
+                keyid:27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
+                DirName:/C=US/ST=Montana/L=Bozeman/O=Sawtooth/OU=Consulting/CN=www.yassl.com/emailAddress=[e-mail]
+                serial:E9:D0:A7:5F:79:25:F4:3C
 
             X509v3 Basic Constraints: 
                 CA:TRUE
-    Signature Algorithm: md5WithRSAEncryption
-        32:65:a2:b1:dc:6d:e0:8d:8b:c8:58:29:8e:b8:18:4b:62:88:
-        13:67:f8:6c:75:46:75:8f:8a:19:a6:a3:d5:3c:fc:57:4e:7a:
-        68:a9:fc:93:dc:ae:29:7d:bb:4e:ec:ea:55:fa:a4:e3:00:61:
-        f4:b0:34:6d:d1:d5:a4:64:24:f8
------BEGIN CERTIFICATE-----
-MIIDQDCCAuqgAwIBAgIJAIo3ImVz9aroMA0GCSqGSIb3DQEBBAUAMIGeMQswCQYD
-VQQGEwJVUzEQMA4GA1UECBMHTW9udGFuYTEQMA4GA1UEBxMHQm96ZW1hbjERMA8G
-A1UEChMIc2F3dG9vdGgxEzARBgNVBAsTCmNvbnN1bHRpbmcxJDAiBgNVBAMTG3d3
-dy5zYXd0b290aC1jb25zdWx0aW5nLmNvbTEdMBsGCSqGSIb3DQEJARYOaW5mb0B5
-YXNzbC5jb20wHhcNMTAwNjMwMTg0NzEwWhcNMTMwMzI2MTg0NzEwWjCBnjELMAkG
-A1UEBhMCVVMxEDAOBgNVBAgTB01vbnRhbmExEDAOBgNVBAcTB0JvemVtYW4xETAP
-BgNVBAoTCHNhd3Rvb3RoMRMwEQYDVQQLEwpjb25zdWx0aW5nMSQwIgYDVQQDExt3
-d3cuc2F3dG9vdGgtY29uc3VsdGluZy5jb20xHTAbBgkqhkiG9w0BCQEWDmluZm9A
-eWFzc2wuY29tMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJcwuRqS7yVPykwRMZUa
-4cAQGQoguTeAGlc4Ak4bxQ8oT9rjyRaqUL1K+7dxxzXMY4HB3Z0z+TgWiDKgqlYj
-A6MCAwEAAaOCAQcwggEDMB0GA1UdDgQWBBQ7Zv2gQMb04nDPIRoMT2f+t0tCCTCB
-0wYDVR0jBIHLMIHIgBQ7Zv2gQMb04nDPIRoMT2f+t0tCCaGBpKSBoTCBnjELMAkG
-A1UEBhMCVVMxEDAOBgNVBAgTB01vbnRhbmExEDAOBgNVBAcTB0JvemVtYW4xETAP
-BgNVBAoTCHNhd3Rvb3RoMRMwEQYDVQQLEwpjb25zdWx0aW5nMSQwIgYDVQQDExt3
-d3cuc2F3dG9vdGgtY29uc3VsdGluZy5jb20xHTAbBgkqhkiG9w0BCQEWDmluZm9A
-eWFzc2wuY29tggkAijciZXP1qugwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQF
-AANBADJlorHcbeCNi8hYKY64GEtiiBNn+Gx1RnWPihmmo9U8/FdOemip/JPcril9
-u07s6lX6pOMAYfSwNG3R1aRkJPg=
------END CERTIFICATE-----
+    Signature Algorithm: sha1WithRSAEncryption
+        5f:86:14:f4:51:8b:bc:a5:4e:30:da:5e:ac:9a:f8:6c:d9:26:
+        4b:93:f9:e3:1c:89:6f:9e:ee:b3:9d:77:3e:89:20:76:a3:e6:
+        e8:86:15:21:db:e2:33:b2:34:d5:d0:9f:f3:c1:a4:87:92:5c:
+        f9:d1:ff:30:2f:8e:03:bc:b3:3c:0c:32:a3:90:5f:1a:90:1e:
+        af:9d:f3:9e:d7:07:02:a9:7d:27:66:63:2f:af:18:d7:ac:18:
+        98:8c:83:8f:38:f3:0b:ac:36:10:75:fb:ca:76:13:50:5b:02:
+        8f:73:bf:e3:a0:ee:83:52:25:54:ce:26:ce:9c:bd:2f:79:ab:
+        1b:60:b8:92:f1:03:c0:fc:3b:08:d9:c0:ad:d5:72:08:25:80:
+        61:2d:dc:9f:a7:83:62:07:47:e0:07:4c:4b:07:30:04:a9:87:
+        1c:55:7f:07:12:d0:cb:42:5d:cb:cf:66:01:1a:17:ee:f9:0f:
+        60:b7:db:6f:68:e5:4e:41:62:6e:d3:6f:60:4f:4b:27:de:cf:
+        18:07:f1:13:5d:cb:3f:a9:25:44:da:52:5c:c8:04:e1:56:12:
+        f5:2a:90:4e:d1:e2:af:01:b5:23:a1:ec:31:da:7b:63:69:c4:
+        b8:f3:e7:ce:a1:3d:c0:db:6d:f3:b2:d9:46:c8:9f:c3:b8:70:
+        5a:1f:7f:ca

=== modified file 'extra/yassl/certs/ca-key.pem'
--- extra/yassl/certs/ca-key.pem	2012-07-24 13:24:00 +0000
+++ extra/yassl/certs/ca-key.pem	2014-04-28 14:59:06 +0000
@@ -1,9 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIBOQIBAAJBAJcwuRqS7yVPykwRMZUa4cAQGQoguTeAGlc4Ak4bxQ8oT9rjyRaq
-UL1K+7dxxzXMY4HB3Z0z+TgWiDKgqlYjA6MCAwEAAQJAEQ9TY7c+uuQU/J5YDO4a
-mRR37tegbq3Kyxqrz+p8QuhqLDtVh13GaF7rVU70vyNHm+cgihUyzho/PViAkPBo
-qQIhAMU8/RDhDLgL5BxID4sxKIVBtg+imFSbyKVyg7oQLUcXAiEAxDu94O45Cf4a
-np9R0thumY/QqWpCkycWAB7fFEuaf1UCIEH+bg4/vqm2ENUFp23DPPOZUPlaRe3J
-UhFJh5mx3/RxAiBq++8vfHFYg1Lb/BxOCXVy/zdRxf753ytdcXdJx1Y56QIgVgpN
-FNfYJofQfWaP96sjlc0usrT28uceHx0QmHqolVc=
+MIIEpAIBAAKCAQEAvwzKLRSyHoRCW804H0ryTXUQ8bY1n9/KfQOY06zeA2buKvHY
+sH1uB1QLEJghTYDLEiDnzE/eRX3Jcncy6sqQu2lSEAMvqPOVxfGLYlYb72dvpBBB
+la0Km+OlwLDScHZQMFuo6AgsfO2nonqNOCkcrMft8nyVsJWCfUlcOM13Je+9gHVT
+lDw9ymNbnxW10x0TLxnRPNt2Osy4fcnlwtfaQG/YIdxzG0ItU5z+Gvx9q3o2P5je
+hHwFZ85qFDiHqfGMtWjLaH9xICv1oGP1Vi+jJtK3b7FaF9c4mQj+k1hv/sMTSQgW
+C6dNZwBSMWcjTpjtUUUduQTZC+zYKLNLve02eQIDAQABAoIBAD1uTmAahH+dhXzh
+Swd84NaZKt6d+TY0DncOPgjqT+UGJtT2OPffDQ8cLgai9CponGNy4zXmBJGRtcGx
+pFSs18b7QaDWdW+9C06/sVLoX0kmmFZHx97p6jxgAb8o3DG/SV+TSYd6gVuWS03K
+XDhPt+Gy08ch2jwShwfkG9xD7OjsVGHn9u2mCy7134J/xh9hGZykgznfIYWJb3ev
+hhUyCKJaCyZh+3AMypw4fbwi7uujqBYA+YqAHgCEqEpB+IQDZy8jWy+baybDBzSU
+owM7ctWfcuCtzDSrvcfV9SYwhQ8wIzlS/zzLmSFNiKWr7mK5x+C7R4fBac9z8zC+
+zjkEnOUCgYEA4XZFgFm200nfCu8S1g/wt8sqN7+n+LVN9TE1reSjlKHb8ZattQVk
+hYP8G1spqr74Jj92fq0c8MvXJrQbBY5Whn4IYiHBhtZHeT63XaTGOtexdCD2UJdB
+BFPtPybWb5H6aCbsKtya8efc+3PweUMbIaNZBGNSB8nX5tEbXV6W+lMCgYEA2O1O
+ZGFrkQxhAbUPu0RnUx7cB8Qkfp5shCORDOQSBBZNeJjMlj0gTg9Fmrb4s5MNsqIb
+KfImecjF0nh+XnPy13Bhu0DOYQX+aR6CKeYUuKHnltAjPwWTAPLhTX7tt5Zs9/Dk
+0c8BmE/cdFSqbV5aQTH+/5q2oAXdqRBU+GvQqoMCgYAh0wSKROtQt3xmv4cr5ihO
+6oPi6TXh8hFH/6H1/J8t5TqB/AEDb1OtVCe2Uu7lVtETq+GzD3WQCoS0ocCMDNae
+RrorPrUx7WO7pNUNj3LN0R4mNeu+G3L9mzm0h7cT9eqDRZOYuo/kSsy0TKh/CLpB
+SahJKD1ePcHONwDL+SzdUQKBgQChV58+udavg22DP4/70NyozgMJI7GhG2PKxElW
+NSvRLmVglQVVmRE1/dXfRMeliHJfsoJRqHFFkzbPXB9hUQwFgOivxXu6XiLjPHXD
+hAVVbdY6LYSJkzPLONqqMQXNzmwt3VXTVwvwpTVqsK4xukOWygDHS+MZEkPTQvpv
+6oDA0QKBgQC524kgNCdwYjTqXyViEvOdgb9I7poOwY0Q/2WanS0aipRayMClpYRh
+ntQkue+pncl3C8dwZj26yFTf0jPh9X/5J2G+V0Xdt0UXJPUj5DgOkSfu4yDYFMiU
+R3dAd0UYng3OeT9XMVYJSWe+lFhP9sSr4onj44rABVUsJMBKlwQnmg==
 -----END RSA PRIVATE KEY-----

=== modified file 'extra/yassl/certs/client-cert.pem'
--- extra/yassl/certs/client-cert.pem	2012-05-17 12:10:48 +0000
+++ extra/yassl/certs/client-cert.pem	2014-04-28 14:59:06 +0000
@@ -2,54 +2,86 @@
     Data:
         Version: 3 (0x2)
         Serial Number:
-            c5:d7:6c:11:36:f0:35:e1
-        Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=US, ST=Oregon, L=Portland, O=yaSSL, OU=programming, CN=www.yassl.com/emailAddress=[e-mail]
+            87:4a:75:be:91:66:d8:3d
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Oregon, L=Portland, O=yaSSL, OU=Programming, CN=www.yassl.com/emailAddress=[e-mail]
         Validity
-            Not Before: Jun 30 18:39:39 2010 GMT
-            Not After : Mar 26 18:39:40 2013 GMT
-        Subject: C=US, ST=Oregon, L=Portland, O=yaSSL, OU=programming, CN=www.yassl.com/emailAddress=[e-mail]
+            Not Before: Oct 24 18:21:55 2011 GMT
+            Not After : Jul 20 18:21:55 2014 GMT
+        Subject: C=US, ST=Oregon, L=Portland, O=yaSSL, OU=Programming, CN=www.yassl.com/emailAddress=[e-mail]
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-            RSA Public Key: (512 bit)
-                Modulus (512 bit):
-                    00:bd:51:4a:14:fd:6a:19:84:0c:33:38:fc:27:32:
-                    9c:97:0b:fc:a4:18:60:69:4e:d9:d8:78:50:0b:e9:
-                    20:5d:d6:1d:70:1c:0c:24:9f:23:82:cc:3a:01:d5:
-                    97:17:b2:73:6c:86:cf:b5:f1:e5:ce:68:0c:d9:a2:
-                    12:39:7c:f2:53
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:c3:03:d1:2b:fe:39:a4:32:45:3b:53:c8:84:2b:
+                    2a:7c:74:9a:bd:aa:2a:52:07:47:d6:a6:36:b2:07:
+                    32:8e:d0:ba:69:7b:c6:c3:44:9e:d4:81:48:fd:2d:
+                    68:a2:8b:67:bb:a1:75:c8:36:2c:4a:d2:1b:f7:8b:
+                    ba:cf:0d:f9:ef:ec:f1:81:1e:7b:9b:03:47:9a:bf:
+                    65:cc:7f:65:24:69:a6:e8:14:89:5b:e4:34:f7:c5:
+                    b0:14:93:f5:67:7b:3a:7a:78:e1:01:56:56:91:a6:
+                    13:42:8d:d2:3c:40:9c:4c:ef:d1:86:df:37:51:1b:
+                    0c:a1:3b:f5:f1:a3:4a:35:e4:e1:ce:96:df:1b:7e:
+                    bf:4e:97:d0:10:e8:a8:08:30:81:af:20:0b:43:14:
+                    c5:74:67:b4:32:82:6f:8d:86:c2:88:40:99:36:83:
+                    ba:1e:40:72:22:17:d7:52:65:24:73:b0:ce:ef:19:
+                    cd:ae:ff:78:6c:7b:c0:12:03:d4:4e:72:0d:50:6d:
+                    3b:a3:3b:a3:99:5e:9d:c8:d9:0c:85:b3:d9:8a:d9:
+                    54:26:db:6d:fa:ac:bb:ff:25:4c:c4:d1:79:f4:71:
+                    d3:86:40:18:13:b0:63:b5:72:4e:30:c4:97:84:86:
+                    2d:56:2f:d7:15:f7:7f:c0:ae:f5:fc:5b:e5:fb:a1:
+                    ba:d3
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Subject Key Identifier: 
-                5C:F7:29:21:69:7A:09:78:9E:7B:CD:53:42:02:EC:CE:29:0D:11:DF
+                33:D8:45:66:D7:68:87:18:7E:54:0D:70:27:91:C7:26:D7:85:65:C0
             X509v3 Authority Key Identifier: 
-                keyid:5C:F7:29:21:69:7A:09:78:9E:7B:CD:53:42:02:EC:CE:29:0D:11:DF
-                DirName:/C=US/ST=Oregon/L=Portland/O=yaSSL/OU=programming/CN=www.yassl.com/emailAddress=[e-mail]
-                serial:C5:D7:6C:11:36:F0:35:E1
+                keyid:33:D8:45:66:D7:68:87:18:7E:54:0D:70:27:91:C7:26:D7:85:65:C0
+                DirName:/C=US/ST=Oregon/L=Portland/O=yaSSL/OU=Programming/CN=www.yassl.com/emailAddress=[e-mail]
+                serial:87:4A:75:BE:91:66:D8:3D
 
             X509v3 Basic Constraints: 
                 CA:TRUE
-    Signature Algorithm: md5WithRSAEncryption
-        b4:a5:f1:71:26:4d:b9:ff:54:f3:09:1f:ac:e1:19:59:e5:ec:
-        57:e3:f1:0b:b2:8f:f3:29:eb:6b:c6:fa:27:33:3e:91:d0:77:
-        43:c9:ce:1e:0f:71:07:a9:f7:26:e0:7e:ff:30:7d:52:0a:e1:
-        80:48:46:bb:99:e9:d9:77:ce:75
+    Signature Algorithm: sha1WithRSAEncryption
+        1c:7c:42:81:29:9e:21:cf:d0:d8:c1:54:6f:cc:ae:14:09:38:
+        ff:68:98:9a:95:53:76:18:7b:e6:30:76:ec:28:0d:75:a7:de:
+        e0:cd:8e:d5:55:23:6a:47:2b:4e:8d:fc:7d:06:a3:d8:0f:ad:
+        5e:d6:04:c9:00:33:fb:77:27:d3:b5:03:b3:7b:21:74:31:0b:
+        4a:af:2d:1a:b3:93:8e:cc:f3:5f:3d:90:3f:cc:e3:55:19:91:
+        7b:78:24:2e:4a:09:bb:18:4e:61:2d:9c:c6:0a:a0:34:91:88:
+        70:6b:3b:48:47:bc:79:94:a2:a0:4d:32:47:54:c2:a3:dc:2e:
+        d2:51:4c:29:39:11:ff:e2:15:5e:58:97:36:f6:e9:06:06:86:
+        0e:8d:9d:95:03:72:b2:8b:19:7c:e9:14:6e:a1:88:73:68:58:
+        6d:71:5e:c2:d5:d3:13:d2:5f:de:ea:03:be:e2:00:40:e5:ce:
+        fd:e6:92:31:57:c3:eb:bb:66:ac:cb:2f:1a:fa:e0:62:a2:47:
+        f4:93:43:2a:4b:6c:5e:0a:2f:f9:e7:e6:4a:63:86:b0:ac:2a:
+        a1:eb:b4:5b:67:cd:32:e4:b6:11:4b:9a:72:66:0d:a2:4a:76:
+        8f:fe:22:bc:83:fd:db:b7:d5:a9:ee:05:c9:b1:71:7e:1b:2b:
+        e1:e3:af:c0
 -----BEGIN CERTIFICATE-----
-MIIDDjCCArigAwIBAgIJAMXXbBE28DXhMA0GCSqGSIb3DQEBBAUAMIGOMQswCQYD
+MIIEmDCCA4CgAwIBAgIJAIdKdb6RZtg9MA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
 VQQGEwJVUzEPMA0GA1UECBMGT3JlZ29uMREwDwYDVQQHEwhQb3J0bGFuZDEOMAwG
-A1UEChMFeWFTU0wxFDASBgNVBAsTC3Byb2dyYW1taW5nMRYwFAYDVQQDEw13d3cu
-eWFzc2wuY29tMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHlhc3NsLmNvbTAeFw0xMDA2
-MzAxODM5MzlaFw0xMzAzMjYxODM5NDBaMIGOMQswCQYDVQQGEwJVUzEPMA0GA1UE
+A1UEChMFeWFTU0wxFDASBgNVBAsTC1Byb2dyYW1taW5nMRYwFAYDVQQDEw13d3cu
+eWFzc2wuY29tMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHlhc3NsLmNvbTAeFw0xMTEw
+MjQxODIxNTVaFw0xNDA3MjAxODIxNTVaMIGOMQswCQYDVQQGEwJVUzEPMA0GA1UE
 CBMGT3JlZ29uMREwDwYDVQQHEwhQb3J0bGFuZDEOMAwGA1UEChMFeWFTU0wxFDAS
-BgNVBAsTC3Byb2dyYW1taW5nMRYwFAYDVQQDEw13d3cueWFzc2wuY29tMR0wGwYJ
-KoZIhvcNAQkBFg5pbmZvQHlhc3NsLmNvbTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgC
-QQC9UUoU/WoZhAwzOPwnMpyXC/ykGGBpTtnYeFAL6SBd1h1wHAwknyOCzDoB1ZcX
-snNshs+18eXOaAzZohI5fPJTAgMBAAGjgfYwgfMwHQYDVR0OBBYEFFz3KSFpegl4
-nnvNU0IC7M4pDRHfMIHDBgNVHSMEgbswgbiAFFz3KSFpegl4nnvNU0IC7M4pDRHf
-oYGUpIGRMIGOMQswCQYDVQQGEwJVUzEPMA0GA1UECBMGT3JlZ29uMREwDwYDVQQH
-EwhQb3J0bGFuZDEOMAwGA1UEChMFeWFTU0wxFDASBgNVBAsTC3Byb2dyYW1taW5n
-MRYwFAYDVQQDEw13d3cueWFzc2wuY29tMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHlh
-c3NsLmNvbYIJAMXXbBE28DXhMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQAD
-QQC0pfFxJk25/1TzCR+s4RlZ5exX4/ELso/zKetrxvonMz6R0HdDyc4eD3EHqfcm
-4H7/MH1SCuGASEa7menZd851
+BgNVBAsTC1Byb2dyYW1taW5nMRYwFAYDVQQDEw13d3cueWFzc2wuY29tMR0wGwYJ
+KoZIhvcNAQkBFg5pbmZvQHlhc3NsLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAMMD0Sv+OaQyRTtTyIQrKnx0mr2qKlIHR9amNrIHMo7Quml7xsNE
+ntSBSP0taKKLZ7uhdcg2LErSG/eLus8N+e/s8YEee5sDR5q/Zcx/ZSRppugUiVvk
+NPfFsBST9Wd7Onp44QFWVpGmE0KN0jxAnEzv0YbfN1EbDKE79fGjSjXk4c6W3xt+
+v06X0BDoqAgwga8gC0MUxXRntDKCb42GwohAmTaDuh5AciIX11JlJHOwzu8Zza7/
+eGx7wBID1E5yDVBtO6M7o5lencjZDIWz2YrZVCbbbfqsu/8lTMTRefRx04ZAGBOw
+Y7VyTjDEl4SGLVYv1xX3f8Cu9fxb5fuhutMCAwEAAaOB9jCB8zAdBgNVHQ4EFgQU
+M9hFZtdohxh+VA1wJ5HHJteFZcAwgcMGA1UdIwSBuzCBuIAUM9hFZtdohxh+VA1w
+J5HHJteFZcChgZSkgZEwgY4xCzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZPcmVnb24x
+ETAPBgNVBAcTCFBvcnRsYW5kMQ4wDAYDVQQKEwV5YVNTTDEUMBIGA1UECxMLUHJv
+Z3JhbW1pbmcxFjAUBgNVBAMTDXd3dy55YXNzbC5jb20xHTAbBgkqhkiG9w0BCQEW
+DmluZm9AeWFzc2wuY29tggkAh0p1vpFm2D0wDAYDVR0TBAUwAwEB/zANBgkqhkiG
+9w0BAQUFAAOCAQEAHHxCgSmeIc/Q2MFUb8yuFAk4/2iYmpVTdhh75jB27CgNdafe
+4M2O1VUjakcrTo38fQaj2A+tXtYEyQAz+3cn07UDs3shdDELSq8tGrOTjszzXz2Q
+P8zjVRmRe3gkLkoJuxhOYS2cxgqgNJGIcGs7SEe8eZSioE0yR1TCo9wu0lFMKTkR
+/+IVXliXNvbpBgaGDo2dlQNysosZfOkUbqGIc2hYbXFewtXTE9Jf3uoDvuIAQOXO
+/eaSMVfD67tmrMsvGvrgYqJH9JNDKktsXgov+efmSmOGsKwqoeu0W2fNMuS2EUua
+cmYNokp2j/4ivIP927fVqe4FybFxfhsr4eOvwA==
 -----END CERTIFICATE-----

=== modified file 'extra/yassl/certs/client-key.pem'
--- extra/yassl/certs/client-key.pem	2012-05-17 12:10:48 +0000
+++ extra/yassl/certs/client-key.pem	2014-04-28 14:59:06 +0000
@@ -1,9 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----

=== modified file 'extra/yassl/certs/client-keyEnc.pem'
--- extra/yassl/certs/client-keyEnc.pem	2012-07-24 13:24:00 +0000
+++ extra/yassl/certs/client-keyEnc.pem	2014-04-28 14:59:06 +0000
@@ -2,11 +2,29 @@
 Proc-Type: 4,ENCRYPTED
 DEK-Info: DES-CBC,B9D8FB94E38635AB
 
-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
+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
 -----END RSA PRIVATE KEY-----

=== modified file 'extra/yassl/certs/dsa-cert.pem'
--- extra/yassl/certs/dsa-cert.pem	2012-05-17 12:10:48 +0000
+++ extra/yassl/certs/dsa-cert.pem	2014-04-28 14:59:06 +0000
@@ -1,70 +1,22 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            ce:df:23:31:64:b4:13:da
-        Signature Algorithm: dsaWithSHA1
-        Issuer: C=US, ST=Oregon, L=Portland, O=yaSSL, OU=testing, CN=www.yassl.com/emailAddress=[e-mail]
-        Validity
-            Not Before: Jun 30 18:56:38 2010 GMT
-            Not After : Mar 26 18:56:39 2013 GMT
-        Subject: C=US, ST=Oregon, L=Portland, O=yaSSL, OU=testing, CN=www.yassl.com/emailAddress=[e-mail]
-        Subject Public Key Info:
-            Public Key Algorithm: dsaEncryption
-            DSA Public Key:
-                pub: 
-                    04:84:a0:26:31:72:0c:e8:4f:5d:53:17:62:b1:80:
-                    ca:c0:16:5f:c3:1e:ea:c5:d9:98:38:f9:be:56:53:
-                    47:68:ce:08:22:57:1c:bb:0d:77:91:cf:5b:36:ed:
-                    f3:24:82:90:8a:cd:90:7c:db:77:f9:17:2d:73:73:
-                    ef:bb:b9:82
-                P:   
-                    00:99:29:69:80:c9:3c:98:68:45:a9:82:fe:67:eb:
-                    95:88:c5:b4:0c:d6:26:45:95:19:2c:a0:20:5b:7e:
-                    df:69:e9:dc:c3:0f:f3:61:0a:25:9b:f2:21:01:6a:
-                    cd:aa:8c:37:e7:ca:66:db:56:f4:0f:7d:7a:d1:18:
-                    b9:42:fd:1b:11
-                Q:   
-                    00:ad:25:29:ab:0a:9f:09:1c:c1:ad:03:20:76:7f:
-                    a6:b7:dd:4d:03:09
-                G:   
-                    12:88:99:da:e7:d0:0b:93:9b:e6:ee:3c:21:7f:9c:
-                    b3:b4:8d:a5:8c:e2:37:80:3f:17:d1:81:4f:bd:f0:
-                    71:b6:32:08:54:dd:bf:01:e2:b3:77:06:64:75:8a:
-                    04:d6:79:39:b1:02:03:03:c6:06:74:e5:90:05:0a:
-                    10:46:19:31
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                BE:F9:8C:5D:D6:1C:B4:EE:81:DD:36:56:0A:21:E4:61:44:73:E9:E2
-            X509v3 Authority Key Identifier: 
-                keyid:BE:F9:8C:5D:D6:1C:B4:EE:81:DD:36:56:0A:21:E4:61:44:73:E9:E2
-                DirName:/C=US/ST=Oregon/L=Portland/O=yaSSL/OU=testing/CN=www.yassl.com/emailAddress=[e-mail]
-                serial:CE:DF:23:31:64:B4:13:DA
-
-            X509v3 Basic Constraints: 
-                CA:TRUE
-    Signature Algorithm: dsaWithSHA1
-        30:2d:02:14:00:a3:21:20:34:6a:2c:f9:fb:76:d7:20:c9:c0:
-        35:1b:64:9a:c2:83:02:15:00:a4:59:ac:6d:da:85:48:ff:f5:
-        0d:49:72:c8:cd:91:fc:ec:2f:5c:63
 -----BEGIN CERTIFICATE-----
-MIIDfjCCAz2gAwIBAgIJAM7fIzFktBPaMAkGByqGSM44BAMwgYoxCzAJBgNVBAYT
-AlVTMQ8wDQYDVQQIEwZPcmVnb24xETAPBgNVBAcTCFBvcnRsYW5kMQ4wDAYDVQQK
-EwV5YVNTTDEQMA4GA1UECxMHdGVzdGluZzEWMBQGA1UEAxMNd3d3Lnlhc3NsLmNv
-bTEdMBsGCSqGSIb3DQEJARYOaW5mb0B5YXNzbC5jb20wHhcNMTAwNjMwMTg1NjM4
-WhcNMTMwMzI2MTg1NjM5WjCBijELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdv
-bjERMA8GA1UEBxMIUG9ydGxhbmQxDjAMBgNVBAoTBXlhU1NMMRAwDgYDVQQLEwd0
-ZXN0aW5nMRYwFAYDVQQDEw13d3cueWFzc2wuY29tMR0wGwYJKoZIhvcNAQkBFg5p
-bmZvQHlhc3NsLmNvbTCB8DCBqAYHKoZIzjgEATCBnAJBAJkpaYDJPJhoRamC/mfr
-lYjFtAzWJkWVGSygIFt+32np3MMP82EKJZvyIQFqzaqMN+fKZttW9A99etEYuUL9
-GxECFQCtJSmrCp8JHMGtAyB2f6a33U0DCQJAEoiZ2ufQC5Ob5u48IX+cs7SNpYzi
-N4A/F9GBT73wcbYyCFTdvwHis3cGZHWKBNZ5ObECAwPGBnTlkAUKEEYZMQNDAAJA
-BISgJjFyDOhPXVMXYrGAysAWX8Me6sXZmDj5vlZTR2jOCCJXHLsNd5HPWzbt8ySC
-kIrNkHzbd/kXLXNz77u5gqOB8jCB7zAdBgNVHQ4EFgQUvvmMXdYctO6B3TZWCiHk
-YURz6eIwgb8GA1UdIwSBtzCBtIAUvvmMXdYctO6B3TZWCiHkYURz6eKhgZCkgY0w
-gYoxCzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZPcmVnb24xETAPBgNVBAcTCFBvcnRs
-YW5kMQ4wDAYDVQQKEwV5YVNTTDEQMA4GA1UECxMHdGVzdGluZzEWMBQGA1UEAxMN
-d3d3Lnlhc3NsLmNvbTEdMBsGCSqGSIb3DQEJARYOaW5mb0B5YXNzbC5jb22CCQDO
-3yMxZLQT2jAMBgNVHRMEBTADAQH/MAkGByqGSM44BAMDMAAwLQIUAKMhIDRqLPn7
-dtcgycA1G2SawoMCFQCkWaxt2oVI//UNSXLIzZH87C9cYw==
+MIIDqzCCA2ugAwIBAgIJAMGqrgDU6DyhMAkGByqGSM44BAMwgY4xCzAJBgNVBAYT
+AlVTMQ8wDQYDVQQIDAZPcmVnb24xETAPBgNVBAcMCFBvcnRsYW5kMRAwDgYDVQQK
+DAd3b2xmU1NMMRAwDgYDVQQLDAd0ZXN0aW5nMRYwFAYDVQQDDA13d3cueWFzc2wu
+Y29tMR8wHQYJKoZIhvcNAQkBFhBpbmZvQHdvbGZzc2wuY29tMB4XDTEzMDQyMjIw
+MDk0NFoXDTE2MDExNzIwMDk0NFowgY4xCzAJBgNVBAYTAlVTMQ8wDQYDVQQIDAZP
+cmVnb24xETAPBgNVBAcMCFBvcnRsYW5kMRAwDgYDVQQKDAd3b2xmU1NMMRAwDgYD
+VQQLDAd0ZXN0aW5nMRYwFAYDVQQDDA13d3cueWFzc2wuY29tMR8wHQYJKoZIhvcN
+AQkBFhBpbmZvQHdvbGZzc2wuY29tMIIBuDCCASwGByqGSM44BAEwggEfAoGBAL1R
+7koy4IrH6sbh6nDEUUPPKgfhxxLCWCVexF2+qzANEr+hC9M002haJXFOfeS9DyoO
+WFbL0qMZOuqv+22CaHnoUWl7q3PjJOAI3JH0P54ZyUPuU1909RzgTdIDp5+ikbr7
+KYjnltL73FQVMbjTZQKthIpPn3MjYcF+4jp2W2zFAhUAkcntYND6MGf+eYzIJDN2
+L7SonHUCgYEAklpxErfqznIZjVvqqHFaq+mgAL5J8QrKVmdhYZh/Y8z4jCjoCA8o
+TDoFKxf7s2ZzgaPKvglaEKiYqLqic9qY78DYJswzQMLFvjsF4sFZ+pYCBdWPQI4N
+PgxCiznK6Ce+JH9ikSBvMvG+tevjr2UpawDIHX3+AWYaZBZwKADAaboDgYUAAoGB
+AJ3LY89yHyvQ/TsQ6zlYbovjbk/ogndsMqPdNUvL4RuPTgJP/caaDDa0XJ7ak6A7
+TJ+QheLNwOXoZPYJC4EGFSDAXpYniGhbWIrVTCGe6lmZDfnx40WXS0kk3m/DHaC0
+3ElLAiybxVGxyqoUfbT3Zv1JwftWMuiqHH5uADhdXuXVo1AwTjAdBgNVHQ4EFgQU
+IJjk416o4v8qpH9LBtXlR9v8gccwHwYDVR0jBBgwFoAUIJjk416o4v8qpH9LBtXl
+R9v8gccwDAYDVR0TBAUwAwEB/zAJBgcqhkjOOAQDAy8AMCwCFCjGKIdOSV12LcTu
+k08owGM6YkO1AhQe+K173VuaO/OsDNsxZlKpyH8+1g==
 -----END CERTIFICATE-----

=== modified file 'extra/yassl/certs/server-cert.pem'
--- extra/yassl/certs/server-cert.pem	2012-05-17 12:10:48 +0000
+++ extra/yassl/certs/server-cert.pem	2014-04-28 14:59:06 +0000
@@ -1,39 +1,157 @@
 Certificate:
     Data:
         Version: 1 (0x0)
-        Serial Number: 1 (0x1)
-        Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=US, ST=Montana, L=Bozeman, O=sawtooth, OU=consulting, CN=www.sawtooth-consulting.com/emailAddress=[e-mail]
+        Serial Number: 2 (0x2)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.yassl.com/emailAddress=[e-mail]
         Validity
-            Not Before: Jun 30 18:52:17 2010 GMT
-            Not After : Mar 26 18:52:17 2013 GMT
-        Subject: C=US, ST=Montana, L=Bozeman, O=yaSSL, OU=support, CN=www.yassl.com/emailAddress=[e-mail]
+            Not Before: Oct 24 18:27:13 2011 GMT
+            Not After : Jul 20 18:27:13 2014 GMT
+        Subject: C=US, ST=Montana, L=Bozeman, O=yaSSL, OU=Support, CN=www.yassl.com/emailAddress=[e-mail]
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-            RSA Public Key: (512 bit)
-                Modulus (512 bit):
-                    00:c6:7b:c0:68:81:2f:de:82:3f:f9:ac:c3:86:4a:
-                    66:b7:ec:d4:f1:f6:64:21:ff:f5:a2:34:42:d0:38:
-                    9f:c6:dd:3b:6e:26:65:6a:54:96:dd:d2:7b:eb:36:
-                    a2:ae:7e:2a:9e:7e:56:a5:b6:87:9f:15:c7:18:66:
-                    7e:16:77:e2:a7
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:c0:95:08:e1:57:41:f2:71:6d:b7:d2:45:41:27:
+                    01:65:c6:45:ae:f2:bc:24:30:b8:95:ce:2f:4e:d6:
+                    f6:1c:88:bc:7c:9f:fb:a8:67:7f:fe:5c:9c:51:75:
+                    f7:8a:ca:07:e7:35:2f:8f:e1:bd:7b:c0:2f:7c:ab:
+                    64:a8:17:fc:ca:5d:7b:ba:e0:21:e5:72:2e:6f:2e:
+                    86:d8:95:73:da:ac:1b:53:b9:5f:3f:d7:19:0d:25:
+                    4f:e1:63:63:51:8b:0b:64:3f:ad:43:b8:a5:1c:5c:
+                    34:b3:ae:00:a0:63:c5:f6:7f:0b:59:68:78:73:a6:
+                    8c:18:a9:02:6d:af:c3:19:01:2e:b8:10:e3:c6:cc:
+                    40:b4:69:a3:46:33:69:87:6e:c4:bb:17:a6:f3:e8:
+                    dd:ad:73:bc:7b:2f:21:b5:fd:66:51:0c:bd:54:b3:
+                    e1:6d:5f:1c:bc:23:73:d1:09:03:89:14:d2:10:b9:
+                    64:c3:2a:d0:a1:96:4a:bc:e1:d4:1a:5b:c7:a0:c0:
+                    c1:63:78:0f:44:37:30:32:96:80:32:23:95:a1:77:
+                    ba:13:d2:97:73:e2:5d:25:c9:6a:0d:c3:39:60:a4:
+                    b4:b0:69:42:42:09:e9:d8:08:bc:33:20:b3:58:22:
+                    a7:aa:eb:c4:e1:e6:61:83:c5:d2:96:df:d9:d0:4f:
+                    ad:d7
                 Exponent: 65537 (0x10001)
-    Signature Algorithm: md5WithRSAEncryption
-        58:a9:98:e7:16:52:4c:40:e7:e1:47:92:19:1b:3a:8f:97:6c:
-        7b:b7:b0:cb:20:6d:ad:b5:d3:47:58:d8:e4:f2:3e:32:e9:ef:
-        87:77:e5:54:36:f4:8d:50:8d:07:b4:77:45:ea:9d:a4:33:36:
-        9b:0b:e0:74:58:11:c5:01:7b:4d
+    Signature Algorithm: sha1WithRSAEncryption
+        71:4e:d3:62:df:cc:4c:f7:cd:b7:6e:52:0b:6c:6e:e0:bd:c2:
+        2d:07:d7:c0:b0:6e:43:1e:35:bc:30:01:50:f0:ff:99:23:6c:
+        18:1a:41:b6:11:d6:d4:19:61:fd:e4:77:97:1c:39:e1:57:ab:
+        c5:15:63:77:11:36:5e:74:e2:24:0b:1f:41:78:ad:b7:81:e7:
+        b4:40:66:80:f0:4b:91:a0:6d:a8:6e:3d:53:d9:8b:ce:2a:e1:
+        0b:45:65:87:a1:96:ae:ee:3e:88:d5:12:1f:78:17:ae:2c:c5:
+        73:44:d8:dc:f4:af:d8:cc:ae:4c:e1:0c:be:55:a4:99:f7:6e:
+        96:c0:c8:45:87:bf:dc:51:57:ff:9e:73:37:6a:18:9c:c3:f9:
+        22:7a:f4:b0:52:bd:fc:21:30:f8:c5:ff:1e:87:7d:ad:a2:5a:
+        35:f5:22:a8:b4:0a:76:38:e6:76:b0:98:af:1b:ec:8a:0a:43:
+        74:d2:85:34:37:84:07:e1:f6:23:b2:29:de:a6:b6:b7:4c:57:
+        7e:96:06:cb:a9:16:25:29:3a:03:2d:55:7d:a6:8c:a4:f7:9e:
+        81:c9:95:b6:7c:c1:4a:ce:94:66:0c:ca:88:eb:d2:09:f5:5b:
+        19:58:82:df:27:fd:67:95:78:b7:02:06:d5:a7:61:bd:ef:3a:
+        fc:b2:61:cd
 -----BEGIN CERTIFICATE-----
-MIICFDCCAb4CAQEwDQYJKoZIhvcNAQEEBQAwgZ4xCzAJBgNVBAYTAlVTMRAwDgYD
-VQQIEwdNb250YW5hMRAwDgYDVQQHEwdCb3plbWFuMREwDwYDVQQKEwhzYXd0b290
-aDETMBEGA1UECxMKY29uc3VsdGluZzEkMCIGA1UEAxMbd3d3LnNhd3Rvb3RoLWNv
-bnN1bHRpbmcuY29tMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHlhc3NsLmNvbTAeFw0x
-MDA2MzAxODUyMTdaFw0xMzAzMjYxODUyMTdaMIGKMQswCQYDVQQGEwJVUzEQMA4G
-A1UECBMHTW9udGFuYTEQMA4GA1UEBxMHQm96ZW1hbjEOMAwGA1UEChMFeWFTU0wx
-EDAOBgNVBAsTB3N1cHBvcnQxFjAUBgNVBAMTDXd3dy55YXNzbC5jb20xHTAbBgkq
-hkiG9w0BCQEWDmluZm9AeWFzc2wuY29tMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJB
-AMZ7wGiBL96CP/msw4ZKZrfs1PH2ZCH/9aI0QtA4n8bdO24mZWpUlt3Se+s2oq5+
-Kp5+VqW2h58VxxhmfhZ34qcCAwEAATANBgkqhkiG9w0BAQQFAANBAFipmOcWUkxA
-5+FHkhkbOo+XbHu3sMsgba2100dY2OTyPjLp74d35VQ29I1QjQe0d0XqnaQzNpsL
-4HRYEcUBe00=
+MIIDkDCCAngCAQIwDQYJKoZIhvcNAQEFBQAwgZAxCzAJBgNVBAYTAlVTMRAwDgYD
+VQQIEwdNb250YW5hMRAwDgYDVQQHEwdCb3plbWFuMREwDwYDVQQKEwhTYXd0b290
+aDETMBEGA1UECxMKQ29uc3VsdGluZzEWMBQGA1UEAxMNd3d3Lnlhc3NsLmNvbTEd
+MBsGCSqGSIb3DQEJARYOaW5mb0B5YXNzbC5jb20wHhcNMTExMDI0MTgyNzEzWhcN
+MTQwNzIwMTgyNzEzWjCBijELMAkGA1UEBhMCVVMxEDAOBgNVBAgTB01vbnRhbmEx
+EDAOBgNVBAcTB0JvemVtYW4xDjAMBgNVBAoTBXlhU1NMMRAwDgYDVQQLEwdTdXBw
+b3J0MRYwFAYDVQQDEw13d3cueWFzc2wuY29tMR0wGwYJKoZIhvcNAQkBFg5pbmZv
+QHlhc3NsLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMCVCOFX
+QfJxbbfSRUEnAWXGRa7yvCQwuJXOL07W9hyIvHyf+6hnf/5cnFF194rKB+c1L4/h
+vXvAL3yrZKgX/Mpde7rgIeVyLm8uhtiVc9qsG1O5Xz/XGQ0lT+FjY1GLC2Q/rUO4
+pRxcNLOuAKBjxfZ/C1loeHOmjBipAm2vwxkBLrgQ48bMQLRpo0YzaYduxLsXpvPo
+3a1zvHsvIbX9ZlEMvVSz4W1fHLwjc9EJA4kU0hC5ZMMq0KGWSrzh1Bpbx6DAwWN4
+D0Q3MDKWgDIjlaF3uhPSl3PiXSXJag3DOWCktLBpQkIJ6dgIvDMgs1gip6rrxOHm
+YYPF0pbf2dBPrdcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAcU7TYt/MTPfNt25S
+C2xu4L3CLQfXwLBuQx41vDABUPD/mSNsGBpBthHW1Blh/eR3lxw54VerxRVjdxE2
+XnTiJAsfQXitt4HntEBmgPBLkaBtqG49U9mLzirhC0Vlh6GWru4+iNUSH3gXrizF
+c0TY3PSv2MyuTOEMvlWkmfdulsDIRYe/3FFX/55zN2oYnMP5Inr0sFK9/CEw+MX/
+Hod9raJaNfUiqLQKdjjmdrCYrxvsigpDdNKFNDeEB+H2I7Ip3qa2t0xXfpYGy6kW
+JSk6Ay1VfaaMpPeegcmVtnzBSs6UZgzKiOvSCfVbGViC3yf9Z5V4twIG1adhve86
+/LJhzQ==
 -----END CERTIFICATE-----
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            e9:d0:a7:5f:79:25:f4:3c
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.yassl.com/emailAddress=[e-mail]
+        Validity
+            Not Before: Oct 24 18:18:15 2011 GMT
+            Not After : Jul 20 18:18:15 2014 GMT
+        Subject: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.yassl.com/emailAddress=[e-mail]
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:bf:0c:ca:2d:14:b2:1e:84:42:5b:cd:38:1f:4a:
+                    f2:4d:75:10:f1:b6:35:9f:df:ca:7d:03:98:d3:ac:
+                    de:03:66:ee:2a:f1:d8:b0:7d:6e:07:54:0b:10:98:
+                    21:4d:80:cb:12:20:e7:cc:4f:de:45:7d:c9:72:77:
+                    32:ea:ca:90:bb:69:52:10:03:2f:a8:f3:95:c5:f1:
+                    8b:62:56:1b:ef:67:6f:a4:10:41:95:ad:0a:9b:e3:
+                    a5:c0:b0:d2:70:76:50:30:5b:a8:e8:08:2c:7c:ed:
+                    a7:a2:7a:8d:38:29:1c:ac:c7:ed:f2:7c:95:b0:95:
+                    82:7d:49:5c:38:cd:77:25:ef:bd:80:75:53:94:3c:
+                    3d:ca:63:5b:9f:15:b5:d3:1d:13:2f:19:d1:3c:db:
+                    76:3a:cc:b8:7d:c9:e5:c2:d7:da:40:6f:d8:21:dc:
+                    73:1b:42:2d:53:9c:fe:1a:fc:7d:ab:7a:36:3f:98:
+                    de:84:7c:05:67:ce:6a:14:38:87:a9:f1:8c:b5:68:
+                    cb:68:7f:71:20:2b:f5:a0:63:f5:56:2f:a3:26:d2:
+                    b7:6f:b1:5a:17:d7:38:99:08:fe:93:58:6f:fe:c3:
+                    13:49:08:16:0b:a7:4d:67:00:52:31:67:23:4e:98:
+                    ed:51:45:1d:b9:04:d9:0b:ec:d8:28:b3:4b:bd:ed:
+                    36:79
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier:
+                27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
+            X509v3 Authority Key Identifier:
+                keyid:27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
+                DirName:/C=US/ST=Montana/L=Bozeman/O=Sawtooth/OU=Consulting/CN=www.yassl.com/emailAddress=[e-mail]
+                serial:E9:D0:A7:5F:79:25:F4:3C
+
+            X509v3 Basic Constraints:
+                CA:TRUE
+    Signature Algorithm: sha1WithRSAEncryption
+        5f:86:14:f4:51:8b:bc:a5:4e:30:da:5e:ac:9a:f8:6c:d9:26:
+        4b:93:f9:e3:1c:89:6f:9e:ee:b3:9d:77:3e:89:20:76:a3:e6:
+        e8:86:15:21:db:e2:33:b2:34:d5:d0:9f:f3:c1:a4:87:92:5c:
+        f9:d1:ff:30:2f:8e:03:bc:b3:3c:0c:32:a3:90:5f:1a:90:1e:
+        af:9d:f3:9e:d7:07:02:a9:7d:27:66:63:2f:af:18:d7:ac:18:
+        98:8c:83:8f:38:f3:0b:ac:36:10:75:fb:ca:76:13:50:5b:02:
+        8f:73:bf:e3:a0:ee:83:52:25:54:ce:26:ce:9c:bd:2f:79:ab:
+        1b:60:b8:92:f1:03:c0:fc:3b:08:d9:c0:ad:d5:72:08:25:80:
+        61:2d:dc:9f:a7:83:62:07:47:e0:07:4c:4b:07:30:04:a9:87:
+        1c:55:7f:07:12:d0:cb:42:5d:cb:cf:66:01:1a:17:ee:f9:0f:
+        60:b7:db:6f:68:e5:4e:41:62:6e:d3:6f:60:4f:4b:27:de:cf:
+        18:07:f1:13:5d:cb:3f:a9:25:44:da:52:5c:c8:04:e1:56:12:
+        f5:2a:90:4e:d1:e2:af:01:b5:23:a1:ec:31:da:7b:63:69:c4:
+        b8:f3:e7:ce:a1:3d:c0:db:6d:f3:b2:d9:46:c8:9f:c3:b8:70:
+        5a:1f:7f:ca
+-----BEGIN CERTIFICATE-----
+MIIEnjCCA4agAwIBAgIJAOnQp195JfQ8MA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
+VQQGEwJVUzEQMA4GA1UECBMHTW9udGFuYTEQMA4GA1UEBxMHQm96ZW1hbjERMA8G
+A1UEChMIU2F3dG9vdGgxEzARBgNVBAsTCkNvbnN1bHRpbmcxFjAUBgNVBAMTDXd3
+dy55YXNzbC5jb20xHTAbBgkqhkiG9w0BCQEWDmluZm9AeWFzc2wuY29tMB4XDTEx
+MTAyNDE4MTgxNVoXDTE0MDcyMDE4MTgxNVowgZAxCzAJBgNVBAYTAlVTMRAwDgYD
+VQQIEwdNb250YW5hMRAwDgYDVQQHEwdCb3plbWFuMREwDwYDVQQKEwhTYXd0b290
+aDETMBEGA1UECxMKQ29uc3VsdGluZzEWMBQGA1UEAxMNd3d3Lnlhc3NsLmNvbTEd
+MBsGCSqGSIb3DQEJARYOaW5mb0B5YXNzbC5jb20wggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQC/DMotFLIehEJbzTgfSvJNdRDxtjWf38p9A5jTrN4DZu4q
+8diwfW4HVAsQmCFNgMsSIOfMT95FfclydzLqypC7aVIQAy+o85XF8YtiVhvvZ2+k
+EEGVrQqb46XAsNJwdlAwW6joCCx87aeieo04KRysx+3yfJWwlYJ9SVw4zXcl772A
+dVOUPD3KY1ufFbXTHRMvGdE823Y6zLh9yeXC19pAb9gh3HMbQi1TnP4a/H2rejY/
+mN6EfAVnzmoUOIep8Yy1aMtof3EgK/WgY/VWL6Mm0rdvsVoX1ziZCP6TWG/+wxNJ
+CBYLp01nAFIxZyNOmO1RRR25BNkL7Ngos0u97TZ5AgMBAAGjgfgwgfUwHQYDVR0O
+BBYEFCeOZxF0wyYdP+0zY7Ok2B0w5ejVMIHFBgNVHSMEgb0wgbqAFCeOZxF0wyYd
+P+0zY7Ok2B0w5ejVoYGWpIGTMIGQMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHTW9u
+dGFuYTEQMA4GA1UEBxMHQm96ZW1hbjERMA8GA1UEChMIU2F3dG9vdGgxEzARBgNV
+BAsTCkNvbnN1bHRpbmcxFjAUBgNVBAMTDXd3dy55YXNzbC5jb20xHTAbBgkqhkiG
+9w0BCQEWDmluZm9AeWFzc2wuY29tggkA6dCnX3kl9DwwDAYDVR0TBAUwAwEB/zAN
+BgkqhkiG9w0BAQUFAAOCAQEAX4YU9FGLvKVOMNperJr4bNkmS5P54xyJb57us513
+PokgdqPm6IYVIdviM7I01dCf88Gkh5Jc+dH/MC+OA7yzPAwyo5BfGpAer53zntcH
+Aql9J2ZjL68Y16wYmIyDjzjzC6w2EHX7ynYTUFsCj3O/46Dug1IlVM4mzpy9L3mr
+G2C4kvEDwPw7CNnArdVyCCWAYS3cn6eDYgdH4AdMSwcwBKmHHFV/BxLQy0Jdy89m
+ARoX7vkPYLfbb2jlTkFibtNvYE9LJ97PGAfxE13LP6klRNpSXMgE4VYS9SqQTtHi
+rwG1I6HsMdp7Y2nEuPPnzqE9wNtt87LZRsifw7hwWh9/yg==

=== modified file 'extra/yassl/certs/server-key.pem'
--- extra/yassl/certs/server-key.pem	2012-05-17 12:10:48 +0000
+++ extra/yassl/certs/server-key.pem	2014-04-28 14:59:06 +0000
@@ -1,9 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----

=== modified file 'extra/yassl/certs/server-keyEnc.pem'
--- extra/yassl/certs/server-keyEnc.pem	2012-07-24 13:24:00 +0000
+++ extra/yassl/certs/server-keyEnc.pem	2014-04-28 14:59:06 +0000
@@ -2,11 +2,29 @@
 Proc-Type: 4,ENCRYPTED
 DEK-Info: DES-CBC,08132C1FFF5BC8CC
 
-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
+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
 -----END RSA PRIVATE KEY-----

=== modified file 'extra/yassl/include/cert_wrapper.hpp'
--- extra/yassl/include/cert_wrapper.hpp	2013-02-26 05:45:28 +0000
+++ extra/yassl/include/cert_wrapper.hpp	2014-04-28 14:59:06 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2014, 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
@@ -89,6 +89,7 @@
     bool verifyNone_;                   // no error if verify fails
     bool failNoCert_;
     bool sendVerify_;
+    bool sendBlankCert_;
     VerifyCallback verifyCallback_;     // user verify callback
 public:
     CertManager();
@@ -116,16 +117,18 @@
     bool verifyNone() const;
     bool failNoCert() const;
     bool sendVerify() const;
+    bool sendBlankCert() const;
 
     void setVerifyPeer();
     void setVerifyNone();
     void setFailNoCert();
     void setSendVerify();
+    void setSendBlankCert();
     void setPeerX509(X509*);
     void setVerifyCallback(VerifyCallback);
 private:
     CertManager(const CertManager&);            // hide copy
-    CertManager& operator=(const CertManager&); // and assign
+    CertManager& operator=(const CertManager&); // and assigin
 };
 
 

=== modified file 'extra/yassl/include/openssl/crypto.h'
--- extra/yassl/include/openssl/crypto.h	2010-12-28 23:47:05 +0000
+++ extra/yassl/include/openssl/crypto.h	2014-04-28 14:59:06 +0000
@@ -1,5 +1,6 @@
 /*
    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 'extra/yassl/include/openssl/des.h'
--- extra/yassl/include/openssl/des.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/des.h	2014-04-28 14:59:06 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2005 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 'extra/yassl/include/openssl/des_old.h'
--- extra/yassl/include/openssl/des_old.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/des_old.h	2014-04-28 14:59:06 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 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 'extra/yassl/include/openssl/engine.h'
--- extra/yassl/include/openssl/engine.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/engine.h	2014-04-28 14:59:06 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2006 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'extra/yassl/include/openssl/err.h'
--- extra/yassl/include/openssl/err.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/err.h	2014-04-28 14:59:06 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2005, 2006 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'extra/yassl/include/openssl/evp.h'
--- extra/yassl/include/openssl/evp.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/evp.h	2014-04-28 14:59:06 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 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 'extra/yassl/include/openssl/generate_prefix_files.pl'
--- extra/yassl/include/openssl/generate_prefix_files.pl	2013-11-27 08:36:11 +0000
+++ extra/yassl/include/openssl/generate_prefix_files.pl	2014-04-28 14:59:06 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 
 # Copyright (C) 2006 MySQL AB
+# Use is subject to license terms
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'extra/yassl/include/openssl/hmac.h'
--- extra/yassl/include/openssl/hmac.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/hmac.h	2014-04-28 14:59:06 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 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 'extra/yassl/include/openssl/lhash.h'
--- extra/yassl/include/openssl/lhash.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/lhash.h	2014-04-28 14:59:06 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2005 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 'extra/yassl/include/openssl/md4.h'
--- extra/yassl/include/openssl/md4.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/md4.h	2014-04-28 14:59:06 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2006 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'extra/yassl/include/openssl/md5.h'
--- extra/yassl/include/openssl/md5.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/md5.h	2014-04-28 14:59:06 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2005, 2006 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'extra/yassl/include/openssl/objects.h'
--- extra/yassl/include/openssl/objects.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/objects.h	2014-04-28 14:59:06 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 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 'extra/yassl/include/openssl/opensslv.h'
--- extra/yassl/include/openssl/opensslv.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/opensslv.h	2014-04-28 14:59:06 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2005 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 'extra/yassl/include/openssl/pem.h'
--- extra/yassl/include/openssl/pem.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/pem.h	2014-04-28 14:59:06 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2006 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'extra/yassl/include/openssl/pkcs12.h'
--- extra/yassl/include/openssl/pkcs12.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/pkcs12.h	2014-04-28 14:59:06 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2006 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'extra/yassl/include/openssl/prefix_crypto.h'
--- extra/yassl/include/openssl/prefix_crypto.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/prefix_crypto.h	2014-04-28 14:59:06 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2006 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'extra/yassl/include/openssl/rand.h'
--- extra/yassl/include/openssl/rand.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/rand.h	2014-04-28 14:59:06 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2005 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 'extra/yassl/include/openssl/rsa.h'
--- extra/yassl/include/openssl/rsa.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/rsa.h	2014-04-28 14:59:06 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2005, 2006 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'extra/yassl/include/openssl/sha.h'
--- extra/yassl/include/openssl/sha.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/sha.h	2014-04-28 14:59:06 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 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 'extra/yassl/include/openssl/ssl.h'
--- extra/yassl/include/openssl/ssl.h	2013-02-26 05:45:28 +0000
+++ extra/yassl/include/openssl/ssl.h	2014-04-28 14:59:06 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2014, 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
@@ -34,7 +34,7 @@
 #include "rsa.h"
 
 
-#define YASSL_VERSION "2.2.2"
+#define YASSL_VERSION "2.3.0"
 
 
 #if defined(__cplusplus)

=== modified file 'extra/yassl/include/openssl/x509.h'
--- extra/yassl/include/openssl/x509.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/x509.h	2014-04-28 14:59:06 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2006 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'extra/yassl/include/openssl/x509v3.h'
--- extra/yassl/include/openssl/x509v3.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/x509v3.h	2014-04-28 14:59:06 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2006 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'extra/yassl/src/cert_wrapper.cpp'
--- extra/yassl/src/cert_wrapper.cpp	2013-02-26 05:45:28 +0000
+++ extra/yassl/src/cert_wrapper.cpp	2014-04-28 14:59:06 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2014, 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
@@ -91,7 +91,7 @@
 //CertManager
 CertManager::CertManager()
     : peerX509_(0), selfX509_(0), verifyPeer_(false), verifyNone_(false), failNoCert_(false),
-      sendVerify_(false), verifyCallback_(0)
+      sendVerify_(false), sendBlankCert_(false), verifyCallback_(0)
 {}
 
 
@@ -143,6 +143,11 @@
     verifyNone_ = true;
 }
 
+bool CertManager::sendBlankCert() const
+{
+  return sendBlankCert_;
+}
+
 
 void CertManager::setFailNoCert()
 {
@@ -155,6 +160,11 @@
     sendVerify_ = true;
 }
 
+void CertManager::setSendBlankCert()
+{
+  sendBlankCert_ = true;
+}
+
 
 void CertManager::setVerifyCallback(VerifyCallback vc)
 {

=== modified file 'extra/yassl/src/crypto_wrapper.cpp'
--- extra/yassl/src/crypto_wrapper.cpp	2013-11-27 08:36:11 +0000
+++ extra/yassl/src/crypto_wrapper.cpp	2014-04-28 14:59:06 +0000
@@ -950,9 +950,9 @@
                     info->set = true;
                 }
             }
-            // get blank line
-            if (fgets(line, sizeof(line), file))
             begin = ftell(file);
+            if (fgets(line,sizeof(line), file)) // get blank line
+              begin = ftell(file);
         }
           
     }

=== modified file 'extra/yassl/src/handshake.cpp'
--- extra/yassl/src/handshake.cpp	2014-01-06 06:03:08 +0000
+++ extra/yassl/src/handshake.cpp	2014-04-28 14:59:06 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2014, 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
@@ -1155,6 +1155,8 @@
 {
     if (ssl.GetError()) return;
 
+    if(ssl.getCrypto().get_certManager().sendBlankCert()) return;
+
     CertificateVerify  verify;
     verify.Build(ssl);
     RecordLayerHeader  rlHeader;

=== modified file 'extra/yassl/src/yassl_imp.cpp'
--- extra/yassl/src/yassl_imp.cpp	2014-01-06 06:03:08 +0000
+++ extra/yassl/src/yassl_imp.cpp	2014-04-28 14:59:06 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2014, 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
@@ -1199,22 +1199,38 @@
 
 Certificate::Certificate(const x509* cert) : cert_(cert) 
 {
-    set_length(cert_->get_length() + 2 * CERT_HEADER); // list and cert size
+    if (cert)
+      set_length(cert_->get_length() + 2 * CERT_HEADER); // list and cert size
+    else
+      set_length(CERT_HEADER); // total blank cert size, just list header
 }
 
 
 const opaque* Certificate::get_buffer() const
 {
-    return cert_->get_buffer(); 
+    if (cert_)
+      return cert_->get_buffer();
+
+    return NULL;
 }
 
 
 // output operator for Certificate
 output_buffer& operator<<(output_buffer& output, const Certificate& cert)
 {
-    uint sz = cert.get_length() - 2 * CERT_HEADER;
+    uint sz = cert.get_length();
     opaque tmp[CERT_HEADER];
 
+    if ((int)sz > CERT_HEADER)
+      sz -= 2 * CERT_HEADER;  // actual cert, not including headers
+    else {
+      sz = 0;                 // blank cert case
+      c32to24(sz, tmp);
+      output.write(tmp, CERT_HEADER);
+
+      return output;
+    }
+
     c32to24(sz + CERT_HEADER, tmp);
     output.write(tmp, CERT_HEADER);
     c32to24(sz, tmp);
@@ -1264,9 +1280,11 @@
             ssl.SetError(YasslError(bad_input));
             return;
         }
-        x509* myCert;
-        cm.AddPeerCert(myCert = NEW_YS x509(cert_sz));
-        input.read(myCert->use_buffer(), myCert->get_length());
+        if (cert_sz) {
+          x509* myCert;
+          cm.AddPeerCert(myCert = NEW_YS x509(cert_sz));
+          input.read(myCert->use_buffer(), myCert->get_length());
+        }
 
         list_sz -= cert_sz + CERT_HEADER;
     }
@@ -1969,9 +1987,9 @@
 {
     CertManager& cm = ssl.useCrypto().use_certManager();
 
-    // make sure user provided cert and key before sending and using
-    if (cm.get_cert() && cm.get_privateKey())
-        cm.setSendVerify();
+    cm.setSendVerify();
+    if (cm.get_cert() == NULL || cm.get_privateKey() == NULL)
+      cm.setSendBlankCert();  // send blank cert, OpenSSL requires now
 }
 
 

=== modified file 'extra/yassl/taocrypt/include/integer.hpp'
--- extra/yassl/taocrypt/include/integer.hpp	2013-02-26 05:45:28 +0000
+++ extra/yassl/taocrypt/include/integer.hpp	2014-04-28 14:59:06 +0000
@@ -46,6 +46,14 @@
 
 
 #ifdef TAOCRYPT_X86ASM_AVAILABLE
+    #if defined(__GNUC__) && (__GNUC__ >= 4)
+        // GCC 4 or greater optimizes too much inline on recursive for bigint,
+        // -O3 just as fast without asm here anyway
+        #undef TAOCRYPT_X86ASM_AVAILABLE
+    #endif
+#endif
+
+#ifdef TAOCRYPT_X86ASM_AVAILABLE
 
 #ifdef _M_IX86
     #if (defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 500)) || \

=== modified file 'extra/yassl/taocrypt/include/misc.hpp'
--- extra/yassl/taocrypt/include/misc.hpp	2013-02-26 05:45:28 +0000
+++ extra/yassl/taocrypt/include/misc.hpp	2014-04-28 14:59:06 +0000
@@ -124,15 +124,22 @@
 
 
 // no gas on these systems ?, disable for now
-#if defined(__sun__) || defined (__APPLE__)
+#if defined(__sun__)
+    #undef  TAOCRYPT_DISABLE_X86ASM
     #define TAOCRYPT_DISABLE_X86ASM
 #endif
 
 // icc problem with -03 and integer, disable for now
 #if defined(__INTEL_COMPILER)
+    #undef  TAOCRYPT_DISABLE_X86ASM
     #define TAOCRYPT_DISABLE_X86ASM
 #endif
 
+// indpedent of build system, unless ia32 asm is enabled disable it
+#if !defined(TAOCRYPT_ENABLE_X86ASM)
+    #undef  TAOCRYPT_DISABLE_X86ASM
+    #define TAOCRYPT_DISABLE_X86ASM
+#endif
 
 // Turn on ia32 ASM for Big Integer
 // CodeWarrior defines _MSC_VER

=== modified file 'extra/yassl/taocrypt/src/aes.cpp'
--- extra/yassl/taocrypt/src/aes.cpp	2013-02-26 05:45:28 +0000
+++ extra/yassl/taocrypt/src/aes.cpp	2014-04-28 14:59:06 +0000
@@ -52,7 +52,7 @@
             in  += BLOCK_SIZE;
         }
     else if (mode_ == CBC) {
-        if (dir_ == ENCRYPTION)
+        if (dir_ == ENCRYPTION) {
             while (blocks--) {
                 r_[0] ^= *(word32*)in;
                 r_[1] ^= *(word32*)(in +  4);
@@ -65,7 +65,8 @@
                 out += BLOCK_SIZE;
                 in  += BLOCK_SIZE;
             }
-        else
+        }
+    else {
             while (blocks--) {
                 AsmDecrypt(in, out, (void*)Td0);
                 
@@ -78,6 +79,7 @@
                 out += BLOCK_SIZE;
                 in  += BLOCK_SIZE;
             }
+       }
    }
 }
 
@@ -452,27 +454,31 @@
 
 #if defined(DO_AES_ASM)
     #ifdef __GNUC__
-        #define AS1(x)    asm(#x);
-        #define AS2(x, y) asm(#x ", " #y);
+        #define AS1(x)    #x ";"
+        #define AS2(x, y) #x ", " #y ";"
 
         #define PROLOG()  \
-            asm(".intel_syntax noprefix"); \
-            AS2(    movd  mm3, edi                      )   \
-            AS2(    movd  mm4, ebx                      )   \
-            AS2(    sub   esp, 4                        )   \
-            AS2(    movd  mm7, ebp                      )   \
-            AS2(    mov   [ebp - 4], esi                )   \
-            AS2(    mov   ecx, DWORD PTR [ebp +  8]     )   \
-            AS2(    mov   esi, DWORD PTR [ebp + 12]     )   \
-            AS2(    mov   ebp, DWORD PTR [ebp + 20]     )
+        __asm__ __volatile__ \
+        ( \
+            ".intel_syntax noprefix;" \
+            "push ebx;" \
+            "push ebp;" \
+            "movd mm7, ebp;" \
+            "movd mm4, eax;" \
+            "mov  ebp, edx;"  \
+            "sub  esp, 4;"
 
         #define EPILOG()  \
-            AS2(    mov  esi, [ebp - 4]             )   \
-            AS2(    mov  esp, ebp                   )   \
-            AS2(    movd ebx, mm4                   )   \
-            AS2(    movd edi, mm3                   )   \
-            AS1(    emms                            )   \
-            asm(".att_syntax");
+            "add esp, 4;" \
+            "pop ebp;" \
+            "pop ebx;" \
+                   "emms;" \
+                   ".att_syntax;" \
+                : \
+                : "c" (this), "S" (inBlock), "d" (boxes), "a" (outBlock) \
+                : "%edi", "memory", "cc" \
+        );
+
     #else
         #define AS1(x)    __asm x
         #define AS2(x, y) __asm x, y
@@ -504,6 +510,8 @@
 
 #ifdef _MSC_VER
     __declspec(naked) 
+#else
+    __attribute__ ((noinline))
 #endif
 void AES::AsmEncrypt(const byte* inBlock, byte* outBlock, void* boxes) const
 {
@@ -537,7 +545,11 @@
     AS2(    xor   ecx, DWORD PTR [edi +  8]          )   // s2
     AS2(    xor   edx, DWORD PTR [edi + 12]          )   // s3
 
-    AS1(loop1:                                                          )
+#ifdef _MSC_VER
+    AS1( loop1: )  // loop1
+#else
+    AS1(1:  )      // loop1
+#endif
             /* Put0 (mm0) =  
                 Te0[get0,rs 24] ^
                 Te1[get1,rs 16] ^
@@ -652,7 +664,11 @@
     AS1(    dec   edi                                                   )
     AS2(    movd  mm5, edi                                              )
 
-    AS1(    jnz   loop1                                                 )
+#ifdef _MSC_VER
+    AS1(    jnz   loop1)  // loop1
+#else
+    AS1(    jnz   1b )    // loop1
+#endif
 
             // last round
             /*
@@ -799,9 +815,9 @@
 
             // store
     #ifdef __GNUC__
-        AS2(    mov esi, DWORD PTR [ebp + 16]       )   //  outBlock
+        AS2(    movd esi, mm4                       )   //  outBlock
     #else
-        AS2(    mov esi, DWORD PTR [ebp + 12]       )   //  outBlock
+        AS2(    mov  esi, DWORD PTR [ebp + 12]      )   //  outBlock
     #endif
 
     AS1(    bswap ecx                                                   )
@@ -818,7 +834,9 @@
 
 
 #ifdef _MSC_VER
-    __declspec(naked) 
+    __declspec(naked)
+#else
+    __attribute__ ((noinline)) 
 #endif
 void AES::AsmDecrypt(const byte* inBlock, byte* outBlock, void* boxes) const
 {
@@ -853,7 +871,11 @@
     AS2(    xor   edx, DWORD PTR [edi + 12]          )   // s3
 
 
-    AS1(loop2:                                                          )
+#ifdef _MSC_VER
+    AS1( loop2: )  // loop2
+#else
+    AS1(2:  )      // loop2
+#endif
        /*   Put0 (mm0) =
             Td0[GETBYTE(get0, rs24)] ^
             Td1[GETBYTE(get3, rs16)] ^
@@ -964,7 +986,11 @@
     AS1(    dec   edi                                                   )
     AS2(    movd  mm5, edi                                              )
 
-    AS1(    jnz   loop2                                                 )
+#ifdef _MSC_VER
+    AS1(    jnz   loop2)  // loop2
+#else
+    AS1(    jnz   2b )    // loop2
+#endif
 
             // last round
             /*
@@ -1114,9 +1140,9 @@
 
             // store
     #ifdef __GNUC__
-        AS2(    mov esi, DWORD PTR [ebp + 16]       )   //  outBlock
+        AS2(    movd esi, mm4                        )   //  outBlock
     #else
-        AS2(    mov esi, DWORD PTR [ebp + 12]       )   //  outBlock
+        AS2(    mov esi,  DWORD PTR [ebp + 12]       )   //  outBlock
     #endif
     AS2(    mov DWORD PTR [esi],      eax                               )
     AS2(    mov DWORD PTR [esi +  4], ebx                               )

=== modified file 'extra/yassl/taocrypt/src/arc4.cpp'
--- extra/yassl/taocrypt/src/arc4.cpp	2013-02-26 05:45:28 +0000
+++ extra/yassl/taocrypt/src/arc4.cpp	2014-04-28 14:59:06 +0000
@@ -111,28 +111,27 @@
 void ARC4::AsmProcess(byte* out, const byte* in, word32 length)
 {
 #ifdef __GNUC__
-    #define AS1(x)    asm(#x);
-    #define AS2(x, y) asm(#x ", " #y);
+    #define AS1(x)    #x ";"
+    #define AS2(x, y) #x ", " #y ";"
 
     #define PROLOG()  \
-        asm(".intel_syntax noprefix"); \
-        AS2(    movd  mm3, edi                      )   \
-        AS2(    movd  mm4, ebx                      )   \
-        AS2(    movd  mm5, esi                      )   \
-        AS2(    movd  mm6, ebp                      )   \
-        AS2(    mov   ecx, DWORD PTR [ebp +  8]     )   \
-        AS2(    mov   edi, DWORD PTR [ebp + 12]     )   \
-        AS2(    mov   esi, DWORD PTR [ebp + 16]     )   \
-        AS2(    mov   ebp, DWORD PTR [ebp + 20]     )
+    __asm__ __volatile__ \
+    ( \
+        ".intel_syntax noprefix;" \
+        "push ebx;" \
+        "push ebp;" \
+        "mov ebp, eax;"
 
     #define EPILOG()  \
-        AS2(    movd  ebp, mm6                  )   \
-        AS2(    movd  esi, mm5                  )   \
-        AS2(    movd  ebx, mm4                  )   \
-        AS2(    mov   esp, ebp                  )   \
-        AS2(    movd  edi, mm3                  )   \
-        AS1(    emms                            )   \
-        asm(".att_syntax");
+        "pop ebp;" \
+        "pop ebx;" \
+               "emms;" \
+               ".att_syntax;" \
+            : \
+            : "c" (this), "D" (out), "S" (in), "a" (length) \
+            : "%edx", "memory", "cc" \
+    );
+
 #else
     #define AS1(x)    __asm x
     #define AS2(x, y) __asm x, y
@@ -178,7 +177,11 @@
     AS2(    movzx  eax, BYTE PTR [ebp + ecx]    )
 
 
-AS1( begin:                             )
+#ifdef _MSC_VER
+    AS1( loopStart: )  // loopStart
+#else
+    AS1( 0: )          // loopStart for some gas (need numeric for jump back
+#endif
 
     // y = (y+a) & 0xff;
     AS2(    add    edx, eax                     )
@@ -215,7 +218,11 @@
     AS1(    inc    edi                          )
 
     AS1(    dec    DWORD PTR [esp]              )
-    AS1(    jnz    begin                        )
+#ifdef _MSC_VER
+    AS1(    jnz   loopStart )  // loopStart
+#else
+    AS1(    jnz   0b )         // loopStart
+#endif
 
 
     // write back to x_ and y_
@@ -225,6 +232,8 @@
 
 AS1( nothing:                           )
 
+    // inline adjust
+    AS2(    add   esp, 4               )   // fix room on stack
 
     EPILOG()
 }

=== modified file 'extra/yassl/taocrypt/src/blowfish.cpp'
--- extra/yassl/taocrypt/src/blowfish.cpp	2013-02-26 05:45:28 +0000
+++ extra/yassl/taocrypt/src/blowfish.cpp	2014-04-28 14:59:06 +0000
@@ -54,7 +54,7 @@
             in  += BLOCK_SIZE;
         }
     else if (mode_ == CBC) {
-        if (dir_ == ENCRYPTION)
+        if (dir_ == ENCRYPTION) {
             while (blocks--) {
                 r_[0] ^= *(word32*)in;
                 r_[1] ^= *(word32*)(in + 4);
@@ -66,7 +66,8 @@
                 out += BLOCK_SIZE;
                 in  += BLOCK_SIZE;
             }
-        else
+        }
+        else {
             while (blocks--) {
                 AsmProcess(in, out);
                 
@@ -78,6 +79,7 @@
                 out += BLOCK_SIZE;
                 in  += BLOCK_SIZE;
             }
+        }
     }
 }
 
@@ -222,23 +224,26 @@
 
 #if defined(DO_BLOWFISH_ASM)
     #ifdef __GNUC__
-        #define AS1(x)    asm(#x);
-        #define AS2(x, y) asm(#x ", " #y);
+        #define AS1(x)    #x ";"
+        #define AS2(x, y) #x ", " #y ";"
 
         #define PROLOG()  \
-            asm(".intel_syntax noprefix"); \
-            AS2(    movd  mm3, edi                      )   \
-            AS2(    movd  mm4, ebx                      )   \
-            AS2(    movd  mm5, esi                      )   \
-            AS2(    mov   ecx, DWORD PTR [ebp +  8]     )   \
-            AS2(    mov   esi, DWORD PTR [ebp + 12]     )
+        __asm__ __volatile__ \
+        ( \
+            ".intel_syntax noprefix;" \
+            "push ebx;" \
+            "push ebp;" \
+            "movd mm3, eax;"
+        #define EPILOG()  \
+            "pop ebp;" \
+            "pop ebx;" \
+                   "emms;" \
+                   ".att_syntax;" \
+                : \
+                : "c" (this), "S" (inBlock), "a" (outBlock) \
+                : "%edi", "%edx", "memory", "cc" \
+        );
 
-        #define EPILOG()  \
-            AS2(    movd esi, mm5                  )   \
-            AS2(    movd ebx, mm4                  )   \
-            AS2(    movd edi, mm3                  )   \
-            AS1(    emms                           )   \
-            asm(".att_syntax");
     #else
         #define AS1(x)    __asm x
         #define AS2(x, y) __asm x, y
@@ -286,7 +291,9 @@
 
 
 #ifdef _MSC_VER
-    __declspec(naked) 
+    __declspec(naked)
+#else
+    __attribute__ ((noinline))
 #endif
 void Blowfish::AsmProcess(const byte* inBlock, byte* outBlock) const
 {
@@ -335,7 +342,7 @@
     #endif
 
     #ifdef __GNUC__
-        AS2(    mov   edi, [ebp + 16]           ) // outBlock
+        AS2(    movd  edi, mm3                  ) // outBlock
     #else
         AS2(    mov   edi, [ebp + 12]           ) // outBlock
     #endif

=== modified file 'extra/yassl/taocrypt/src/des.cpp'
--- extra/yassl/taocrypt/src/des.cpp	2013-02-26 05:45:28 +0000
+++ extra/yassl/taocrypt/src/des.cpp	2014-04-28 14:59:06 +0000
@@ -473,7 +473,7 @@
 
    uses ecx
 */
-#define AsmIPERM() {\
+#define AsmIPERM() \
     AS2(    rol   ebx, 4                        )   \
     AS2(    mov   ecx, eax                      )   \
     AS2(    xor   ecx, ebx                      )   \
@@ -504,7 +504,7 @@
     AS2(    and   ecx, 0xaaaaaaaa               )   \
     AS2(    xor   eax, ecx                      )   \
     AS2(    rol   eax, 1                        )   \
-    AS2(    xor   ebx, ecx                      ) }
+    AS2(    xor   ebx, ecx                      )
 
 
 /* Uses FPERM algorithm from above
@@ -514,7 +514,7 @@
 
    uses ecx
 */
-#define AsmFPERM()    {\
+#define AsmFPERM()    \
     AS2(    ror  ebx, 1                     )    \
     AS2(    mov  ecx, eax                   )    \
     AS2(    xor  ecx, ebx                   )    \
@@ -545,7 +545,7 @@
     AS2(    and  ecx, 0xf0f0f0f0            )    \
     AS2(    xor  eax, ecx                   )    \
     AS2(    xor  ebx, ecx                   )    \
-    AS2(    ror  eax, 4                     ) }
+    AS2(    ror  eax, 4                     )
 
 
 
@@ -641,32 +641,34 @@
 
 
 #ifdef _MSC_VER
-    __declspec(naked) 
+    __declspec(naked)
+#else
+    __attribute__ ((noinline)) 
 #endif
 void DES_EDE3::AsmProcess(const byte* in, byte* out, void* box) const
 {
 #ifdef __GNUC__
-    #define AS1(x)    asm(#x);
-    #define AS2(x, y) asm(#x ", " #y);
-
-    asm(".intel_syntax noprefix");
+    #define AS1(x)    #x ";"
+    #define AS2(x, y) #x ", " #y ";"
 
     #define PROLOG()  \
-        AS2(    movd  mm3, edi                      )   \
-        AS2(    movd  mm4, ebx                      )   \
-        AS2(    movd  mm5, esi                      )   \
-        AS2(    movd  mm6, ebp                      )   \
-        AS2(    mov   edx, DWORD PTR [ebp +  8]     )   \
-        AS2(    mov   esi, DWORD PTR [ebp + 12]     )   \
-        AS2(    mov   ebp, DWORD PTR [ebp + 20]     )
-
-    // ebp restored at end
-    #define EPILOG()    \
-        AS2(    movd  edi, mm3                      )   \
-        AS2(    movd  ebx, mm4                      )   \
-        AS2(    movd  esi, mm5                      )   \
-        AS1(    emms                                )   \
-        asm(".att_syntax");
+    __asm__ __volatile__ \
+    ( \
+        ".intel_syntax noprefix;" \
+        "push ebx;" \
+        "push ebp;" \
+        "movd mm6, ebp;" \
+        "movd mm7, ecx;" \
+        "mov  ebp, eax;"
+    #define EPILOG()  \
+        "pop ebp;" \
+        "pop ebx;" \
+               "emms;" \
+               ".att_syntax;" \
+            :  \
+            : "d" (this), "S" (in), "a" (box), "c" (out) \
+            : "%edi", "memory", "cc" \
+    );
 
 #else
     #define AS1(x)      __asm x
@@ -756,7 +758,7 @@
     AS1(    bswap eax                           )
 
 #ifdef __GNUC__
-    AS2(    mov   esi, DWORD PTR [ebp +  16]    )   // outBlock
+    AS2(    movd  esi, mm7   )   // outBlock
 #else
     AS2(    mov   esi, DWORD PTR [ebp +  12]    )   // outBlock
 #endif

=== modified file 'extra/yassl/taocrypt/src/integer.cpp'
--- extra/yassl/taocrypt/src/integer.cpp	2013-11-27 08:36:11 +0000
+++ extra/yassl/taocrypt/src/integer.cpp	2014-04-28 14:59:06 +0000
@@ -50,7 +50,9 @@
         #include <emmintrin.h>
     #endif
 #elif defined(_MSC_VER) && defined(_M_IX86)
-    #pragma message("You do not seem to have the Visual C++ Processor Pack ")
+/*    #pragma message("You do not seem to have the Visual C++ Processor Pack ")
+     #pragma message("installed, so use of SSE2 intrinsics will be disabled.")
+*/
     #pragma message("installed, so use of SSE2 intrinsics will be disabled.")
 #elif defined(__GNUC__) && defined(__i386__)
 /*   #warning You do not have GCC 3.3 or later, or did not specify the -msse2 \
@@ -68,7 +70,7 @@
 CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate(
                                            size_type n, const void *)
 {
-    if (n > max_size())
+    if (n > this->max_size())
         return 0;
     if (n == 0)
         return 0;

=== modified file 'extra/yassl/taocrypt/src/md5.cpp'
--- extra/yassl/taocrypt/src/md5.cpp	2013-02-26 05:45:28 +0000
+++ extra/yassl/taocrypt/src/md5.cpp	2014-04-28 14:59:06 +0000
@@ -223,32 +223,32 @@
 
 
 #ifdef _MSC_VER
-    __declspec(naked) 
+    __declspec(naked)
+#else
+    __attribute__ ((noinline))
 #endif
 void MD5::AsmTransform(const byte* data, word32 times)
 {
 #ifdef __GNUC__
-    #define AS1(x)    asm(#x);
-    #define AS2(x, y) asm(#x ", " #y);
+    #define AS1(x)    #x ";"
+    #define AS2(x, y) #x ", " #y ";"
 
     #define PROLOG()  \
-        asm(".intel_syntax noprefix"); \
-        AS2(    movd  mm3, edi                      )   \
-        AS2(    movd  mm4, ebx                      )   \
-        AS2(    movd  mm5, esi                      )   \
-        AS2(    movd  mm6, ebp                      )   \
-        AS2(    mov   ecx, DWORD PTR [ebp +  8]     )   \
-        AS2(    mov   edi, DWORD PTR [ebp + 12]     )   \
-        AS2(    mov   eax, DWORD PTR [ebp + 16]     )
-
+    __asm__ __volatile__ \
+    ( \
+        ".intel_syntax noprefix;" \
+        "push ebx;" \
+        "push ebp;"
     #define EPILOG()  \
-        AS2(    movd  ebp, mm6                  )   \
-        AS2(    movd  esi, mm5                  )   \
-        AS2(    movd  ebx, mm4                  )   \
-        AS2(    mov   esp, ebp                  )   \
-        AS2(    movd  edi, mm3                  )   \
-        AS1(    emms                            )   \
-        asm(".att_syntax");
+        "pop ebp;" \
+        "pop ebx;" \
+               "emms;" \
+               ".att_syntax;" \
+            : \
+            : "c" (this), "D" (data), "a" (times) \
+            : "%esi", "%edx", "memory", "cc" \
+    );
+
 #else
     #define AS1(x)    __asm x
     #define AS2(x, y) __asm x, y
@@ -294,7 +294,11 @@
     AS2(    mov   ecx, [esi +  8]       )   // c
     AS2(    mov   edx, [esi + 12]       )   // d
   
-AS1(loopStart:)
+#ifdef _MSC_VER
+    AS1( loopStart: )  // loopStart
+#else
+    AS1( 0: )          // loopStart for some gas (need numeric for jump back
+#endif
 
     // set up
     AS2(    mov   esi, ecx      )
@@ -389,7 +393,11 @@
     AS2(    movd  ebp, mm2              )   // times
     AS1(    dec   ebp                   )
     AS2(    movd  mm2, ebp              )
-    AS1(    jnz   loopStart             )
+#ifdef _MSC_VER
+    AS1(    jnz   loopStart )  // loopStart
+#else
+    AS1(    jnz   0b )         // loopStart
+#endif
 
 
     EPILOG()

=== modified file 'extra/yassl/taocrypt/src/rabbit.cpp'
--- extra/yassl/taocrypt/src/rabbit.cpp	2013-02-26 05:45:28 +0000
+++ extra/yassl/taocrypt/src/rabbit.cpp	2014-04-28 14:59:06 +0000
@@ -198,7 +198,6 @@
 {
     /* Temporary variables */
     word32 i;
-    byte buffer[16];
 
     /* Encrypt/decrypt all full blocks */
     while (msglen >= 16) {
@@ -227,17 +226,23 @@
 
     /* Encrypt/decrypt remaining data */
     if (msglen) {
+
+      word32 tmp[4];
+      byte*  buffer = (byte*)tmp;
+
+      memset(tmp, 0, sizeof(tmp));   /* help static analysis */
+
         /* Iterate the system */
         NextState(Work);
 
         /* Generate 16 bytes of pseudo-random data */
-        *(word32*)(buffer+ 0) = LITTLE32(workCtx_.x[0] ^
+        tmp[0] = LITTLE32(workCtx_.x[0] ^
                   (workCtx_.x[5]>>16) ^ U32V(workCtx_.x[3]<<16));
-        *(word32*)(buffer+ 4) = LITTLE32(workCtx_.x[2] ^ 
+        tmp[1] = LITTLE32(workCtx_.x[2] ^
                   (workCtx_.x[7]>>16) ^ U32V(workCtx_.x[5]<<16));
-        *(word32*)(buffer+ 8) = LITTLE32(workCtx_.x[4] ^ 
+        tmp[2] = LITTLE32(workCtx_.x[4] ^
                   (workCtx_.x[1]>>16) ^ U32V(workCtx_.x[7]<<16));
-        *(word32*)(buffer+12) = LITTLE32(workCtx_.x[6] ^ 
+        tmp[3] = LITTLE32(workCtx_.x[6] ^
                   (workCtx_.x[3]>>16) ^ U32V(workCtx_.x[1]<<16));
 
         /* Encrypt/decrypt the data */

=== modified file 'extra/yassl/taocrypt/src/ripemd.cpp'
--- extra/yassl/taocrypt/src/ripemd.cpp	2013-02-26 05:45:28 +0000
+++ extra/yassl/taocrypt/src/ripemd.cpp	2014-04-28 14:59:06 +0000
@@ -511,27 +511,26 @@
 void RIPEMD160::AsmTransform(const byte* data, word32 times)
 {
 #ifdef __GNUC__
-    #define AS1(x)    asm(#x);
-    #define AS2(x, y) asm(#x ", " #y);
+    #define AS1(x)    #x ";"
+    #define AS2(x, y) #x ", " #y ";"
 
     #define PROLOG()  \
-        asm(".intel_syntax noprefix"); \
-        AS2(    movd  mm3, edi                      )   \
-        AS2(    movd  mm4, ebx                      )   \
-        AS2(    movd  mm5, esi                      )   \
-        AS2(    movd  mm6, ebp                      )   \
-        AS2(    mov   ecx, DWORD PTR [ebp +  8]     )   \
-        AS2(    mov   edi, DWORD PTR [ebp + 12]     )   \
-        AS2(    mov   edx, DWORD PTR [ebp + 16]     )
+    __asm__ __volatile__ \
+    ( \
+        ".intel_syntax noprefix;" \
+        "push ebx;" \
+        "push ebp;"
 
     #define EPILOG()  \
-        AS2(    movd  ebp, mm6                  )   \
-        AS2(    movd  esi, mm5                  )   \
-        AS2(    movd  ebx, mm4                  )   \
-        AS2(    mov   esp, ebp                  )   \
-        AS2(    movd  edi, mm3                  )   \
-        AS1(    emms                            )   \
-        asm(".att_syntax");
+        "pop ebp;" \
+        "pop ebx;" \
+               "emms;" \
+               ".att_syntax;" \
+            : \
+            : "c" (this), "D" (data), "d" (times) \
+            : "%esi", "%eax", "memory", "cc" \
+    );
+
 #else
     #define AS1(x)    __asm x
     #define AS2(x, y) __asm x, y
@@ -569,7 +568,11 @@
     AS2(    sub   esp, 24               )   // make room for tmp a1 - e1
     AS2(    movd  mm1, esi              )   // store digest_
     
-AS1( loopStart: )
+#ifdef _MSC_VER
+    AS1( loopStart: )  // loopStart
+#else
+    AS1( 0: )          // loopStart for some gas (need numeric for jump back
+#endif
 
     AS2(    movd  mm2, edx              )   // store times_
 
@@ -821,8 +824,14 @@
     AS2(    movd  edx, mm2              )   // times
     AS2(    movd  edi, mm0              )   // data, already advanced
     AS1(    dec   edx                   )
-    AS1(    jnz   loopStart             )
+#ifdef _MSC_VER
+    AS1(    jnz   loopStart )  // loopStart
+#else
+    AS1(    jnz   0b )         // loopStart
+#endif
 
+    // inline adjust
+    AS2(    add   esp, 24               )   // fix room on stack
 
     EPILOG()
 }

=== modified file 'extra/yassl/taocrypt/src/sha.cpp'
--- extra/yassl/taocrypt/src/sha.cpp	2013-02-26 05:45:28 +0000
+++ extra/yassl/taocrypt/src/sha.cpp	2014-04-28 14:59:06 +0000
@@ -760,32 +760,33 @@
 
 
 #ifdef _MSC_VER
-    __declspec(naked) 
+    __declspec(naked)
+#else
+    __attribute__ ((noinline))
 #endif
 void SHA::AsmTransform(const byte* data, word32 times)
 {
 #ifdef __GNUC__
-    #define AS1(x)    asm(#x);
-    #define AS2(x, y) asm(#x ", " #y);
+    #define AS1(x)    #x ";"
+    #define AS2(x, y) #x ", " #y ";"
 
     #define PROLOG()  \
-        asm(".intel_syntax noprefix"); \
-        AS2(    movd  mm3, edi                      )   \
-        AS2(    movd  mm4, ebx                      )   \
-        AS2(    movd  mm5, esi                      )   \
-        AS2(    movd  mm6, ebp                      )   \
-        AS2(    mov   ecx, DWORD PTR [ebp +  8]     )   \
-        AS2(    mov   edi, DWORD PTR [ebp + 12]     )   \
-        AS2(    mov   eax, DWORD PTR [ebp + 16]     )
+    __asm__ __volatile__ \
+    ( \
+        ".intel_syntax noprefix;" \
+        "push ebx;" \
+        "push ebp;"
 
     #define EPILOG()  \
-        AS2(    movd  ebp, mm6                  )   \
-        AS2(    movd  esi, mm5                  )   \
-        AS2(    movd  ebx, mm4                  )   \
-        AS2(    mov   esp, ebp                  )   \
-        AS2(    movd  edi, mm3                  )   \
-        AS1(    emms                            )   \
-        asm(".att_syntax");
+        "pop ebp;" \
+        "pop ebx;" \
+               "emms;" \
+               ".att_syntax;" \
+            : \
+            : "c" (this), "D" (data), "a" (times) \
+            : "%esi", "%edx", "memory", "cc" \
+    );
+
 #else
     #define AS1(x)    __asm x
     #define AS2(x, y) __asm x, y
@@ -826,7 +827,11 @@
 
     AS2(    sub   esp, 68               )   // make room on stack
 
-AS1( loopStart: )
+#ifdef _MSC_VER
+    AS1( loopStart: )  // loopStart
+#else
+    AS1( 0: )          // loopStart for some gas (need numeric for jump back
+#endif
 
     // byte reverse 16 words of input, 4 at a time, put on stack for W[]
 
@@ -1011,8 +1016,14 @@
     
     AS1(    dec   ebp                   )
     AS2(    movd  mm2, ebp              )
-    AS1(    jnz   loopStart             )
+#ifdef _MSC_VER
+    AS1(    jnz   loopStart )  // loopStart
+#else
+    AS1(    jnz   0b )         // loopStart
+#endif
 
+    // inline adjust
+    AS2(    add   esp, 68               )   // fix room on stack
 
     EPILOG()
 }

=== modified file 'extra/yassl/taocrypt/src/twofish.cpp'
--- extra/yassl/taocrypt/src/twofish.cpp	2013-02-26 05:45:28 +0000
+++ extra/yassl/taocrypt/src/twofish.cpp	2014-04-28 14:59:06 +0000
@@ -55,7 +55,7 @@
             in  += BLOCK_SIZE;
         }
     else if (mode_ == CBC) {
-        if (dir_ == ENCRYPTION)
+        if (dir_ == ENCRYPTION) {
             while (blocks--) {
                 r_[0] ^= *(word32*)in;
                 r_[1] ^= *(word32*)(in +  4);
@@ -68,7 +68,8 @@
                 out += BLOCK_SIZE;
                 in  += BLOCK_SIZE;
             }
-        else
+        }
+        else {
             while (blocks--) {
                 AsmDecrypt(in, out);
                
@@ -82,6 +83,7 @@
                 out += BLOCK_SIZE;
                 in  += BLOCK_SIZE;
             }
+        }
     }
 }
 
@@ -272,25 +274,28 @@
 
 #if defined(DO_TWOFISH_ASM)
     #ifdef __GNUC__
-        #define AS1(x)    asm(#x);
-        #define AS2(x, y) asm(#x ", " #y);
+        #define AS1(x)    #x ";"
+        #define AS2(x, y) #x ", " #y ";"
 
         #define PROLOG()  \
-            asm(".intel_syntax noprefix"); \
-            AS2(    movd  mm3, edi                      )   \
-            AS2(    movd  mm4, ebx                      )   \
-            AS2(    movd  mm5, esi                      )   \
-            AS2(    movd  mm6, ebp                      )   \
-            AS2(    mov   edi, DWORD PTR [ebp +  8]     )   \
-            AS2(    mov   esi, DWORD PTR [ebp + 12]     )
+        __asm__ __volatile__ \
+        ( \
+            ".intel_syntax noprefix;" \
+            "push ebx;" \
+            "push ebp;" \
+            "movd mm3, eax;" \
+            "movd mm6, ebp;"
 
         #define EPILOG()  \
-            AS2(    movd esp, mm6                  )   \
-            AS2(    movd esi, mm5                  )   \
-            AS2(    movd ebx, mm4                  )   \
-            AS2(    movd edi, mm3                  )   \
-            AS1(    emms                           )   \
-            asm(".att_syntax");
+            "pop ebp;" \
+            "pop ebx;" \
+                   "emms;" \
+                   ".att_syntax;" \
+                : \
+                : "D" (this), "S" (inBlock), "a" (outBlock) \
+                : "%ecx", "%edx", "memory", "cc" \
+        );
+
     #else
         #define AS1(x)    __asm x
         #define AS2(x, y) __asm x, y
@@ -424,6 +429,8 @@
 
 #ifdef _MSC_VER
     __declspec(naked) 
+#else
+    __attribute__ ((noinline))
 #endif
 void Twofish::AsmEncrypt(const byte* inBlock, byte* outBlock) const
 {
@@ -472,7 +479,7 @@
     AS2(    movd  ebp, mm6                      )
     AS2(    movd  esi, mm0                      ) // k_
     #ifdef __GNUC__
-        AS2(    mov   edi, [ebp + 16]           ) // outBlock
+       AS2(    movd  edi, mm3                  ) // outBlock
     #else
         AS2(    mov   edi, [ebp + 12]           ) // outBlock
     #endif
@@ -493,7 +500,9 @@
 
 
 #ifdef _MSC_VER
-    __declspec(naked) 
+    __declspec(naked)
+#else
+    __attribute__ ((noinline))
 #endif
 void Twofish::AsmDecrypt(const byte* inBlock, byte* outBlock) const
 {
@@ -542,7 +551,7 @@
     AS2(    movd  ebp, mm6                      )
     AS2(    movd  esi, mm0                      ) // k_
     #ifdef __GNUC__
-        AS2(    mov   edi, [ebp + 16]           ) // outBlock
+        AS2(    movd   edi, mm3                 ) // outBlock
     #else
         AS2(    mov   edi, [ebp + 12]           ) // outBlock
     #endif

=== modified file 'extra/yassl/taocrypt/test/test.cpp'
--- extra/yassl/taocrypt/test/test.cpp	2013-02-26 05:45:28 +0000
+++ extra/yassl/taocrypt/test/test.cpp	2014-04-28 14:59:06 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2014, 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
@@ -1165,12 +1165,12 @@
     RSAES_Encryptor enc(priv);
     byte message[] = "Everyone gets Friday off.";
     const word32 len = (word32)strlen((char*)message);
-    byte cipher[64];
+    byte cipher[512];
     enc.Encrypt(message, len, cipher, rng);
 
     RSAES_Decryptor dec(priv);
-    byte plain[64];
-    dec.Decrypt(cipher, sizeof(plain), plain, rng);
+    byte plain[512];
+    dec.Decrypt(cipher, priv.FixedCiphertextLength(), plain, rng);
 
     if (memcmp(plain, message, len))
         return -70;
@@ -1242,11 +1242,11 @@
 int dsa_test()
 {
     Source source;
-    FileSource("../certs/dsa512.der", source);
+    FileSource("../certs/dsa1024.der", source);
     if (source.size() == 0) {
-        FileSource("../../certs/dsa512.der", source);  // for testsuite
+        FileSource("../../certs/dsa1024.der", source);  // for testsuite
         if (source.size() == 0) {
-            FileSource("../../../certs/dsa512.der", source); // win32 Debug dir
+            FileSource("../../../certs/dsa1024.der", source); // win32 Debug dir
             if (source.size() == 0)
                 err_sys("where's your certs dir?", -89);
         }

=== modified file 'include/atomic/nolock.h'
--- include/atomic/nolock.h	2014-01-06 05:23:19 +0000
+++ include/atomic/nolock.h	2014-04-28 14:59:06 +0000
@@ -1,7 +1,7 @@
 #ifndef ATOMIC_NOLOCK_INCLUDED
 #define ATOMIC_NOLOCK_INCLUDED
 
-/* Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. reserved.
+/* Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved. reserved.
    reserved.
 
    This program is free software; you can redistribute it and/or modify
@@ -27,7 +27,7 @@
   neither Visual C++ or gcc we still choose the Solaris
   implementation on Solaris (mainly for SunStudio compilers).
 */
-#  if defined(_MSV_VER)
+#  if defined(_MSC_VER)
 #    include "generic-msvc.h"
 #  elif __GNUC__
 #    if defined(HAVE_SOLARIS_ATOMIC)

=== modified file 'include/my_aes.h'
--- include/my_aes.h	2013-03-19 12:38:59 +0000
+++ include/my_aes.h	2014-04-28 14:59:06 +0000
@@ -1,7 +1,7 @@
 #ifndef MY_AES_INCLUDED
 #define MY_AES_INCLUDED
 
-/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -22,46 +22,108 @@
 
 C_MODE_START
 
-#define AES_KEY_LENGTH 128		/* Must be 128 192 or 256 */
-
-/*
-  my_aes_encrypt	- Crypt buffer with AES encryption algorithm.
-  source		- Pointer to data for encryption
-  source_length		- size of encryption data
-  dest			- buffer to place encrypted data (must be large enough)
-  key			- Key to be used for encryption
-  kel_length		- Length of the key. Will handle keys of any length
-
-  returns  - size of encrypted data, or negative in case of error.
-*/
-
-int my_aes_encrypt(const char *source, int source_length, char *dest,
-		   const char *key, int key_length);
-
-/*
-  my_aes_decrypt	- DeCrypt buffer with AES encryption algorithm.
-  source		- Pointer to data for decryption
-  source_length		- size of encrypted data
-  dest			- buffer to place decrypted data (must be large enough)
-  key			- Key to be used for decryption
-  kel_length		- Length of the key. Will handle keys of any length
-
-  returns  - size of original data, or negative in case of error.
-*/
-
-
-int my_aes_decrypt(const char *source, int source_length, char *dest,
-		   const char *key, int key_length);
-
-/*
-  my_aes_get_size - get size of buffer which will be large enough for encrypted
-		    data
-  source_length   -  length of data to be encrypted
-
-  returns  - size of buffer required to store encrypted data
-*/
-
-int my_aes_get_size(int source_length);
+/** AES IV size is 16 bytes for all supported ciphers except ECB */
+#define MY_AES_IV_SIZE 16
+
+
+/** Supported AES cipher/block mode combos */
+enum my_aes_opmode
+{
+   my_aes_128_ecb,
+   my_aes_192_ecb,
+   my_aes_256_ecb,
+   my_aes_128_cbc,
+   my_aes_192_cbc,
+   my_aes_256_cbc,
+#ifndef HAVE_YASSL
+   my_aes_128_cfb1,
+   my_aes_192_cfb1,
+   my_aes_256_cfb1,
+   my_aes_128_cfb8,
+   my_aes_192_cfb8,
+   my_aes_256_cfb8,
+   my_aes_128_cfb128,
+   my_aes_192_cfb128,
+   my_aes_256_cfb128,
+   my_aes_128_ofb,
+   my_aes_192_ofb,
+   my_aes_256_ofb,
+#endif
+};
+
+#define MY_AES_BEGIN my_aes_128_ecb
+#ifdef HAVE_YASSL
+#define MY_AES_END my_aes_256_cbc
+#else
+#define MY_AES_END my_aes_256_ofb
+#endif
+
+/* If bad data discovered during decoding */
+#define MY_AES_BAD_DATA  -1
+
+/** String representations of the supported AES modes. Keep in sync with my_aes_opmode */
+extern const char *my_aes_opmode_names[];
+
+/**
+  Encrypt a buffer using AES
+
+  @param source         [in]  Pointer to data for encryption
+  @param source_length  [in]  Size of encryption data
+  @param dest           [out] Buffer to place encrypted data (must be large enough)
+  @param key            [in]  Key to be used for encryption
+  @param key_length     [in]  Length of the key. Will handle keys of any length
+  @param mode           [in]  encryption mode
+  @param iv             [in]  16 bytes initialization vector if needed. Otherwise NULL
+  @return              size of encrypted data, or negative in case of error
+*/
+
+int my_aes_encrypt(const unsigned char *source, uint32 source_length,
+                   unsigned char *dest,
+		   const unsigned char *key, uint32 key_length,
+                   enum my_aes_opmode mode, const unsigned char *iv);
+
+/**
+  Decrypt an AES encrypted buffer
+
+  @param source         Pointer to data for decryption
+  @param source_length  size of encrypted data
+  @param dest           buffer to place decrypted data (must be large enough)
+  @param key            Key to be used for decryption
+  @param key_length     Length of the key. Will handle keys of any length
+  @param mode           encryption mode
+  @param iv             16 bytes initialization vector if needed. Otherwise NULL
+  @return size of original data.
+*/
+
+
+int my_aes_decrypt(const unsigned char *source, uint32 source_length,
+                   unsigned char *dest,
+ 		   const unsigned char *key, uint32 key_length,
+                   enum my_aes_opmode mode, const unsigned char *iv);
+
+/**
+  Calculate the size of a buffer large enough for encrypted data
+
+  @param source_length  length of data to be encrypted
+  @param mode           encryption mode
+  @return               size of buffer required to store encrypted data
+*/
+
+int my_aes_get_size(uint32 source_length, enum my_aes_opmode mode);
+
+/**
+  Return true if the AES cipher and block mode requires an IV
+
+  SYNOPSIS
+  my_aes_needs_iv()
+  @param mode           encryption mode
+
+  @retval TRUE   IV needed
+  @retval FALSE  IV not needed
+*/
+
+my_bool my_aes_needs_iv(my_aes_opmode opmode);
+
 
 C_MODE_END
 

=== modified file 'include/my_base.h'
--- include/my_base.h	2014-03-20 12:24:00 +0000
+++ include/my_base.h	2014-04-28 14:59:06 +0000
@@ -204,7 +204,9 @@
     Prepare table for export
     (e.g. quiesce the table and write table metadata).
   */
-  HA_EXTRA_EXPORT
+  HA_EXTRA_EXPORT,
+  /** Do secondary sort by handler::ref (rowid) after key sort. */
+  HA_EXTRA_SECONDARY_SORT_ROWID
 };
 
 /* Compatible option, to be deleted in 6.0 */
@@ -483,7 +485,8 @@
 #define HA_ERR_FTS_EXCEED_RESULT_CACHE_LIMIT  188 /* FTS query exceeds result cache limit */
 #define HA_ERR_TEMP_FILE_WRITE_FAILURE	189	/* Temporary file write failure */
 #define HA_ERR_INNODB_FORCED_RECOVERY 190	/* Innodb is in force recovery mode */
-#define HA_ERR_LAST 190    /* Copy of last error nr */
+#define HA_ERR_FTS_TOO_MANY_WORDS_IN_PHRASE	191 /* Too many words in a phrase */
+#define HA_ERR_LAST               191    /* Copy of last error nr */
 
 /* Number of different errors */
 #define HA_ERR_ERRORS            (HA_ERR_LAST - HA_ERR_FIRST + 1)

=== modified file 'include/my_rnd.h'
--- include/my_rnd.h	2012-02-15 18:54:54 +0000
+++ include/my_rnd.h	2014-04-28 14:59:06 +0000
@@ -30,6 +30,7 @@
 #endif
 
 double my_rnd_ssl(struct rand_struct *rand_st);
+int my_rand_buffer(unsigned char *buffer, size_t buffer_size);
 
 #ifdef __cplusplus
 }

=== modified file 'include/mysql_version.h.in'
--- include/mysql_version.h.in	2013-02-26 05:35:17 +0000
+++ include/mysql_version.h.in	2014-04-28 14:59:06 +0000
@@ -1,6 +1,7 @@
-/* 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 */
+/* Copyright Abandoned 1996,1999 TCX DataKonsult AB & Monty Program KB
+   & Detron HB, 1996, 1999-2004, 2007 MySQL AB.
+   This file is public domain and comes with NO WARRANTY of any kind
+*/
 
 /* Version numbers for protocol & mysqld */
 

=== modified file 'include/queues.h'
--- include/queues.h	2013-03-19 12:38:59 +0000
+++ include/queues.h	2014-04-28 14:59:06 +0000
@@ -44,6 +44,7 @@
 #define queue_element(queue,index) ((queue)->root[index+1])
 #define queue_end(queue) ((queue)->root[(queue)->elements])
 #define queue_replaced(queue) _downheap(queue,1)
+#define queue_set_compare(queue, cmp) (queue)->compare= cmp
 #define queue_set_cmp_arg(queue, set_arg) (queue)->first_cmp_arg= set_arg
 #define queue_set_max_at_top(queue, set_arg) \
   (queue)->max_at_top= set_arg ? -1 : 1

=== modified file 'include/t_ctype.h'
--- include/t_ctype.h	2013-11-27 08:36:11 +0000
+++ include/t_ctype.h	2014-04-28 14:59:06 +0000
@@ -1,4 +1,5 @@
 /* Copyright (C) 2000 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 'libmysql/libmysql.c'
--- libmysql/libmysql.c	2014-01-06 06:03:08 +0000
+++ libmysql/libmysql.c	2014-04-28 14:59:06 +0000
@@ -4332,7 +4332,27 @@
       /* end of data */
       *prev_ptr= 0;
       mysql->warning_count= uint2korr(cp+1);
-      mysql->server_status= uint2korr(cp+3);
+      /*
+        OUT parameters result sets has SERVER_PS_OUT_PARAMS and
+        SERVER_MORE_RESULTS_EXISTS flags in first EOF_Packet only.
+        Last EOF_Packet of OUT parameters result sets have no
+        SERVER_MORE_RESULTS_EXISTS flag as described here:
+        http://dev.mysql.com/doc/internals/en/stored-procedures.html#out-parameter-set
+        Following code reads last EOF_Packet of result set and can clear
+        those flags in server_status if we don't preserve them.
+        Without SERVER_MORE_RESULTS_EXISTS flag mysql_stmt_next_result fails
+        to read OK_Packet after OUT parameters result set.
+        So we need to preserve SERVER_MORE_RESULTS_EXISTS flag for OUT
+        parameters result set.
+      */
+      if (mysql->server_status & SERVER_PS_OUT_PARAMS)
+      {
+        mysql->server_status= uint2korr(cp+3)
+          | SERVER_PS_OUT_PARAMS
+          | (mysql->server_status & SERVER_MORE_RESULTS_EXISTS);
+      }
+      else
+        mysql->server_status= uint2korr(cp+3);
       DBUG_PRINT("info",("status: %u  warning_count: %u",
                          mysql->server_status, mysql->warning_count));
       DBUG_RETURN(0);

=== modified file 'libmysqld/CMakeLists.txt'
--- libmysqld/CMakeLists.txt	2013-11-26 10:44:44 +0000
+++ libmysqld/CMakeLists.txt	2014-04-28 14:59:06 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, 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
@@ -119,3 +119,37 @@
   MERGE_LIBRARIES(libmysqld SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS}
   COMPONENT Embedded NOINSTALL 1)
 ENDIF()
+
+OPTION(WITH_EMBEDDED_SHARED_LIBRARY
+  "Generate shared version of embedded library (in addition to the static one)"
+  OFF)
+IF(WITH_EMBEDDED_SHARED_LIBRARY)
+  MERGE_LIBRARIES(libmysqld SHARED
+    mysqlserver
+    EXPORTS ${CLIENT_API_FUNCTIONS}
+    OUTPUT_NAME "mysqld"
+    COMPONENT Embedded)
+  SET_TARGET_PROPERTIES(libmysqld PROPERTIES
+    VERSION "${SHARED_LIB_MAJOR_VERSION}.${SHARED_LIB_MINOR_VERSION}.0"
+    SOVERSION "${SHARED_LIB_MAJOR_VERSION}"
+    )
+
+  GET_TARGET_PROPERTY(libmysqld_link_flags libmysqld LINK_FLAGS)
+  IF(NOT libmysqld_link_flag)
+    SET(libmysqld_link_flags)
+  ENDIF()
+  SET(libmysqld_link_flags
+    "${CMAKE_SHARED_LIBRARY_C_FLAGS} ${libmysqld_link_flags}")
+  SET_TARGET_PROPERTIES(libmysqld
+    PROPERTIES LINK_FLAGS "${libmysqld_link_flags}")
+
+  IF(LINK_FLAG_NO_UNDEFINED)
+    SET(libmysqld_link_flags
+      "${libmysqld_link_flags} ${LINK_FLAG_NO_UNDEFINED}")
+    SET_TARGET_PROPERTIES(libmysqld
+      PROPERTIES LINK_FLAGS "${libmysqld_link_flags}")
+  ENDIF()
+
+  SET_TARGET_PROPERTIES(libmysqld PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+  SET_TARGET_PROPERTIES(mysqlserver PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+ENDIF()

=== modified file 'libmysqld/examples/test-run'
--- libmysqld/examples/test-run	2013-11-27 08:36:11 +0000
+++ libmysqld/examples/test-run	2014-04-28 14:59:06 +0000
@@ -1,6 +1,7 @@
 #! /bin/sh
 
 # Copyright (C) 2001, 2006 MySQL AB
+# Use is subject to license terms
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'mysql-test/collections/default.daily'
--- mysql-test/collections/default.daily	2013-11-27 08:36:11 +0000
+++ mysql-test/collections/default.daily	2014-04-28 14:59:06 +0000
@@ -19,6 +19,10 @@
 # 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 (rpl suite with gtid_mode=ON)
+perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=rpl_gtid-debug --vardir=var-rpl_gtid-debug --suite=rpl --mysqld=--enforce-gtid-consistency --mysqld=--log-slave-updates --mysqld=--gtid-mode=on --skip-test-list=collections/disabled-gtid-on.list
+
+
 # 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
 

=== modified file 'mysql-test/collections/default.push'
--- mysql-test/collections/default.push	2013-11-27 08:36:11 +0000
+++ mysql-test/collections/default.push	2014-04-28 14:59:06 +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 --unit-tests
 perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=rpl_binlog_ps_row-debug --vardir=var-rpl_binlog-ps_row --suite=rpl,binlog --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list
-perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=main_embedded-debug --vardir=var-main_emebbed  --suite=main --embedded --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=main_embedded-debug --vardir=var-main_embedded  --suite=main --embedded --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list
 perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=innodb_4k_size-debug --vardir=var-innodb-4k --experimental=collections/default.experimental --suite=innodb --mysqld=--innodb-page-size=4k --skip-test-list=collections/disabled-per-push.list
 perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=rpl_binlog_n_mix_MTS-debug --vardir=var-mts-rpl-binlog-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl --skip-test-list=collections/disabled-per-push.list

=== modified file 'mysql-test/collections/default.weekly'
--- mysql-test/collections/default.weekly	2014-03-20 12:24:00 +0000
+++ mysql-test/collections/default.weekly	2014-04-28 14:59:06 +0000
@@ -47,6 +47,8 @@
 # Non debug runs of default suites in normal modes
 perl mysql-test-run.pl --force --timer   --parallel=auto --experimental=collections/default.experimental --comment=normal-non-debug  --vardir=var-normal-non-debug --report-features --skip-test-list=collections/disabled-weekly.list
 
+# Additional GTID coverage (rpl suite with gtid_mode=ON)
+perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=rpl_gtid-debug --vardir=var-rpl_gtid-debug --suite=rpl --mysqld=--enforce-gtid-consistency --mysqld=--log-slave-updates --mysqld=--gtid-mode=on --skip-test-list=collections/disabled-gtid-on.list --big-test --testcase-timeout=60 --suite-timeout=360
 
 
 # Multi-Thread Slave

=== modified file 'mysql-test/collections/disabled-gtid-on.list'
--- mysql-test/collections/disabled-gtid-on.list	2013-02-12 12:09:48 +0000
+++ mysql-test/collections/disabled-gtid-on.list	2014-04-28 14:59:06 +0000
@@ -3,3 +3,4 @@
 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.
+rpl.rpl_server_uuid                            : No need to test. Non-transactional tables involved.

=== added file 'mysql-test/extra/rpl_tests/grep_pattern.inc'
--- mysql-test/extra/rpl_tests/grep_pattern.inc	1970-01-01 00:00:00 +0000
+++ mysql-test/extra/rpl_tests/grep_pattern.inc	2014-04-28 14:59:06 +0000
@@ -0,0 +1,22 @@
+# Please set GREP_FILE and GREP_PATTERN environment variables 
+#  to work this file properly.
+--perl
+  use strict;
+  my $file= $ENV{'GREP_FILE'} or die "grep file not set";
+  my $pattern= $ENV{'GREP_PATTERN'} or die "pattern is not set";
+  open(FILE, "$file") or die("Unable to open $file: $!\n");
+  my $count = 0;
+  print "Matching lines are:\n";
+  while (<FILE>) {
+    my $line = $_;
+    if ($line =~ /$pattern/) {
+      print "$line\n";
+      $count++;
+    }
+  }
+  if ($count == 0) {
+    print "None\n";
+  }
+  print "Occurrences of the $pattern in the input file : $count\n";
+  close(FILE);
+EOF

=== modified file 'mysql-test/extra/rpl_tests/rpl_auto_increment.test'
--- mysql-test/extra/rpl_tests/rpl_auto_increment.test	2012-05-22 09:57:00 +0000
+++ mysql-test/extra/rpl_tests/rpl_auto_increment.test	2014-04-28 14:59:06 +0000
@@ -8,7 +8,7 @@
 insert into t1 values (NULL,1),(NULL,2),(NULL,3);
 select * from t1;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select * from t1;
 connection master;
 drop table t1;
@@ -19,7 +19,7 @@
 insert into t1 values (NULL,5),(NULL,6);
 select * from t1;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select * from t1;
 connection master;
 
@@ -38,7 +38,7 @@
 insert into t1 values(NULL),(NULL);
 select * from t1;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select * from t1;
 connection master;
 drop table t1;
@@ -56,7 +56,7 @@
 insert into t1 values(NULL),(NULL);
 select * from t1;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select * from t1;
 connection master;
 drop table t1;
@@ -74,7 +74,7 @@
 insert ignore into t1 values(600),(NULL),(NULL),(610),(NULL);
 select * from t1;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select * from t1;
 connection master;
 drop table t1;
@@ -86,7 +86,7 @@
 
 eval create table t1 (a int not null auto_increment, primary key (a)) engine=$engine_type2;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 insert into t1 values(2),(12),(22),(32),(42);
 connection master;
 
@@ -94,7 +94,7 @@
 insert into t1 values (3),(NULL),(NULL);
 select * from t1;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select * from t1;
 
 # Test for BUG#20524 "auto_increment_* not observed when inserting
@@ -129,7 +129,7 @@
 set auto_increment_offset=700;
 insert into t3 values(null);
 select * from t3 order by a;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select * from t1 order by a;
 select * from t2 order by a;
 select * from t3 order by a;
@@ -137,7 +137,7 @@
 connection master;
 
 drop table t1,t2,t3;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 #
 # BUG#41986 Replication slave does not pick up proper AUTO_INCREMENT value for Innodb tables
@@ -149,7 +149,7 @@
 INSERT INTO t1 VALUES (NULL), (NULL), (NULL);
 show create table t1;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 show create table t1;
 
 connection master;
@@ -200,7 +200,7 @@
 INSERT INTO t1 VALUES(4);
 INSERT INTO t2 VALUES(4);
 FLUSH LOGS;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 let $diff_tables= master:t1, slave:t1;
 source include/diff_tables.inc;
@@ -211,7 +211,7 @@
 connection master;
 DROP TABLE t1;
 DROP TABLE t2;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 connection master;
 let $MYSQLD_DATADIR= `SELECT @@DATADIR`;
@@ -230,7 +230,7 @@
 source include/start_slave.inc;
 connection master;
 --exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.saved | $MYSQL test
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 let $diff_tables= master:t1, slave:t1;
 source include/diff_tables.inc;
@@ -243,7 +243,7 @@
 DROP TABLE t1;
 DROP TABLE t2;
 SET SQL_MODE='';
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 #
 # BUG#56662
@@ -263,12 +263,12 @@
 SET SQL_MODE=0;
 COMMIT;
 SELECT * FROM t1;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 SELECT * FROM t1;
 
 connection master;
 DROP TABLE t1;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 #
 # WL#5872 "avoid using global heap memory to remember autoincrement
@@ -277,12 +277,12 @@
 connection master;
 eval create table t1(a int auto_increment primary key) engine=$engine_type;
 insert into t1 values (null),(null),(1025),(null);
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select * from t1;
 let $diff_tables= master:t1, slave:t1;
 --source include/diff_tables.inc
 connection master;
 drop table t1;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 --source include/rpl_end.inc

=== modified file 'mysql-test/extra/rpl_tests/rpl_auto_increment_insert_view.test'
--- mysql-test/extra/rpl_tests/rpl_auto_increment_insert_view.test	2010-12-19 17:07:28 +0000
+++ mysql-test/extra/rpl_tests/rpl_auto_increment_insert_view.test	2014-04-28 14:59:06 +0000
@@ -26,7 +26,7 @@
 INSERT INTO v16(c1) VALUES (23), (24);
 INSERT INTO v16(c1) VALUES (25), (26);
 commit;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 --echo #Test if the results are consistent on master and slave
 --echo #for 'INSERT DATA INTO VIEW WHICH INVOKES TRIGGERS'
 let $diff_tables= master:t3, slave:t3;
@@ -37,7 +37,7 @@
 DROP TABLE t2;
 DROP TABLE t3;
 DROP VIEW  v16;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 
 

=== modified file 'mysql-test/extra/rpl_tests/rpl_auto_increment_invoke_trigger.test'
--- mysql-test/extra/rpl_tests/rpl_auto_increment_invoke_trigger.test	2010-12-19 17:07:28 +0000
+++ mysql-test/extra/rpl_tests/rpl_auto_increment_invoke_trigger.test	2014-04-28 14:59:06 +0000
@@ -57,7 +57,7 @@
 commit;
 
 connection master;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 --echo #Test if the results are consistent on master and slave
 --echo #for 'INVOKES A TRIGGER with $trigger_action action'
 let $diff_tables= master:t2, slave:t2;
@@ -75,5 +75,5 @@
 DROP TABLE t5;
 DROP TABLE t6;
 DROP FUNCTION f1_insert_triggered;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 

=== modified file 'mysql-test/extra/rpl_tests/rpl_autoinc_func_invokes_trigger.test'
--- mysql-test/extra/rpl_tests/rpl_autoinc_func_invokes_trigger.test	2010-12-19 17:07:28 +0000
+++ mysql-test/extra/rpl_tests/rpl_autoinc_func_invokes_trigger.test	2014-04-28 14:59:06 +0000
@@ -38,7 +38,7 @@
 commit;
 
 connection master;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 --echo #Test if the results are consistent on master and slave
 --echo #for 'CALLS A FUNCTION which INVOKES A TRIGGER with $insert_action action'
 let $diff_tables= master:t2, slave:t2;
@@ -51,5 +51,5 @@
 drop table t2;
 drop table t3;
 drop function f1_two_inserts_trigger;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 

=== renamed file 'mysql-test/suite/rpl/t/rpl_binlog_errors.test' => 'mysql-test/extra/rpl_tests/rpl_binlog_error.inc'
=== modified file 'mysql-test/extra/rpl_tests/rpl_blackhole.test'
--- mysql-test/extra/rpl_tests/rpl_blackhole.test	2008-10-02 19:13:15 +0000
+++ mysql-test/extra/rpl_tests/rpl_blackhole.test	2014-04-28 14:59:06 +0000
@@ -19,7 +19,7 @@
 eval $statement;
 
 --echo [on slave]
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 --echo # Expect 0
 SELECT COUNT(*) FROM t1;
 let $after = query_get_value("SHOW MASTER STATUS", Position, 1);

=== modified file 'mysql-test/extra/rpl_tests/rpl_change_master.test'
--- mysql-test/extra/rpl_tests/rpl_change_master.test	2012-03-23 20:11:19 +0000
+++ mysql-test/extra/rpl_tests/rpl_change_master.test	2014-04-28 14:59:06 +0000
@@ -10,7 +10,7 @@
 connection master;
 # Make SQL slave thread advance a bit
 create table t1(n int);
-sync_slave_with_master;
+--sync_slave_with_master
 select * from t1;
 # Now stop it and make I/O slave thread be ahead
 stop slave sql_thread;
@@ -48,7 +48,7 @@
 select * from t1;
 connection master;
 drop table t1;
-sync_slave_with_master;
+--sync_slave_with_master
 
 # End of 4.1 tests
 
@@ -67,7 +67,7 @@
 
 # Note: the master positon saved by this will also be used by the
 # 'sync_with_master' below.
-sync_slave_with_master;
+--sync_slave_with_master
 
 # Check if the table t1 and t2 are identical on master and slave;
 --let $diff_tables= master:t1, slave:t1
@@ -102,7 +102,7 @@
 eval set global relay_log_purge=$relay_log_purge;
 connection master;
 drop table t1;
-sync_slave_with_master;
+--sync_slave_with_master
 }
 
 #

=== modified file 'mysql-test/extra/rpl_tests/rpl_charset.test'
--- mysql-test/extra/rpl_tests/rpl_charset.test	2010-12-19 17:22:30 +0000
+++ mysql-test/extra/rpl_tests/rpl_charset.test	2014-04-28 14:59:06 +0000
@@ -12,7 +12,7 @@
 --enable_query_log
 show create database mysqltest2;
 show create database mysqltest3;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 --disable_query_log
 select "--- --slave--" as "";
 --enable_query_log
@@ -27,7 +27,7 @@
 select "--- --master--" as "";
 --enable_query_log
 show create database mysqltest3;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 --disable_query_log
 select "--- --slave--" as "";
 --enable_query_log
@@ -47,7 +47,7 @@
 insert into t1 (b) values(@@collation_connection);
 --echo --- --master--
 select * from t1 order by a;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 --echo --- --slave--
 select * from mysqltest2.t1 order by a;
 
@@ -61,7 +61,7 @@
 insert into t1 (b) values(LEAST("Müller","Muffler"));
 --echo --- --master--
 select * from t1 order by a;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 --echo --- --slave--
 select * from mysqltest2.t1 order by a;
 
@@ -83,14 +83,14 @@
 insert into t1 (b) values(collation(@a));
 --echo --- --master--
 select * from t1 order by a;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 --echo --- --slave--
 select * from mysqltest2.t1 order by a;
 
 connection master;
 drop database mysqltest2;
 drop database mysqltest3;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 # Check that we can change global.collation_server (since 5.0.3)
 
@@ -115,12 +115,12 @@
  CHARACTER_SET_RESULTS=koi8r;
 INSERT INTO t1 (c1, c2) VALUES ('îÕ, ÚÁ ÒÙÂÁÌËÕ','îÕ, ÚÁ ÒÙÂÁÌËÕ');
 select hex(c1), hex(c2) from t1;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select hex(c1), hex(c2) from t1;
 
 connection master;
 drop table t1;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 #
 #  BUG#6676: Derivation of variables must be correct on slave

=== modified file 'mysql-test/extra/rpl_tests/rpl_commit_after_flush.test'
--- mysql-test/extra/rpl_tests/rpl_commit_after_flush.test	2010-12-19 17:07:28 +0000
+++ mysql-test/extra/rpl_tests/rpl_commit_after_flush.test	2014-04-28 14:59:06 +0000
@@ -4,11 +4,11 @@
 insert into t1 values(1);
 flush tables with read lock;
 commit;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 # cleanup
 connection master;
 unlock tables;
 drop table t1;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 # End of 4.1 tests

=== modified file 'mysql-test/extra/rpl_tests/rpl_conflicts.test'
--- mysql-test/extra/rpl_tests/rpl_conflicts.test	2013-11-27 08:36:11 +0000
+++ mysql-test/extra/rpl_tests/rpl_conflicts.test	2014-04-28 14:59:06 +0000
@@ -61,8 +61,7 @@
 connection master;
 CREATE TABLE t1(a INT PRIMARY KEY);
 --echo [on slave]
-sync_slave_with_master;
-
+--source include/sync_slave_sql_with_master.inc
 
 --echo ==== Test: SQL thread sees 'INSERT' of existing key ====
 
@@ -121,7 +120,7 @@
 INSERT INTO t1 VALUES (1);
 
 --echo [on slave]
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 DELETE FROM t1 WHERE a = 1;
 
 --echo ---- On master, remove the row that does not exist on slave ----
@@ -171,4 +170,4 @@
 DROP TABLE t1;
 
 --echo [on slave]
---sync_slave_with_master
+--source include/sync_slave_sql_with_master.inc

=== modified file 'mysql-test/extra/rpl_tests/rpl_crash_safe.test'
--- mysql-test/extra/rpl_tests/rpl_crash_safe.test	2012-02-14 22:25:30 +0000
+++ mysql-test/extra/rpl_tests/rpl_crash_safe.test	2014-04-28 14:59:06 +0000
@@ -209,13 +209,13 @@
 --echo #                               CHECK CONSISTENCY
 --echo ###################################################################################
 connection master;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 connection master;
 
 let $MYSQLD_DATADIR= `SELECT @@datadir`;
 
---exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLD_DATADIR/test-crash-master.sql
---exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLD_DATADIR/test-crash-slave.sql
+--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --set-gtid-purged=off --no-create-info test > $MYSQLD_DATADIR/test-crash-master.sql
+--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --set-gtid-purged=off --no-create-info test > $MYSQLD_DATADIR/test-crash-slave.sql
 --diff_files $MYSQLD_DATADIR/test-crash-master.sql $MYSQLD_DATADIR/test-crash-slave.sql
 
 --echo ###################################################################################

=== modified file 'mysql-test/extra/rpl_tests/rpl_ddl.test'
--- mysql-test/extra/rpl_tests/rpl_ddl.test	2010-12-19 17:07:28 +0000
+++ mysql-test/extra/rpl_tests/rpl_ddl.test	2014-04-28 14:59:06 +0000
@@ -129,7 +129,7 @@
 # Some preparations
 ###############################################################
 # The sync_slave_with_master is needed to make the xids deterministic.
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 --echo
 --echo -------- switch to master -------
@@ -148,7 +148,7 @@
 # slave uses MyISAM for the table mysqltest.t1.
 # This is not valid in case of suite/rpl_ndb/rpl_ndb_ddl.test which sources
 # also this script.
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 connection slave;
 if (`SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES
      WHERE TABLE_SCHEMA = 'mysqltest1' AND TABLE_NAME = 't1'
@@ -186,7 +186,7 @@
 #
 SET AUTOCOMMIT = 0;
 use mysqltest1;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 --echo
 --echo -------- switch to slave --------
 connection slave;
@@ -326,7 +326,7 @@
 let $my_slave_commit= true;
 --source include/rpl_stmt_seq.inc
 SELECT * FROM mysqltest1.t7;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 --echo
 --echo -------- switch to slave --------
 connection slave;

=== modified file 'mysql-test/extra/rpl_tests/rpl_delete_no_where.test'
--- mysql-test/extra/rpl_tests/rpl_delete_no_where.test	2007-06-18 13:36:10 +0000
+++ mysql-test/extra/rpl_tests/rpl_delete_no_where.test	2014-04-28 14:59:06 +0000
@@ -4,14 +4,14 @@
 
 eval create table t1 (a int, b int) engine=$engine_type;
 insert into t1 values(1,1);
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select * from t1;
 connection master;
 delete from t1;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select * from t1;
 
 # cleanup
 connection master;
 drop table t1;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc

=== renamed file 'mysql-test/suite/rpl/t/rpl_do_table_filter_insensitive.test' => 'mysql-test/extra/rpl_tests/rpl_do_table_filter_insensitive.inc'
=== renamed file 'mysql-test/suite/rpl/t/rpl_do_table_filter_sensitive.test' => 'mysql-test/extra/rpl_tests/rpl_do_table_filter_sensitive.inc'
=== modified file 'mysql-test/extra/rpl_tests/rpl_filters.test'
--- mysql-test/extra/rpl_tests/rpl_filters.test	2010-10-13 23:16:09 +0000
+++ mysql-test/extra/rpl_tests/rpl_filters.test	2014-04-28 14:59:06 +0000
@@ -12,11 +12,10 @@
 -- echo # On master
 -- source include/show_binlog_events.inc
 
--- sync_slave_with_master
+-- source include/sync_slave_sql_with_master.inc
 -- echo # On slave
 -- source include/show_binlog_events.inc
 
 -- connection master
 DROP DATABASE mydb;
--- sync_slave_with_master
-
+-- source include/sync_slave_sql_with_master.inc

=== modified file 'mysql-test/extra/rpl_tests/rpl_flsh_tbls.test'
--- mysql-test/extra/rpl_tests/rpl_flsh_tbls.test	2010-12-19 17:22:30 +0000
+++ mysql-test/extra/rpl_tests/rpl_flsh_tbls.test	2014-04-28 14:59:06 +0000
@@ -32,7 +32,7 @@
 let $wait_binlog_event= flush tables;
 source include/wait_for_binlog_event.inc;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 # Check that the slave is not confused.
 select * from t3;
 # Note that all this confusion may cause warnings 'table xx is open on rename'

=== modified file 'mysql-test/extra/rpl_tests/rpl_foreign_key.test'
--- mysql-test/extra/rpl_tests/rpl_foreign_key.test	2010-12-19 17:15:12 +0000
+++ mysql-test/extra/rpl_tests/rpl_foreign_key.test	2014-04-28 14:59:06 +0000
@@ -13,7 +13,7 @@
 SET FOREIGN_KEY_CHECKS=1;
 SELECT * FROM t1 ORDER BY a;
 SELECT * FROM t2 ORDER BY b;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 SELECT * FROM t1 ORDER BY a;
 SELECT * FROM t2 ORDER BY b;
 
@@ -25,13 +25,13 @@
 # error and error code for error ER_DUP_ENTRY. Bug 16677
 --error 1022, ER_DUP_ENTRY
 INSERT INTO t3 VALUES (1),(1);
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 connection master;
 SET FOREIGN_KEY_CHECKS=0;
 DROP TABLE IF EXISTS t1,t2,t3;
 SET FOREIGN_KEY_CHECKS=1;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 #
 # Bug #32468 delete rows event on a table with foreign key constraint fails
@@ -50,7 +50,7 @@
 delete from t1;
 
 --echo must sync w/o a problem (could not with the buggy code)
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select count(*) from t1 /* must be zero */;
 
 

=== renamed file 'mysql-test/suite/rpl/t/rpl_heartbeat_2slaves.test' => 'mysql-test/extra/rpl_tests/rpl_heartbeat_2slaves.inc'
--- mysql-test/suite/rpl/t/rpl_heartbeat_2slaves.test	2012-03-23 20:11:19 +0000
+++ mysql-test/extra/rpl_tests/rpl_heartbeat_2slaves.inc	2014-04-28 14:59:06 +0000
@@ -81,11 +81,13 @@
 INSERT INTO t1 VALUES (1, 'on master', '');
 SHOW TABLES;
 --echo [on slave_2]
---sync_slave_with_master slave_2
+--let $sync_slave_connection= slave_2
+--source include/sync_slave_sql_with_master.inc
 SHOW TABLES;
 let $slave_2_pos_before= query_get_value(SHOW SLAVE STATUS, Read_Master_Log_Pos, 1);
 --echo [on slave_1]
---sync_slave_with_master slave_1
+--let $sync_slave_connection= slave_1
+--source include/sync_slave_sql_with_master.inc
 SHOW TABLES;
 --connection master
 --echo [on master]

=== renamed file 'mysql-test/suite/rpl/t/rpl_ignore_table_filter_insensitive.test' => 'mysql-test/extra/rpl_tests/rpl_ignore_table_filter_insensitive.inc'
=== renamed file 'mysql-test/suite/rpl/t/rpl_ignore_table_filter_sensitive.test' => 'mysql-test/extra/rpl_tests/rpl_ignore_table_filter_sensitive.inc'
=== modified file 'mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test'
--- mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test	2012-02-28 16:26:37 +0000
+++ mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test	2014-04-28 14:59:06 +0000
@@ -658,7 +658,7 @@
 --echo ###################################################################################
 --echo #                               CHECK CONSISTENCY
 --echo ###################################################################################
---sync_slave_with_master
+--source include/sync_slave_sql_with_master.inc
 
 --let $diff_tables= master:tt_1,slave:tt_1
 --source include/diff_tables.inc
@@ -672,4 +672,4 @@
 DROP TABLE tt_2;
 DROP TABLE nt_1;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc

=== modified file 'mysql-test/extra/rpl_tests/rpl_insert_delayed.test'
--- mysql-test/extra/rpl_tests/rpl_insert_delayed.test	2012-01-20 18:20:59 +0000
+++ mysql-test/extra/rpl_tests/rpl_insert_delayed.test	2014-04-28 14:59:06 +0000
@@ -24,7 +24,7 @@
 FLUSH TABLE t1; # another way to be sure INSERT DELAYED has inserted
 SELECT COUNT(*) FROM t1;
 # when bug existed slave failed below ("duplicate key" error at random INSERT)
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 use mysqlslap;
 SELECT COUNT(*) FROM t1;
 
@@ -52,7 +52,7 @@
 }
 flush table t1;
 select * from t1;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 # when bug existed in statement-based binlogging, t1 on slave had
 # different content from on master
 select * from t1;
@@ -74,7 +74,7 @@
 }
 flush table t1; # to wait for INSERT DELAYED to be done
 select * from t1;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 # when bug existed in statement-based binlogging, query was binlogged
 # with error_code=0 so slave stopped
 select * from t1;
@@ -83,7 +83,7 @@
 connection master;
 USE test;
 DROP SCHEMA mysqlslap;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 use test;
 connection master;
 
@@ -129,7 +129,7 @@
 }
 select * from t1;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 echo On slave;
 if  (`SELECT @@global.binlog_format = 'STATEMENT'`)
 {
@@ -144,7 +144,7 @@
 # clean up
 connection master;
 drop table t1;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 if  (`SELECT @@global.binlog_format != 'ROW'`)
 {
   #flush the logs after the test

=== modified file 'mysql-test/extra/rpl_tests/rpl_insert_id.test'
--- mysql-test/extra/rpl_tests/rpl_insert_id.test	2011-09-29 09:17:27 +0000
+++ mysql-test/extra/rpl_tests/rpl_insert_id.test	2014-04-28 14:59:06 +0000
@@ -42,7 +42,7 @@
 insert into t1 values (1),(2),(3);
 insert into t1 values (null);
 insert into t2 values (null,last_insert_id());
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select * from t1 ORDER BY a;
 select * from t2 ORDER BY b;
 connection master;
@@ -61,7 +61,7 @@
 insert into t2 values (5,0);
 insert into t2 values (null,last_insert_id());
 SET FOREIGN_KEY_CHECKS=1;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select * from t1;
 select * from t2;
 connection master;
@@ -80,13 +80,13 @@
 --disable_warnings ONCE
 insert into t2 (c) select * from t1 ORDER BY a;
 select * from t2 ORDER BY b;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select * from t1 ORDER BY a;
 select * from t2 ORDER BY b;
 connection master;
 drop table t1;
 drop table t2;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 --echo #
 --echo # Bug#8412: Error codes reported in binary log for CHARACTER SET,
@@ -100,10 +100,10 @@
 # Duplicate Key Errors
 --error 1022, ER_DUP_ENTRY
 INSERT INTO t1 VALUES (1),(1);
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 connection master;
 drop table t1;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 --echo #
 --echo # Bug#14553: NULL in WHERE resets LAST_INSERT_ID
@@ -119,7 +119,7 @@
 insert into t2 (a) select a from t1 where a is null;
 --enable_warnings
 select * from t2;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 connection slave;
 select * from t2;
 connection master;
@@ -205,7 +205,7 @@
 
 select * from t1;
 select * from t2;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select * from t1;
 select * from t2;
 connection master;
@@ -232,7 +232,7 @@
 
 insert into t1 values(null,100);
 select * from t1 order by n;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 # make slave's table autoinc counter bigger
 insert into t1 values(null,200),(null,300);
 delete from t1 where b <> 100;
@@ -243,7 +243,7 @@
 connection master;
 replace into t1 values(null,100),(null,350);
 select * from t1 order by n;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select * from t1 order by n;
 
 # Same test as for REPLACE, but for ON DUPLICATE KEY UPDATE
@@ -255,7 +255,7 @@
 --disable_warnings ONCE
 insert into t1 values (NULL,400),(3,500),(NULL,600) on duplicate key UPDATE n=1000;
 select * from t1 order by n;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select * from t1 order by n;
 
 # and now test for the bug:
@@ -265,7 +265,7 @@
                       b int, unique(b)) engine=$engine_type;
 insert into t1 values(null,100);
 select * from t1 order by n;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 insert into t1 values(null,200),(null,300);
 delete from t1 where b <> 100;
 select * from t1 order by n;
@@ -274,12 +274,12 @@
 --disable_warnings ONCE
 insert into t1 values(null,100),(null,350) on duplicate key update n=2;
 select * from t1 order by n;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select * from t1 order by n;
 
 connection master;
 drop table t1;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 #
 # BUG#24432 "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values"
@@ -292,7 +292,7 @@
 --disable_warnings ONCE
 INSERT INTO t1(b) VALUES(1),(1),(2) ON DUPLICATE KEY UPDATE t1.b=10;
 SELECT * FROM t1 ORDER BY a;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 SELECT * FROM t1 ORDER BY a;
 connection master;
 drop table t1;
@@ -335,7 +335,7 @@
 t1.field_3 = t2.field_c;
 --enable_warnings
 SELECT * FROM t1 ORDER BY id;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 SELECT * FROM t1 ORDER BY id;
 connection master;
 drop table t1, t2;
@@ -382,7 +382,7 @@
 SELECT * FROM t1 ORDER BY id;
 SELECT * FROM t2 ORDER BY id;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 SELECT * FROM t1 ORDER BY id;
 SELECT * FROM t2 ORDER BY id;
 
@@ -463,7 +463,7 @@
 SELECT * FROM t1 ORDER BY i;
 SELECT * FROM t2 ORDER BY i;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 SELECT * FROM t1;
 SELECT * FROM t2;
 
@@ -475,7 +475,7 @@
 DROP TABLE t1, t2;
 
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 --echo #
 --echo # End of 5.0 tests
@@ -521,7 +521,7 @@
 select * from t1 order by id;
 select * from t2 order by id;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select * from t1 order by id;
 select * from t2 order by id;
 
@@ -546,7 +546,7 @@
 select * from t1 order by n;
 select * from t2 order by id;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select * from t1 order by n;
 select * from t2 order by id;
 

=== modified file 'mysql-test/extra/rpl_tests/rpl_insert_id_pk.test'
--- mysql-test/extra/rpl_tests/rpl_insert_id_pk.test	2012-02-09 20:26:08 +0000
+++ mysql-test/extra/rpl_tests/rpl_insert_id_pk.test	2014-04-28 14:59:06 +0000
@@ -19,7 +19,7 @@
 insert into t1 values (1),(2),(3);
 insert into t1 values (null);
 insert into t2 values (null,last_insert_id());
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select * from t1 ORDER BY a;
 select * from t2 ORDER BY b;
 connection master;
@@ -38,7 +38,7 @@
 insert into t2 values (5,0);
 insert into t2 values (null,last_insert_id());
 SET FOREIGN_KEY_CHECKS=1;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select * from t1;
 select * from t2;
 connection master;
@@ -55,13 +55,13 @@
 --disable_warnings ONCE
 insert into t2 (c) select * from t1 ORDER BY a;
 select * from t2 ORDER BY b;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select * from t1 ORDER BY a;
 select * from t2 ORDER BY b;
 connection master;
 drop table t1;
 drop table t2;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 #
 # Bug#8412: Error codes reported in binary log for CHARACTER SET,
@@ -74,7 +74,7 @@
 # Duplicate Key Errors codes
 --error 1022, ER_DUP_ENTRY
 INSERT INTO t1 VALUES (1),(1);
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 connection master;
 drop table t1;
 

=== modified file 'mysql-test/extra/rpl_tests/rpl_insert_ignore.test'
--- mysql-test/extra/rpl_tests/rpl_insert_ignore.test	2012-01-20 18:20:59 +0000
+++ mysql-test/extra/rpl_tests/rpl_insert_ignore.test	2014-04-28 14:59:06 +0000
@@ -38,7 +38,7 @@
 --source include/assert.inc
 
 # Compare master and slave
---sync_slave_with_master
+--source include/sync_slave_sql_with_master.inc
 --let $diff_tables= master:test.t1 , slave:test.t1
 --source include/diff_tables.inc
 
@@ -66,6 +66,7 @@
 }
 if (`SELECT @@BINLOG_FORMAT = 'STATEMENT'`)
 {
+  --source extra/rpl_tests/rpl_insert_ignore_gtid_on.inc
   --let $assert_cond= \'[\'SHOW BINLOG EVENTS IN "$binlog_file" FROM $binlog_start LIMIT 2, 1\', Info, 1]\' LIKE \'%$statement_file\'
   --let $assert_text= In SBR or MIXED modes, the event in the binlog should be the same that was executed. In RBR mode, binlog position should stay unchanged.
 }
@@ -109,6 +110,7 @@
 }
 if (`SELECT @@BINLOG_FORMAT = 'STATEMENT'`)
 {
+  --source extra/rpl_tests/rpl_insert_ignore_gtid_on.inc
   --let $assert_cond= \'[\'SHOW BINLOG EVENTS IN "$binlog_file" FROM $binlog_start LIMIT 1, 1\', Info, 1]\' LIKE \'%$statement_file\'
   --let $assert_text= In SBR or MIXED modes, the event in the binlog should be the same that was executed. In RBR mode, binlog position should stay unchanged.
 }
@@ -118,4 +120,4 @@
 # Clean up
 --connection master
 drop table t1, t2;
---sync_slave_with_master
+--source include/sync_slave_sql_with_master.inc

=== added file 'mysql-test/extra/rpl_tests/rpl_insert_ignore_gtid_on.inc'
--- mysql-test/extra/rpl_tests/rpl_insert_ignore_gtid_on.inc	1970-01-01 00:00:00 +0000
+++ mysql-test/extra/rpl_tests/rpl_insert_ignore_gtid_on.inc	2014-04-28 14:59:06 +0000
@@ -0,0 +1,17 @@
+if (!`SELECT COUNT(*) = 0 OR VARIABLE_VALUE != 'ON' FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME = 'GTID_MODE'`)
+{
+  --let $i=1
+  --let $j=1
+  while ($i)
+  {
+    --let $temp= query_get_value("SHOW BINLOG EVENTS", Pos, $j)
+    --let $temp2=`select $binlog_start - $temp`
+    if($temp2==0)
+    {
+      --let $binlog_offset= query_get_value(SHOW BINLOG EVENTS, End_log_pos, $j)
+      dec $i;
+    }
+   inc $j;
+  }
+  --let $binlog_start= $binlog_offset
+}

=== modified file 'mysql-test/extra/rpl_tests/rpl_loaddata.test'
--- mysql-test/extra/rpl_tests/rpl_loaddata.test	2012-04-23 08:14:28 +0000
+++ mysql-test/extra/rpl_tests/rpl_loaddata.test	2014-04-28 14:59:06 +0000
@@ -45,7 +45,7 @@
 insert into t3 select * from t2;
 --enable_warnings
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 select * from t1;
 select * from t3;
@@ -57,7 +57,7 @@
 drop table t3;
 create table t1(a int, b int, unique(b));
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 # See if slave stops when there's a duplicate entry for key error in LOAD DATA
 
@@ -238,7 +238,7 @@
 -- disconnect conn2
 -- connection master
 
--- sync_slave_with_master
+-- source include/sync_slave_sql_with_master.inc
 -- eval use $db1
 
 let $diff_tables= master:$db1.t1, slave:$db1.t1;
@@ -249,7 +249,7 @@
 -- eval DROP DATABASE $db1
 -- eval DROP DATABASE $db2
 
--- sync_slave_with_master
+-- source include/sync_slave_sql_with_master.inc
 
 # BUG#49479: LOAD DATA INFILE is binlogged without escaping field names
 -- source include/rpl_reset.inc
@@ -260,7 +260,7 @@
 LOAD DATA INFILE '../../std_data/loaddata2.dat' REPLACE INTO TABLE `t1` FIELDS TERMINATED BY ',';
 SELECT * FROM t1;
 
--- sync_slave_with_master
+-- source include/sync_slave_sql_with_master.inc
 -- connection master
 DROP TABLE t1;
 

=== renamed file 'mysql-test/suite/rpl/t/rpl_loaddata_s.test' => 'mysql-test/extra/rpl_tests/rpl_loaddata_s.inc'
--- mysql-test/suite/rpl/t/rpl_loaddata_s.test	2011-12-21 17:33:32 +0000
+++ mysql-test/extra/rpl_tests/rpl_loaddata_s.inc	2014-04-28 14:59:06 +0000
@@ -15,12 +15,12 @@
 load data infile '../../std_data/rpl_loaddata.dat' into table test.t1;
 
 # Test logging on slave;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select count(*) from test.t1; # check that LOAD was replicated
 source include/show_binlog_events.inc;
 
 # Cleanup
 connection master;
 drop table test.t1;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 --source include/rpl_end.inc

=== modified file 'mysql-test/extra/rpl_tests/rpl_loadfile.test'
--- mysql-test/extra/rpl_tests/rpl_loadfile.test	2009-03-24 18:27:33 +0000
+++ mysql-test/extra/rpl_tests/rpl_loadfile.test	2014-04-28 14:59:06 +0000
@@ -21,7 +21,7 @@
 CALL test.p1();
 SELECT * FROM test.t1 ORDER BY blob_column;
 save_master_pos;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 connection slave;
 # Need to allow some time when NDB engine is used for
 # the injector thread to have time to populate binlog
@@ -33,4 +33,4 @@
 connection master;
 DROP PROCEDURE IF EXISTS test.p1;
 DROP TABLE test.t1;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc

=== modified file 'mysql-test/extra/rpl_tests/rpl_log.test'
--- mysql-test/extra/rpl_tests/rpl_log.test	2012-03-06 14:29:42 +0000
+++ mysql-test/extra/rpl_tests/rpl_log.test	2014-04-28 14:59:06 +0000
@@ -9,7 +9,7 @@
 # test the slave immediately writes DROP TEMPORARY TABLE this_old_table).
 # We wait for the slave to have written all he wants to the binlog
 # (otherwise RESET MASTER may come too early).
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 source include/stop_slave.inc;
 --source include/wait_for_slave_to_stop.inc
 reset master;
@@ -34,9 +34,22 @@
 source include/show_binlog_events.inc;
 
 let $binlog_limit= 1;
-source include/show_binlog_events.inc;
+if (!`SELECT COUNT(*) = 0 OR VARIABLE_VALUE != 'ON' FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME = 'GTID_MODE'`)
+{
+  # if GTID_MODE=ON, there is the extra event entry the binary log: Gtid_log_event
+  --let $binlog_limit= 2,1
+}
 
-let $binlog_limit= 1,4;
+source include/show_binlog_events.inc;
+--let $from_event= 1
+--let $number_of_events= 4
+if (!`SELECT COUNT(*) = 0 OR VARIABLE_VALUE != 'ON' FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME = 'GTID_MODE'`)
+{
+  # if GTID_MODE=ON, there is the extra event entry the binary log: Gtid_log_event
+  --let $from_event= `SELECT $from_event * 2 + 1`
+  --let $number_of_events= `SELECT $number_of_events * 2 - 2`
+}
+let $binlog_limit= $from_event,$number_of_events;
 source include/show_binlog_events.inc;
 let $binlog_limit=;
 flush logs;
@@ -65,7 +78,7 @@
 connection master;
 select * from t1 order by 1 asc;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 #check t1 on slave to ensure whether it's identical with on master
 select * from t1 order by 1 asc;
@@ -85,7 +98,7 @@
 
 --replace_column 2 #
 show binary logs;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 --replace_column 2 #
 show binary logs;
 
@@ -136,4 +149,4 @@
 
 # End of 4.1 tests
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc

=== modified file 'mysql-test/extra/rpl_tests/rpl_max_relay_size.test'
--- mysql-test/extra/rpl_tests/rpl_max_relay_size.test	2010-12-19 17:07:28 +0000
+++ mysql-test/extra/rpl_tests/rpl_max_relay_size.test	2014-04-28 14:59:06 +0000
@@ -89,7 +89,7 @@
 # log we just closed. But a trick to achieve this is do an update on the master.
 connection master;
 create table t1 (a int);
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 --source include/check_slave_is_running.inc
 
 --echo #
@@ -99,7 +99,7 @@
 flush logs;
 connection master;
 drop table t1;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 --source include/check_slave_is_running.inc
 
 connection master;

=== modified file 'mysql-test/extra/rpl_tests/rpl_mts_crash_safe.test'
--- mysql-test/extra/rpl_tests/rpl_mts_crash_safe.test	2013-11-27 08:36:11 +0000
+++ mysql-test/extra/rpl_tests/rpl_mts_crash_safe.test	2014-04-28 14:59:06 +0000
@@ -110,14 +110,14 @@
 --source include/start_slave.inc
 
 --connection master
---sync_slave_with_master
+--source include/sync_slave_sql_with_master.inc
 
 --connection master
 
 let $MYSQLD_DATADIR= `SELECT @@datadir`;
 
---exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLD_DATADIR/test-mts-crash-master.sql
---exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLD_DATADIR/test-mts-crash-slave.sql
+--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info --set-gtid-purged=off test > $MYSQLD_DATADIR/test-mts-crash-master.sql
+--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info --set-gtid-purged=off test > $MYSQLD_DATADIR/test-mts-crash-slave.sql
 --diff_files $MYSQLD_DATADIR/test-mts-crash-master.sql $MYSQLD_DATADIR/test-mts-crash-slave.sql
 
 

=== modified file 'mysql-test/extra/rpl_tests/rpl_multi_query.test'
--- mysql-test/extra/rpl_tests/rpl_multi_query.test	2010-12-19 17:07:28 +0000
+++ mysql-test/extra/rpl_tests/rpl_multi_query.test	2014-04-28 14:59:06 +0000
@@ -17,7 +17,7 @@
 insert into mysqltest.t1 values(4);
 insert into mysqltest.t1 values(5)/
 delimiter ;/
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select * from mysqltest.t1;
 connection master;
 source include/show_binlog_events.inc;

=== modified file 'mysql-test/extra/rpl_tests/rpl_multi_update.test'
--- mysql-test/extra/rpl_tests/rpl_multi_update.test	2012-02-09 20:26:08 +0000
+++ mysql-test/extra/rpl_tests/rpl_multi_update.test	2014-04-28 14:59:06 +0000
@@ -23,7 +23,7 @@
 
 --disable_warnings ONCE
 UPDATE t1, t2 SET t1.b = t2.b WHERE t1.a = t2.a;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 # End of 4.1 tests
 

=== modified file 'mysql-test/extra/rpl_tests/rpl_multi_update2.test'
--- mysql-test/extra/rpl_tests/rpl_multi_update2.test	2012-02-09 20:26:08 +0000
+++ mysql-test/extra/rpl_tests/rpl_multi_update2.test	2014-04-28 14:59:06 +0000
@@ -39,25 +39,24 @@
 
 connection master;
 drop table t1,t2;
-sync_slave_with_master;
-
+--source include/sync_slave_sql_with_master.inc
 #
 # BUG#13236 multi-update with subquery & --replicate-ignore-table
 #
 reset master;
-
+connection slave;
+RESET MASTER;
 connection master;
 CREATE TABLE t1 ( a INT );
 INSERT INTO t1 VALUES (0);
 UPDATE t1, (SELECT 3 as b) AS x SET t1.a = x.b;
 select * from t1;
-sync_slave_with_master;
 
+--source include/sync_slave_sql_with_master.inc
 connection slave;
 select * from t1;
 
 connection master;
 drop table t1;
-sync_slave_with_master;
-
+--source include/sync_slave_sql_with_master.inc
 # End of 4.1 tests

=== modified file 'mysql-test/extra/rpl_tests/rpl_multi_update3.test'
--- mysql-test/extra/rpl_tests/rpl_multi_update3.test	2012-02-09 20:26:08 +0000
+++ mysql-test/extra/rpl_tests/rpl_multi_update3.test	2014-04-28 14:59:06 +0000
@@ -32,7 +32,7 @@
 SELECT * FROM t1 ORDER BY a;
 SELECT * FROM t2 ORDER BY a;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 connection slave;
 SELECT * FROM t1 ORDER BY a;
 SELECT * FROM t2 ORDER BY a;
@@ -84,7 +84,7 @@
   AND a.a4 = 'foo' 
   AND a.a5 = 'bar';
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 connection slave;
 SELECT * FROM t1;
 SELECT * FROM t2;
@@ -151,7 +151,7 @@
             ) 
 WHERE       b.x = 23;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 connection slave;
 
 SELECT * FROM t1;
@@ -212,7 +212,7 @@
 select * from t1;
 select * from t2;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 select "-- SLAVE AFTER JOIN --" as "";
 select * from t1;

=== modified file 'mysql-test/extra/rpl_tests/rpl_not_null.test'
--- mysql-test/extra/rpl_tests/rpl_not_null.test	2010-12-19 17:15:12 +0000
+++ mysql-test/extra/rpl_tests/rpl_not_null.test	2014-04-28 14:59:06 +0000
@@ -68,7 +68,7 @@
 INSERT INTO t4(a) VALUES (5);
 
 --echo ************* SHOWING THE RESULT SETS WITH INSERTS *************
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 --echo TABLES t1 and t2 must be equal otherwise an error will be thrown. 
 let $diff_tables= master:t1, slave:t1;
@@ -96,7 +96,7 @@
 REPLACE INTO t1(a,b,c) VALUES (2, NULL, 300);
 
 --echo ************* SHOWING THE RESULT SETS WITH UPDATES and REPLACES *************
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 --echo TABLES t1 and t2 must be equal otherwise an error will be thrown. 
 let $diff_tables= master:t1, slave:t1;
@@ -110,7 +110,7 @@
 DROP TABLE t3;
 DROP TABLE t4;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
   
 connection master;
 
@@ -134,7 +134,7 @@
 
 --echo ************* SHOWING THE RESULT SETS WITH INSERTS *************
 --echo TABLES t1 and t2 must be different.
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 connection master;
 SELECT a,b+0,c+0 FROM t1 ORDER BY a;
 connection slave;
@@ -150,7 +150,7 @@
 
 --echo ************* SHOWING THE RESULT SETS WITH UPDATES and REPLACES *************
 --echo TABLES t1 and t2 must be equal otherwise an error will be thrown. 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 let $diff_tables= master:t1, slave:t1;
 source include/diff_tables.inc;
  
@@ -158,7 +158,7 @@
 
 DROP TABLE t1;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
   
 --echo ################################################################################
 --echo #                       NULL ---> NOT NULL (STRICT MODE)
@@ -336,7 +336,7 @@
 
 --echo ************* SHOWING THE RESULT SETS *************
 connection master;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 connection master;
 SELECT * FROM t1 ORDER BY a;
@@ -357,4 +357,4 @@
 DROP TABLE t2;
 DROP TABLE t3;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc

=== modified file 'mysql-test/extra/rpl_tests/rpl_parallel_load.test'
--- mysql-test/extra/rpl_tests/rpl_parallel_load.test	2012-02-09 13:14:33 +0000
+++ mysql-test/extra/rpl_tests/rpl_parallel_load.test	2014-04-28 14:59:06 +0000
@@ -47,7 +47,7 @@
 --enable_query_log
 
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 #connection slave;
 
 --disable_query_log
@@ -227,7 +227,7 @@
   }
   --disable_query_log
 
-  sync_slave_with_master;
+  --source include/sync_slave_sql_with_master.inc
 
 
   let $diff_tables=master:test$i1.tm_nk, slave:test$i1.tm_nk;
@@ -266,4 +266,4 @@
 --enable_result_log
 --enable_query_log
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc

=== modified file 'mysql-test/extra/rpl_tests/rpl_parallel_load_innodb.test'
--- mysql-test/extra/rpl_tests/rpl_parallel_load_innodb.test	2012-02-09 13:14:33 +0000
+++ mysql-test/extra/rpl_tests/rpl_parallel_load_innodb.test	2014-04-28 14:59:06 +0000
@@ -75,7 +75,7 @@
 --enable_query_log
 
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 #connection slave;
 
 --disable_query_log
@@ -306,7 +306,7 @@
   }
   --disable_query_log
 
-  sync_slave_with_master;
+  --source include/sync_slave_sql_with_master.inc
   let $diff_tables=master:test$i1.ti_nk, slave:test$i1.ti_nk;
   source include/diff_tables.inc;
 
@@ -337,5 +337,5 @@
 --enable_result_log
 --enable_query_log
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 

=== modified file 'mysql-test/extra/rpl_tests/rpl_record_compare.test'
--- mysql-test/extra/rpl_tests/rpl_record_compare.test	2011-12-15 09:11:40 +0000
+++ mysql-test/extra/rpl_tests/rpl_record_compare.test	2014-04-28 14:59:06 +0000
@@ -14,14 +14,14 @@
 -- disable_warnings
 UPDATE t1 SET c5 = 'a';
 -- enable_warnings
--- sync_slave_with_master
+-- source include/sync_slave_sql_with_master.inc
 
 -- let $diff_tables= master:t1, slave:t1
 -- source include/diff_tables.inc
 
 --connection master
 DROP TABLE t1;
--- sync_slave_with_master
+-- source include/sync_slave_sql_with_master.inc
 
 -- echo ## case #1.1 - last_null_bit_pos==0 in record_compare with X bit
 -- echo ##             (1 column less and no varchar)
@@ -35,14 +35,14 @@
 -- disable_warnings
 UPDATE t1 SET c5 = 'a';
 -- enable_warnings
--- sync_slave_with_master
+-- source include/sync_slave_sql_with_master.inc
 
 -- let $diff_tables= master:t1, slave:t1
 -- source include/diff_tables.inc
 
 --connection master
 DROP TABLE t1;
--- sync_slave_with_master
+-- source include/sync_slave_sql_with_master.inc
 
 -- echo ## case #2 - X bit is wrongly set.
 
@@ -53,12 +53,12 @@
 INSERT INTO t1(c1) VALUES (10);
 INSERT INTO t1(c1) VALUES (NULL);
 UPDATE t1 SET c1= 0;
--- sync_slave_with_master
+-- source include/sync_slave_sql_with_master.inc
 
 -- let $diff_tables= master:t1, slave:t1
 -- source include/diff_tables.inc
 
 -- connection master
 DROP TABLE t1; 
--- sync_slave_with_master
+-- source include/sync_slave_sql_with_master.inc
 

=== modified file 'mysql-test/extra/rpl_tests/rpl_relayrotate.test'
--- mysql-test/extra/rpl_tests/rpl_relayrotate.test	2011-08-19 13:04:28 +0000
+++ mysql-test/extra/rpl_tests/rpl_relayrotate.test	2014-04-28 14:59:06 +0000
@@ -11,7 +11,7 @@
 # We have to sync with master, to ensure slave had time to start properly
 # before we stop it. If not, we get errors about UNIX_TIMESTAMP() in the log.
 connection master;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 connection slave;
 stop slave;
 connection master;

=== modified file 'mysql-test/extra/rpl_tests/rpl_row_001.test'
--- mysql-test/extra/rpl_tests/rpl_row_001.test	2007-12-19 08:42:31 +0000
+++ mysql-test/extra/rpl_tests/rpl_row_001.test	2014-04-28 14:59:06 +0000
@@ -1,3 +1,4 @@
+--source include/not_gtid_enabled.inc
 let $LOAD_FILE= $MYSQLTEST_VARDIR/std_data/words.dat;
 CREATE TABLE t1 (word CHAR(20) NOT NULL);
 --replace_result $LOAD_FILE LOAD_FILE
@@ -65,6 +66,7 @@
 
 # Try to cause a large relay log lag on the slave by locking t1
 connection slave;
+RESET MASTER;
 LOCK TABLES t1 READ;
 START SLAVE;
 UNLOCK TABLES;

=== modified file 'mysql-test/extra/rpl_tests/rpl_row_UUID.test'
--- mysql-test/extra/rpl_tests/rpl_row_UUID.test	2010-12-19 17:07:28 +0000
+++ mysql-test/extra/rpl_tests/rpl_row_UUID.test	2014-04-28 14:59:06 +0000
@@ -44,7 +44,7 @@
 eval create table t2 (a int) engine=$engine_type;
 insert into t2 values(fn1(2));
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 SHOW CREATE TABLE test.t1;
 
 # Dump the databases and so we can see if they match

=== modified file 'mysql-test/extra/rpl_tests/rpl_row_basic.test'
--- mysql-test/extra/rpl_tests/rpl_row_basic.test	2013-11-27 08:36:11 +0000
+++ mysql-test/extra/rpl_tests/rpl_row_basic.test	2014-04-28 14:59:06 +0000
@@ -18,7 +18,7 @@
 connection master;
 eval CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), INDEX (C1)$extra_index_t1) ENGINE = $type ;
 SELECT * FROM t1;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 SELECT * FROM t1;
 
 # Testing insert
@@ -26,7 +26,7 @@
 INSERT INTO t1 VALUES ('A','B'), ('X','Y'), ('X','X');
 INSERT INTO t1 VALUES ('A','C'), ('X','Z'), ('A','A');
 SELECT * FROM t1 ORDER BY C1,C2;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 SELECT * FROM t1 ORDER BY C1,C2;
 
 # Testing delete
@@ -35,7 +35,7 @@
 connection master;
 DELETE FROM t1 WHERE C1 = C2;
 SELECT * FROM t1 ORDER BY C1,C2;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 SELECT * FROM t1 ORDER BY C1,C2;
 
 #
@@ -46,7 +46,7 @@
 connection master;
 UPDATE t1 SET C2 = 'I' WHERE C1 = 'A' AND C2 = 'C';
 SELECT * FROM t1 ORDER BY C1,C2;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 SELECT * FROM t1 ORDER BY C1,C2;
 
 #BUG#12662190 - COM_COMMIT IS NOT INCREMENTED FROM THE BINARY LOGS ON SLAVE, COM_BEGIN IS
@@ -80,7 +80,7 @@
 connection master;
 UPDATE t1 SET c2 = 'Q' WHERE c1 = 'A' AND c2 = 'N';
 SELECT * FROM t1 ORDER BY c1,c2;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 SELECT * FROM t1 ORDER BY c1,c2;
 
 #
@@ -93,14 +93,14 @@
          (6,'A',35), (7,'A',50), (8,'A',64), (9,'A',81);
 SELECT * FROM t2 ORDER BY c1,c2;
 SELECT * FROM t2 WHERE c2 = c1 * c1 ORDER BY c1,c2;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 SELECT * FROM t2 ORDER BY c1,c2;
 SELECT * FROM t2 WHERE c2 = c1 * c1 ORDER BY c1,c2;
 
 connection master;
 UPDATE t2 SET c2 = c1*c1 WHERE c2 != c1*c1;
 SELECT * FROM t2 WHERE c2 = c1 * c1 ORDER BY c1,c2;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 SELECT * FROM t2 WHERE c2 = c1 * c1 ORDER BY c1,c2;
 
 # Testing update with a condition that does not match any rows, but
@@ -108,13 +108,13 @@
 connection master;
 UPDATE t2 SET c12 = 'Q' WHERE c1 = 1 AND c2 = 999;
 SELECT * FROM t2 ORDER BY c1,c2;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 SELECT * FROM t2 ORDER BY c1,c2;
 
 connection master;
 DELETE FROM t2 WHERE c1 % 4 = 0;
 SELECT * FROM t2 ORDER BY c1,c2;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 SELECT * FROM t2 ORDER BY c1,c2;
 
 connection master;
@@ -129,19 +129,19 @@
 INSERT INTO t3 VALUES ('A','B',1,'B',1), ('X','Y',2,'B',1), ('X','X',3,'B',1);
 INSERT INTO t3 VALUES ('A','C',1,'B',2), ('X','Z',2,'B',2), ('A','A',3,'B',2);
 SELECT * FROM t3 ORDER BY C1,C2;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 SELECT * FROM t3 ORDER BY C1,C2;
 
 connection master;
 DELETE FROM t3 WHERE C1 = C2;
 SELECT * FROM t3 ORDER BY C1,C2;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 SELECT * FROM t3 ORDER BY C1,C2;
 
 connection master;
 UPDATE t3 SET C2 = 'I' WHERE C1 = 'A' AND C2 = 'C';
 SELECT * FROM t3 ORDER BY C1,C2;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 SELECT * FROM t3 ORDER BY C1,C2;
 
 #
@@ -154,7 +154,7 @@
 INSERT INTO t6 VALUES ('A','B',1), ('X','Y',2), ('X','X',3);
 INSERT INTO t6 VALUES ('A','C',4), ('X','Z',5), ('A','A',6);
 SELECT * FROM t6 ORDER BY C3;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 SELECT * FROM t6 ORDER BY C3;
 
 # Testing delete
@@ -163,7 +163,7 @@
 connection master;
 DELETE FROM t6 WHERE C1 = C2;
 SELECT * FROM t6 ORDER BY C3;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 SELECT * FROM t6 ORDER BY C3;
 
 #
@@ -174,7 +174,7 @@
 connection master;
 UPDATE t6 SET C2 = 'I' WHERE C1 = 'A' AND C2 = 'C';
 SELECT * FROM t6 ORDER BY C3;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 SELECT * FROM t6 ORDER BY C3;
 
 # now mixing the 3 tables without begin/commit
@@ -185,7 +185,7 @@
 
 UPDATE t5,t2,t3 SET t5.C2='Q', t2.c12='R', t3.C3 ='S' WHERE t5.C1 = t2.c12 AND t5.C1 = t3.C1;
 SELECT * FROM t5,t2,t3 WHERE t5.C2='Q' AND t2.c12='R' AND t3.C3 ='S' ORDER BY t5.C3,t2.c1,t3.pk1,t3.pk2;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 SELECT * FROM t5,t2,t3 WHERE t5.C2='Q' AND t2.c12='R' AND t3.C3 ='S' ORDER BY t5.C3,t2.c1,t3.pk1,t3.pk2;
 
 #
@@ -203,7 +203,7 @@
 
 INSERT INTO t4 SET C1 = 1;
 SELECT C1,HEX(B1),HEX(B2) FROM t4 ORDER BY C1;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 SELECT C1,HEX(B1),HEX(B2) FROM t4 ORDER BY C1;
 
 if (`select char_length('$bit_field_special') > 0`) {
@@ -215,7 +215,7 @@
 #
 connection master;
 eval CREATE TABLE t7 (C1 INT PRIMARY KEY, C2 INT) ENGINE = $type ;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 --echo --- on slave: original values ---
 INSERT INTO t7 VALUES (1,3), (2,6), (3,9);
 SELECT * FROM t7 ORDER BY C1;
@@ -229,7 +229,7 @@
 --echo --- on master: new values inserted ---
 INSERT INTO t7 VALUES (1,2), (2,4), (3,6);
 SELECT * FROM t7 ORDER BY C1;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 set @@global.slave_exec_mode= default;
 --echo --- on slave: old values should be overwritten by replicated values ---
@@ -253,7 +253,7 @@
 INSERT INTO t8 VALUES (11,22,99);
 SELECT * FROM t8 ORDER BY a;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 --echo --- on slave ---
 SELECT * FROM t8 ORDER BY a;
 INSERT INTO t8 VALUES (1,2,3), (2,4,6), (3,6,9);
@@ -269,7 +269,7 @@
 # We insert a row that will cause conflict on the primary key but not
 # on the other keys.
 INSERT INTO t8 VALUES (2,4,8);
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 set @@global.slave_exec_mode= default;
 
 --echo --- on slave ---
@@ -284,7 +284,7 @@
 # Clean up t1 so that we can use it.
 connection master;
 DELETE FROM t1;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 # Just to get a clean binary log
 --source include/rpl_reset.inc
@@ -293,7 +293,7 @@
 connection master;
 INSERT INTO t1 VALUES ('K','K'), ('L','L'), ('M','M');
 --echo **** On Master ****
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 # since bug#31552/31609 idempotency is not default any longer. In order
 # the following test DELETE FROM t1 to pass the mode is switched
 # temprorarily
@@ -303,7 +303,7 @@
 connection master;
 DELETE FROM t1;
 query_vertical SELECT COUNT(*) FROM t1 ORDER BY c1,c2;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 set @@global.slave_exec_mode= default;
 source include/check_slave_is_running.inc;
 query_vertical SELECT COUNT(*) FROM t1 ORDER BY c1,c2;
@@ -321,7 +321,8 @@
   '2005-11-14 01:01:01', '2005-11-14 01:01:02', '2005-11-14');
 
 --echo **** On Slave ****
-sync_slave_with_master slave;
+--let $sync_slave_connection= slave
+--source include/sync_slave_sql_with_master.inc
 SELECT * FROM t1;
 
 #
@@ -330,7 +331,7 @@
 
 connection master;
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 #
 # BUG#37426: RBR breaks for CHAR() UTF8 fields > 85 chars
@@ -360,14 +361,14 @@
                       c CHAR(16) CHARACTER SET utf8 NOT NULL,
                       j INT NOT NULL) ENGINE = $type ;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 ALTER TABLE t2 MODIFY c CHAR(128) CHARACTER SET utf8 NOT NULL;
 
 connection master;
 eval CREATE TABLE t3 (i INT NOT NULL,
                       c CHAR(128) CHARACTER SET utf8 NOT NULL,
                       j INT NOT NULL) ENGINE = $type ;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 ALTER TABLE t3 MODIFY c CHAR(16) CHARACTER SET utf8 NOT NULL;
 
 connection master;
@@ -378,14 +379,14 @@
 eval CREATE TABLE t5 (i INT NOT NULL,
                       c CHAR(255) CHARACTER SET utf8 NOT NULL,
                       j INT NOT NULL) ENGINE = $type ;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 ALTER TABLE t5 MODIFY c CHAR(16) CHARACTER SET utf8 NOT NULL;
 
 connection master;
 eval CREATE TABLE t6 (i INT NOT NULL,
                       c CHAR(255) CHARACTER SET utf8 NOT NULL,
                       j INT NOT NULL) ENGINE = $type ;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 ALTER TABLE t6 MODIFY c CHAR(128) CHARACTER SET utf8 NOT NULL;
 
 connection master;
@@ -401,7 +402,7 @@
 connection master;
 INSERT INTO t1 VALUES (1, "", 1);
 INSERT INTO t1 VALUES (2, repeat(_utf8'a', 16), 2);
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 let $diff_tables= master:t1, slave:t1;
 source include/diff_tables.inc;
@@ -410,7 +411,7 @@
 connection master;
 INSERT INTO t2 VALUES (1, "", 1);
 INSERT INTO t2 VALUES (2, repeat(_utf8'a', 16), 2);
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 let $diff_tables= master:t2, slave:t2;
 source include/diff_tables.inc;
@@ -429,7 +430,7 @@
 connection master;
 INSERT INTO t4 VALUES (1, "", 1);
 INSERT INTO t4 VALUES (2, repeat(_utf8'a', 128), 2);
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 let $diff_tables= master:t4, slave:t4;
 source include/diff_tables.inc;
@@ -460,14 +461,14 @@
 connection master;
 INSERT INTO t7 VALUES (1, "", 1);
 INSERT INTO t7 VALUES (2, repeat(_utf8'a', 255), 2);
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 let $diff_tables= master:t7, slave:t7;
 source include/diff_tables.inc;
 
 connection master;
 drop table t1, t2, t3, t4, t5, t6, t7;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 #
 # BUG#32709: Assertion failed: trx_data->empty(), file .\log.cc, line 1293
@@ -480,14 +481,14 @@
 --error ER_DUP_ENTRY
 UPDATE t1 SET a = 10;
 INSERT INTO t1 VALUES (4);
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 let $diff_tables= master:t1, slave:t1;
 source include/diff_tables.inc;
 
 connection master;
 drop table t1;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 #
 # Bug #38230  Differences between master and slave after 
@@ -557,7 +558,7 @@
 DELETE FROM t2 WHERE `pk` < 7 LIMIT 1;
 UPDATE t1 SET `int_key` = 4 ORDER BY `pk` LIMIT 6;
 
---sync_slave_with_master
+--source include/sync_slave_sql_with_master.inc
 --echo *** results: t2 must be consistent ****
 
 let $diff_tables= master:t2, slave:t2;
@@ -596,14 +597,14 @@
 UPDATE t1 SET a = 0 WHERE a < 4;
 UPDATE t1 SET a = 8 WHERE a < 5;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 let $diff_tables= master:t1, slave:t1;
 source include/diff_tables.inc;
 
 connection master;
 drop table t1;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 #
 # Bug #39752: Replication failure on RBR + MyISAM + no PK
@@ -666,9 +667,10 @@
 UPDATE t1 SET a = 9 WHERE a < 5 LIMIT 3;
 --enable_warnings
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 if (`select char_length('$bit_field_special') > 0`) {
+  connection slave;
   SET GLOBAL SLAVE_TYPE_CONVERSIONS = @saved_slave_type_conversions;
 }
 
@@ -677,4 +679,4 @@
 
 connection master;
 drop table t1;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc

=== modified file 'mysql-test/extra/rpl_tests/rpl_row_blob.test'
--- mysql-test/extra/rpl_tests/rpl_row_blob.test	2009-11-26 23:32:01 +0000
+++ mysql-test/extra/rpl_tests/rpl_row_blob.test	2014-04-28 14:59:06 +0000
@@ -180,4 +180,4 @@
 # if cluster is shutdown while not all tables are
 # properly dropped, the table becomes inconsistent
 # and wrecks later test cases
---sync_slave_with_master
+--source include/sync_slave_sql_with_master.inc

=== modified file 'mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test'
--- mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test	2010-12-19 17:07:28 +0000
+++ mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test	2014-04-28 14:59:06 +0000
@@ -1,6 +1,7 @@
 # See if INSERT DELAYED gets replicated
 # Only in row-based, as we do SHOW BINLOG EVENTS
 
+-- source include/not_gtid_enabled.inc
 -- source include/have_binlog_format_row.inc
 -- source include/master-slave.inc
 

=== renamed file 'mysql-test/suite/rpl/t/rpl_row_event_max_size.test' => 'mysql-test/extra/rpl_tests/rpl_row_event_max_size.inc'
--- mysql-test/suite/rpl/t/rpl_row_event_max_size.test	2012-06-14 12:18:40 +0000
+++ mysql-test/extra/rpl_tests/rpl_row_event_max_size.inc	2014-04-28 14:59:06 +0000
@@ -43,7 +43,7 @@
 
 --source include/show_binlog_events2.inc
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 --echo # On slave, test the row event data is replicated when the value of
 --echo # the bigger one of max_allowed_packet and binlog_row_event_max_size
 --echo # is larger than the required size.
@@ -57,7 +57,7 @@
 connection master;
 DROP TABLE t1;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 --source include/rpl_reset.inc
 
 --echo # Test it will cause ER_MASTER_FATAL_ERROR_READING_BINLOG when the value
@@ -68,7 +68,7 @@
 CREATE TABLE t1 (a int not null auto_increment, data1 LONGBLOB,
                  data2 LONGBLOB, data3 LONGBLOB, PRIMARY KEY(a));
 
---sync_slave_with_master
+--source include/sync_slave_sql_with_master.inc
 --connection master
 
 INSERT INTO t1 (data1, data2, data3) VALUES (repeat('a', @@global.max_allowed_packet), repeat('a', @@global.max_allowed_packet), repeat('a', @@global.max_allowed_packet));
@@ -76,7 +76,7 @@
 SELECT LENGTH(data1), LENGTH(data2), LENGTH(data3) FROM t1 WHERE a = 1;
 
 drop table t1;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 connection slave;
 call mtr.add_suppression("Slave I/O: Got fatal error 1236 from master when reading data from binary log: .*");

=== modified file 'mysql-test/extra/rpl_tests/rpl_row_func003.test'
--- mysql-test/extra/rpl_tests/rpl_row_func003.test	2010-02-14 00:59:39 +0000
+++ mysql-test/extra/rpl_tests/rpl_row_func003.test	2014-04-28 14:59:06 +0000
@@ -56,7 +56,7 @@
 
 # Sync master and slave for all engines except NDB
 if (`SELECT UPPER(LEFT('$engine_type', 3)) != 'NDB'`) {
-  sync_slave_with_master;
+  --source include/sync_slave_sql_with_master.inc
   connection master;
 }
 # Sync master and slave for NDB engine

=== modified file 'mysql-test/extra/rpl_tests/rpl_row_idempotency.test'
--- mysql-test/extra/rpl_tests/rpl_row_idempotency.test	2010-11-23 00:08:01 +0000
+++ mysql-test/extra/rpl_tests/rpl_row_idempotency.test	2014-04-28 14:59:06 +0000
@@ -31,7 +31,7 @@
 insert into ti1 values (1),(2),(3);
 insert into ti2 set a=2, b=2;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 #connection slave;
 select * from ti1 order by b /* must be (1),(2),(3) */;
@@ -48,7 +48,7 @@
 select * from ti1 order by b /* must be (2),(3) */;
 
 # slave must catch up (expect some warnings in error.log)
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 #connection slave;
 select * from ti1 order by b /* must stays as were on master (1),(2),(3) */;
@@ -59,7 +59,7 @@
 insert into ti2 set a=3, b=3;
 
 # slave must catch up (expect some warnings in error.log)
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 #connection slave;