Merge lp:~akopytov/percona-server/snapshot-cloning into lp:percona-server/5.6

[Alexey Kopytov]

The patch extends START TRANSACTION WITH CONSISTENT SNAPSHOT with the
optional FROM SESSION clause:

START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION <session_id>;

When specified, all participating storage engines and binary log instead
of creating a new snapshot of data (or binary log coordinates), create a
copy of the snapshot which has been created by an active transaction in
the specified session. session_id is the session identifier reported in
the Id column of SHOW PROCESSLIST. The CONNECTION_ID() function returns
the identifier of the current session.

Currently snapshot cloning is only supported by XtraDB and the binary
log.

For XtraDB, a transaction with a cloned snapshot will only see data
visible by the donor transaction at the time it was started. That is,
the cloned transaction will see no changes made between the donor and
cloned transactions were started. It will also see no changes made by
both the donor transaction and even itself.

For binary log, cloning means that Binlog_snapshot_file and
Binlog_snapshot_position variables implemented in
https://blueprints.launchpad.net/percona-server/+spec/enhancements-for-start-transaction-with-consistent
will always have the same values for both the cloned and the donor
transaction.

New server variables
--------------------

have_snapshot_cloning

  This is a server variable implemented to help other utilities detect
  if the server supports the FROM SESSION extention. When available, the
  snapshot cloning feature and the syntax extension to START TRANSACTION
  WITH CONSISTENT SNAPSHOT are supported by the server, and the variable
  value is always YES.

http://jenkins.percona.com/view/PS 5.6/job/percona-server-5.6-param/549/

=== modified file 'CMakeLists.txt'
=== modified file 'build-ps/debian/control'
--- build-ps/debian/control	2014-03-03 17:51:33 +0000
+++ build-ps/debian/control	2014-03-16 07:05:06 +0000
@@ -2,6 +2,7 @@
 Section: database
 Priority: extra
 Maintainer: Percona Server Development Team <[e-mail]>
+<<<<<<< TREE
 Uploaders: George Lorch <[e-mail]>,
            Alexey Bychko <[e-mail]>
 Build-Depends: libtool (>= 1.4.2-7),
@@ -26,6 +27,10 @@
                libaio-dev[linux-any],
                libpam-dev,
                libssl-dev
+=======
+Uploaders: Stewart Smith <[e-mail]>, Alexey Bychko <[e-mail]>
+Build-Depends: libtool (>= 1.4.2-7), procps,  debhelper (>= 7.0.50~), file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, psmisc, po-debconf, chrpath, ghostscript,  gawk, bison, lsb-release, cmake, gcc (>= 4.4), g++ (>= 4.4), libaio-dev[linux-any], libpam-dev, libssl-dev
+>>>>>>> MERGE-SOURCE
 Standards-Version: 3.9.4
 Homepage: http://www.percona.com/software/percona-server/
 Vcs-Bzr: lp:percona-server/5.6
@@ -141,6 +146,7 @@
 Package: percona-server-server-5.6
 Architecture: any
 Suggests: tinyca
+<<<<<<< TREE
 Pre-Depends: percona-server-common-5.6 (>= ${source:Version}),
              adduser (>= 3.4.0),
              debconf
@@ -176,6 +182,13 @@
           mariadb-server,
           mariadb-server-core-5.5,
           mariadb-server-5.5
+=======
+Pre-Depends: percona-server-common-5.6 (>= ${source:Version}), adduser (>= 3.4.0), debconf
+Depends: percona-server-client-5.6 (>= ${source:Version}), libdbi-perl, libdbd-mysql-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10)
+Conflicts: mysql-server, mysql-server-4.1, mysql-server-core-5.1, percona-xtradb-server-5.0, percona-server-server-5.1, percona-server-server-5.5
+Provides: mysql-server
+Replaces: mysql-server, mysql-server-5.0, mysql-server-core-5.1, percona-xtradb-server-5.0, percona-server-server-5.1, percona-server-server-5.5
+>>>>>>> MERGE-SOURCE
 Description: Percona Server database server binaries
  Percona Server is a fast, stable and true multi-user, multi-threaded SQL
  database server. SQL (Structured Query Language) is the most popular database
@@ -215,10 +228,14 @@
 
 Package: percona-server-test-5.6
 Architecture: any
+<<<<<<< TREE
 Depends: percona-server-client-5.6 (>= ${source:Version}),
          percona-server-server-5.6 (>= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
+=======
+Depends: percona-server-client-5.6 (>= ${source:Version}), percona-server-server-5.6 (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
+>>>>>>> MERGE-SOURCE
 Description: Percona Server database test suite
  Percona Server is a fast, stable and true multi-user, multi-threaded SQL
  database server. SQL (Structured Query Language) is the most popular database
 
=== modified file 'build-ps/debian/rules'
=== modified file 'build-ps/percona-server.spec'
=== modified file 'client/mysqldump.c'
--- client/mysqldump.c	2014-03-03 17:51:33 +0000
+++ client/mysqldump.c	2014-03-16 07:05:06 +0000
@@ -85,6 +85,9 @@
 #define IGNORE_DATA 0x01 /* don't dump data for this table */
 #define IGNORE_INSERT_DELAYED 0x02 /* table doesn't support INSERT DELAYED */
 
+/* Chars needed to store LONGLONG, excluding trailing '\0'. */
+#define LONGLONG_LEN 20
+
 typedef enum {
   KEY_TYPE_NONE,
   KEY_TYPE_PRIMARY,
@@ -418,9 +421,10 @@
    "This causes the binary log position and filename to be appended to the "
    "output. If equal to 1, will print it as a CHANGE MASTER command; if equal"
    " to 2, that command will be prefixed with a comment symbol. "
-   "This option will turn --lock-all-tables on, unless "
-   "--single-transaction is specified too (in which case a "
-   "global read lock is only taken a short time at the beginning of the dump; "
+   "This option will turn --lock-all-tables on, unless --single-transaction "
+   "is specified too (on servers that don't provide Binlog_snapshot_file and "
+   "Binlog_snapshot_position status variables this will still take a "
+   "global read lock for a short time at the beginning of the dump; "
    "don't forget to read about --single-transaction below). In all cases, "
    "any action on logs will happen at the exact moment of the dump. "
    "Option automatically turns --lock-tables off.",
@@ -1222,6 +1226,44 @@
 }
 
 
+/*
+  Check if server supports non-blocking binlog position using the
+  binlog_snapshot_file and binlog_snapshot_position status variables. If it
+  does, also return the position obtained if output pointers are non-NULL.
+  Returns 1 if position available, 0 if not.
+*/
+static int
+check_consistent_binlog_pos(char *binlog_pos_file, char *binlog_pos_offset)
+{
+  MYSQL_RES *res;
+  MYSQL_ROW row;
+  int found;
+
+  if (mysql_query_with_error_report(mysql, &res,
+                                    "SHOW STATUS LIKE 'binlog_snapshot_%'"))
+    return 1;
+
+  found= 0;
+  while ((row= mysql_fetch_row(res)))
+  {
+    if (0 == strcmp(row[0], "Binlog_snapshot_file"))
+    {
+      if (binlog_pos_file)
+        strmake(binlog_pos_file, row[1], FN_REFLEN-1);
+      found++;
+    }
+    else if (0 == strcmp(row[0], "Binlog_snapshot_position"))
+    {
+      if (binlog_pos_offset)
+        strmake(binlog_pos_offset, row[1], LONGLONG_LEN);
+      found++;
+    }
+  }
+  mysql_free_result(res);
+
+  return (found == 2);
+}
+
 static char *my_case_str(const char *str,
                          uint str_len,
                          const char *token,
@@ -5296,41 +5338,64 @@
 } /* dump_selected_tables */
 
 
-static int do_show_master_status(MYSQL *mysql_con)
+static int do_show_master_status(MYSQL *mysql_con, int consistent_binlog_pos)
 {
   MYSQL_ROW row;
   MYSQL_RES *master;
+  char binlog_pos_file[FN_REFLEN];
+  char binlog_pos_offset[LONGLONG_LEN+1];
+  char *file, *offset;
   const char *comment_prefix=
     (opt_master_data == MYSQL_OPT_MASTER_DATA_COMMENTED_SQL) ? "-- " : "";
-  if (mysql_query_with_error_report(mysql_con, &master, "SHOW MASTER STATUS"))
+
+  if (consistent_binlog_pos)
   {
-    return 1;
+    if (!check_consistent_binlog_pos(binlog_pos_file, binlog_pos_offset))
+      return 1;
+
+    file= binlog_pos_file;
+    offset= binlog_pos_offset;
   }
   else
   {
+    if (mysql_query_with_error_report(mysql_con, &master, "SHOW MASTER STATUS"))
+      return 1;
+
     row= mysql_fetch_row(master);
     if (row && row[0] && row[1])
     {
-      /* SHOW MASTER STATUS reports file and position */
-      print_comment(md_result_file, 0,
-                    "\n--\n-- Position to start replication or point-in-time "
-                    "recovery from\n--\n\n");
-      fprintf(md_result_file,
-              "%sCHANGE MASTER TO MASTER_LOG_FILE='%s', MASTER_LOG_POS=%s;\n",
-              comment_prefix, row[0], row[1]);
-      check_io(md_result_file);
+      file= row[0];
+      offset= row[1];
     }
-    else if (!ignore_errors)
+    else
     {
-      /* SHOW MASTER STATUS reports nothing and --force is not enabled */
-      my_printf_error(0, "Error: Binlogging on server not active",
-                      MYF(0));
       mysql_free_result(master);
-      maybe_exit(EX_MYSQLERR);
-      return 1;
+      if (!ignore_errors)
+      {
+        /* SHOW MASTER STATUS reports nothing and --force is not enabled */
+        my_printf_error(0, "Error: Binlogging on server not active", MYF(0));
+        maybe_exit(EX_MYSQLERR);
+        return 1;
+      }
+      else
+      {
+        return 0;
+      }
     }
+  }
+
+  /* SHOW MASTER STATUS reports file and position */
+  print_comment(md_result_file, 0,
+                "\n--\n-- Position to start replication or point-in-time "
+                "recovery from\n--\n\n");
+  fprintf(md_result_file,
+          "%sCHANGE MASTER TO MASTER_LOG_FILE='%s', MASTER_LOG_POS=%s;\n",
+          comment_prefix, file, offset);
+  check_io(md_result_file);
+
+  if (!consistent_binlog_pos)
     mysql_free_result(master);
-  }
+
   return 0;
 }
 
@@ -6289,6 +6354,7 @@
 {
   char bin_log_name[FN_REFLEN];
   int exit_code;
+  int consistent_binlog_pos= 0;
   MY_INIT("mysqldump");
 
   compatible_mode_normal_str[0]= 0;
@@ -6337,6 +6403,7 @@
   if (opt_slave_data && do_stop_slave_sql(mysql))
     goto err;
 
+<<<<<<< TREE
   if ((opt_lock_all_tables || opt_master_data ||
        (opt_single_transaction && flush_logs)))
   {
@@ -6344,6 +6411,24 @@
       goto err;
   }
   else if (opt_lock_for_backup && do_lock_tables_for_backup(mysql))
+=======
+  if (opt_single_transaction && opt_master_data)
+  {
+    /*
+       See if we can avoid FLUSH TABLES WITH READ LOCK with Binlog_snapshot_*
+       variables.
+    */
+    consistent_binlog_pos= check_consistent_binlog_pos(NULL, NULL);
+  }
+
+  if ((opt_lock_all_tables || (opt_master_data && !consistent_binlog_pos) ||
+       (opt_single_transaction && flush_logs)))
+  {
+    if (do_flush_tables_read_lock(mysql))
+      goto err;
+  }
+  else if (opt_lock_for_backup && do_lock_tables_for_backup(mysql))
+>>>>>>> MERGE-SOURCE
     goto err;
 
   /*
@@ -6384,7 +6469,7 @@
     goto err;
 
 
-  if (opt_master_data && do_show_master_status(mysql))
+  if (opt_master_data && do_show_master_status(mysql, consistent_binlog_pos))
     goto err;
   if (opt_slave_data && do_show_slave_status(mysql))
     goto err;
 
=== modified file 'doc/source/index.rst'
=== modified file 'doc/source/upstream-bug-fixes.rst'
--- doc/source/upstream-bug-fixes.rst	2014-03-10 15:05:00 +0000
+++ doc/source/upstream-bug-fixes.rst	2014-03-16 07:05:06 +0000
@@ -5,6 +5,7 @@
 =============================================================
 
 +-------------------------------------------------------------------------------------------------------------+
+<<<<<<< TREE
 |:Upstream bug: :mysqlbug:`71988` - page_cleaner: aggressive background flushing                              |
 |:Launchpad bug: :bug:`1238039`                                                                               |
 |:Upstream state: Verified (checked on 2014-03-10)                                                            |
@@ -65,6 +66,14 @@
 |:Fix Released: :rn:`5.6.15-63.0`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
+=======
+|:Upstream bug: :mysqlbug:`71217` - Threadpool - add thd_wait_begin/thd_wait_end to the network IO functions  |
+|:Launchpad bug: :bug:`1159743`                                                                               |
+|:Upstream state: Open (checked on 2014-02-05)                                                                |
+|:Fix Released: :rn:`5.6.15-63.0`                                                                             |
+|:Upstream fix: N/A                                                                                           |
++-------------------------------------------------------------------------------------------------------------+
+>>>>>>> MERGE-SOURCE
 |:Upstream bug: :mysqlbug:`41975` - Support for SSL options not included in mysqlbinlog                       |
 |:Launchpad bug: :bug:`1258154`                                                                               |
 |:Upstream state: Closed                                                                                      |
@@ -75,12 +84,21 @@
 |:Launchpad bug: :bug:`1258154`                                                                               |
 |:Upstream state: Closed                                                                                      |
 |:Fix Released: :rn:`5.6.15-63.0`                                                                             |
+<<<<<<< TREE
 |:Upstream fix: 5.6.12                                                                                        |
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`71411` - buf_flush_LRU() does not return correct number in case of compressed pages|
 |:Launchpad bug: :bug:`1231918`                                                                               |
 |:Upstream state: Verified (checked on 2014-03-07)                                                            |
 |:Fix Released: :rn:`5.6.13-61.0`                                                                             |
+=======
+|:Upstream fix: 5.6.12                                                                                        |
++-------------------------------------------------------------------------------------------------------------+
+|:Upstream bug: :mysqlbug:`71411` - buf_flush_LRU() does not return correct number in case of compressed pages|
+|:Launchpad bug: :bug:`1231918`                                                                               |
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+|:Fix Released: :rn:`5.6.13-61.0`                                                                             |
+>>>>>>> MERGE-SOURCE
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`70417` - rw_lock_x_lock_func_nowait() calls os_thread_get_curr_id() mostly ...     |
@@ -91,7 +109,11 @@
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`70490` - Suppression is too strict on some systems                                 |
 |:Launchpad bug: :bug:`1205196`                                                                               |
+<<<<<<< TREE
 |:Upstream state: No Feedback (checked on 2014-03-07)                                                         |
+=======
+|:Upstream state: No Feedback (checked on 2014-02-05)                                                         |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.13-61.0`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
@@ -103,7 +125,11 @@
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`70500` - Page cleaner should perform LRU flushing regardless of server activity    |
 |:Launchpad bug: :bug:`1234562`                                                                               |
+<<<<<<< TREE
 |:Upstream state: Open (checked on 2014-03-07)                                                                |
+=======
+|:Upstream state: Open (checked on 2014-02-05)                                                                |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.13-61.0`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
@@ -121,31 +147,51 @@
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`68481` - InnoDB LRU flushing for MySQL 5.6 needs work                              |
 |:Launchpad bug: :bug:`1232406`                                                                               |
+<<<<<<< TREE
 |:Upstream state: Verified (checked on 2014-03-07)                                                            |
+=======
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.13-61.0`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`70453` - Add hard timeouts to page cleaner flushes                                 |
 |:Launchpad bug: :bug:`1232101`                                                                               |
+<<<<<<< TREE
 |:Upstream state: Verified (checked on 2014-03-07)                                                            |
+=======
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.13-61.0`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`69170` - buf_flush_LRU is lazy                                                     |
 |:Launchpad bug: :bug:`1231918`                                                                               |
+<<<<<<< TREE
 |:Upstream state: Verified (checked on 2014-03-07)                                                            |
+=======
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.13-61.0`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`68555` - thread convoys from log_checkpoint_margin with innodb_buffer_pool_inst... |
 |:Launchpad bug: :bug:`1236884`                                                                               |
+<<<<<<< TREE
 |:Upstream state: Verified (checked on 2014-03-07)                                                            |
+=======
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.13-61.0`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`70228` - Is buf_LRU_free_page() really supposed to make non-zip block sticky at ...|
 |:Launchpad bug: :bug:`1220544`                                                                               |
+<<<<<<< TREE
 |:Upstream state: Verified (checked on 2014-03-07)                                                            |
+=======
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.13-60.6`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
@@ -163,13 +209,21 @@
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`70216` - Unnecessary overhead from persistent adaptive hash index latches          |
 |:Launchpad bug: :bug:`1218347`                                                                               |
+<<<<<<< TREE
 |:Upstream state: Verified (checked on 2014-03-07)                                                            |
+=======
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.13-60.6`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`62018` - innodb adaptive hash index mutex contention                               |
 |:Launchpad bug: :bug:`1216804`                                                                               |
+<<<<<<< TREE
 |:Upstream state: Verified (checked on 2014-03-07)                                                            |
+=======
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.13-60.6`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
@@ -187,13 +241,21 @@
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`42415` - UPDATE/DELETE with LIMIT clause unsafe for SBL even with ORDER BY PK ...  |
 |:Launchpad bug: :bug:`1132194`                                                                               |
+<<<<<<< TREE
 |:Upstream state: Verified (checked on 2014-03-07)                                                            |
+=======
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.13-60.5`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`69639` - mysql failed to build with dtrace Sun D 1.11                              |
 |:Launchpad bug: :bug:`1196460`                                                                               |
+<<<<<<< TREE
 |:Upstream state: Open (checked on 2014-03-07)                                                                |
+=======
+|:Upstream state: Open (checked on 2014-02-05)                                                                |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.13-60.5`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
@@ -211,10 +273,15 @@
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`69856` - mysql_install_db does not function properly in 5.6 for debug builds       |
 |:Launchpad bug: :bug:`1179359`                                                                               |
+<<<<<<< TREE
 |:Upstream state: Verified (checked on 2014-03-07)                                                            |
+=======
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.12-60.4`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
+<<<<<<< TREE
 |:Upstream bug: :mysqlbug:`71603` - file name is not escaped in binlog for LOAD DATA INFILE statement         |
 |:Launchpad bug: :bug:`1277351`                                                                               |
 |:Upstream state: N/A                                                                                         |
@@ -227,6 +294,14 @@
 |:Fix Released: :rn:`5.6.11-60.3`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
+=======
+|:Upstream bug: :mysqlbug:`71183` - os_file_fsync() should handle fsync() returning EINTR                     |
+|:Launchpad bug: :bug:`1262651`                                                                               |
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+|:Fix Released: :rn:`5.6.11-60.3`                                                                             |
+|:Upstream fix: N/A                                                                                           |
++-------------------------------------------------------------------------------------------------------------+
+>>>>>>> MERGE-SOURCE
 |:Upstream bug: :mysqlbug:`63451` - atomic/x86-gcc.h:make_atomic_cas_body64 potential miscompilation bug      |
 |:Launchpad bug: :bug:`878022`                                                                                |
 |:Upstream state: Closed                                                                                      |
@@ -241,7 +316,11 @@
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`69252` - All the parts.partition_max* tests are broken with MTR --parallel         |
 |:Launchpad bug: :bug:`1180481`                                                                               |
+<<<<<<< TREE
 |:Upstream state: Verified (checked on 2014-03-07)                                                            |
+=======
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.11-60.3`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
@@ -253,7 +332,11 @@
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`68714` - Remove literal statement digest values from perfschema tests              |
 |:Launchpad bug: :bug:`1157078`                                                                               |
+<<<<<<< TREE
 |:Upstream state: Verified (checked on 2014-03-07)                                                            |
+=======
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.11-60.3`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
@@ -277,13 +360,21 @@
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`68970` - fsp_reserve_free_extents switches from small to big tblspace handling ... |
 |:Launchpad bug: :bug:`1169494`                                                                               |
+<<<<<<< TREE
 |:Upstream state: Verified (checked on 2014-03-07)                                                            |
+=======
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.11-60.3`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`68713` - create_duplicate_weedout_tmp_table() leaves key_part_flag uninitialized   |
 |:Launchpad bug: :bug:`1157037`                                                                               |
+<<<<<<< TREE
 |:Upstream state: Verified (checked on 2014-03-07)                                                            |
+=======
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.11-60.3`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
@@ -295,13 +386,21 @@
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`68999` - SSL_OP_NO_COMPRESSION not defined                                         |
 |:Launchpad bug: :bug:`1183610`                                                                               |
+<<<<<<< TREE
 |:Upstream state: No Feedback (checked on 2014-03-07)                                                         |
+=======
+|:Upstream state: No Feedback (checked on 2014-02-05)                                                         |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.11-60.3`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`68845` - Unnecessary log_sys->mutex reacquisition in mtr_log_reserve_and_write()   |
 |:Launchpad bug: :bug:`1163439`                                                                               |
+<<<<<<< TREE
 |:Upstream state: Verified (checked on 2014-03-07)                                                            |
+=======
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.11-60.3`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
@@ -331,7 +430,11 @@
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`68476` - Suboptimal code in my_strnxfrm_simple()                                   |
 |:Launchpad bug: :bug:`1132350`                                                                               |
+<<<<<<< TREE
 |:Upstream state: Verified (checked on 2014-03-07)                                                            |
+=======
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.11-60.3`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
@@ -385,13 +488,21 @@
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`61180` - korr/store macros in my_global.h assume the argument to be a char pointer |
 |:Launchpad bug: :bug:`1042517`                                                                               |
+<<<<<<< TREE
 |:Upstream state: Closed                                                                                      |
+=======
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.11-60.3`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`61178` - Incorrect implementation of intersect(ulonglong) in non-optimized Bitmap..|
 |:Launchpad bug: :bug:`1042517`                                                                               |
+<<<<<<< TREE
 |:Upstream state: Verified (checked on 2014-03-07)                                                            |
+=======
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.11-60.3`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
@@ -403,7 +514,11 @@
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`64800` - mysqldump with --include-master-host-port putting quotes around port no.  | 
 |:Launchpad bug: :bug:`1013432`                                                                               |
+<<<<<<< TREE
 |:Upstream state: Verified (checked on 2014-03-07)                                                            |
+=======
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.11-60.3`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
@@ -433,13 +548,21 @@
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`25007` - memory tables with dynamic rows format                                    |
 |:Launchpad bug: N/A                                                                                          |
+<<<<<<< TREE
 |:Upstream state: Verified (checked on 2014-03-07)                                                            |
+=======
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.11-60.3`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`61595` - mysql-test/include/wait_for_slave_param.inc timeout logic is incorrect    |
 |:Launchpad bug: :bug:`800035`                                                                                |
+<<<<<<< TREE
 |:Upstream state: Verified (checked on 2014-03-07)                                                            |
+=======
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.11-60.3`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
@@ -451,7 +574,11 @@
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`68116` - InnoDB monitor may hit an assertion error in buf_page_get_gen in debug ...|
 |:Launchpad bug: :bug:`1100178`                                                                               |
+<<<<<<< TREE
 |:Upstream state: Verified (checked on 2014-03-07)                                                            |
+=======
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.10-60.2`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
@@ -463,13 +590,21 @@
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`20001` - Support for temp-tables in INFORMATION_SCHEMA                             |
 |:Launchpad bug: N/A                                                                                          |
+<<<<<<< TREE
 |:Upstream state: Verified (checked on 2014-03-07)                                                            |
+=======
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.5-60.0`                                                                              |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`69146` - Optimization in buf_pool_get_oldest_modification if srv_buf_pool_instances|
 |:Launchpad bug: :bug:`1176496`                                                                               |
+<<<<<<< TREE
 |:Upstream state: Open (checked on 2014-03-07)                                                                |
+=======
+|:Upstream state: Open (checked on 2014-02-05)                                                                |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.5-60.0`                                                                              |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
 
=== modified file 'mysql-test/r/backup_locks_mysqldump.result'
--- mysql-test/r/backup_locks_mysqldump.result	2014-02-27 12:29:47 +0000
+++ mysql-test/r/backup_locks_mysqldump.result	2014-03-16 07:05:06 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 SHOW VARIABLES LIKE 'have_backup_locks';
 Variable_name	Value
 have_backup_locks	YES
@@ -149,3 +150,148 @@
 SET GLOBAL log_output = @old_log_output;
 SET GLOBAL general_log = @old_general_log;
 DROP TABLE t1, t2;
+=======
+SHOW VARIABLES LIKE 'have_backup_locks';
+Variable_name	Value
+have_backup_locks	YES
+CREATE TABLE t1 (a INT) ENGINE=InnoDB;
+CREATE TABLE t2 (a INT) ENGINE=MyISAM;
+SET @old_general_log = @@general_log;
+SET @old_log_output = @@log_output;
+TRUNCATE TABLE mysql.general_log;
+SET GLOBAL log_output = 'TABLE';
+SET GLOBAL general_log = ON;
+# Check that --lock-for-backup is converted to --lock-all-tables if
+# --single-transaction is not specified
+SELECT argument FROM mysql.general_log WHERE argument != '';
+argument
+SET GLOBAL general_log = ON
+root@localhost on 
+/*!40100 SET @@SQL_MODE='' */
+/*!40103 SET TIME_ZONE='+00:00' */
+FLUSH TABLES
+FLUSH TABLES WITH READ LOCK
+SHOW VARIABLES LIKE 'gtid\_mode'
+SELECT LOGFILE_GROUP_NAME, FILE_NAME, TOTAL_EXTENTS, INITIAL_SIZE, ENGINE, EXTRA FROM INFORMATION_SCHEMA.FILES WHERE FILE_TYPE = 'UNDO LOG' AND FILE_NAME IS NOT NULL AND LOGFILE_GROUP_NAME IN (SELECT DISTINCT LOGFILE_GROUP_NAME FROM INFORMATION_SCHEMA.FILES WHERE FILE_TYPE = 'DATAFILE' AND TABLESPACE_NAME IN (SELECT DISTINCT TABLESPACE_NAME FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_SCHEMA IN ('test'))) GROUP BY LOGFILE_GROUP_NAME, FILE_NAME, ENGINE ORDER BY LOGFILE_GROUP_NAME
+SELECT DISTINCT TABLESPACE_NAME, FILE_NAME, LOGFILE_GROUP_NAME, EXTENT_SIZE, INITIAL_SIZE, ENGINE FROM INFORMATION_SCHEMA.FILES WHERE FILE_TYPE = 'DATAFILE' AND TABLESPACE_NAME IN (SELECT DISTINCT TABLESPACE_NAME FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_SCHEMA IN ('test')) ORDER BY TABLESPACE_NAME, LOGFILE_GROUP_NAME
+SHOW VARIABLES LIKE 'ndbinfo\_version'
+test
+show tables
+show table status like 't1'
+SET SQL_QUOTE_SHOW_CREATE=1
+SET SESSION character_set_results = 'binary'
+show create table `t1`
+SET SESSION character_set_results = 'utf8'
+show fields from `t1`
+SELECT /*!40001 SQL_NO_CACHE */ * FROM `t1`
+SET SESSION character_set_results = 'binary'
+use `test`
+select @@collation_database
+SHOW TRIGGERS LIKE 't1'
+SET SESSION character_set_results = 'utf8'
+show table status like 't2'
+SET SQL_QUOTE_SHOW_CREATE=1
+SET SESSION character_set_results = 'binary'
+show create table `t2`
+SET SESSION character_set_results = 'utf8'
+show fields from `t2`
+SELECT /*!40001 SQL_NO_CACHE */ * FROM `t2`
+SET SESSION character_set_results = 'binary'
+use `test`
+select @@collation_database
+SHOW TRIGGERS LIKE 't2'
+SET SESSION character_set_results = 'utf8'
+SELECT argument FROM mysql.general_log WHERE argument != ''
+TRUNCATE TABLE mysql.general_log;
+# Check that --lock-for-backup --single-transaction uses LOCK TABLES FOR
+# BACKUP
+SELECT argument FROM mysql.general_log WHERE argument != '';
+argument
+root@localhost on 
+/*!40100 SET @@SQL_MODE='' */
+/*!40103 SET TIME_ZONE='+00:00' */
+SHOW VARIABLES LIKE 'have_backup_locks'
+LOCK TABLES FOR BACKUP
+SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ
+START TRANSACTION /*!40100 WITH CONSISTENT SNAPSHOT */
+SHOW VARIABLES LIKE 'gtid\_mode'
+SELECT LOGFILE_GROUP_NAME, FILE_NAME, TOTAL_EXTENTS, INITIAL_SIZE, ENGINE, EXTRA FROM INFORMATION_SCHEMA.FILES WHERE FILE_TYPE = 'UNDO LOG' AND FILE_NAME IS NOT NULL AND LOGFILE_GROUP_NAME IN (SELECT DISTINCT LOGFILE_GROUP_NAME FROM INFORMATION_SCHEMA.FILES WHERE FILE_TYPE = 'DATAFILE' AND TABLESPACE_NAME IN (SELECT DISTINCT TABLESPACE_NAME FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_SCHEMA IN ('test'))) GROUP BY LOGFILE_GROUP_NAME, FILE_NAME, ENGINE ORDER BY LOGFILE_GROUP_NAME
+SELECT DISTINCT TABLESPACE_NAME, FILE_NAME, LOGFILE_GROUP_NAME, EXTENT_SIZE, INITIAL_SIZE, ENGINE FROM INFORMATION_SCHEMA.FILES WHERE FILE_TYPE = 'DATAFILE' AND TABLESPACE_NAME IN (SELECT DISTINCT TABLESPACE_NAME FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_SCHEMA IN ('test')) ORDER BY TABLESPACE_NAME, LOGFILE_GROUP_NAME
+SHOW VARIABLES LIKE 'ndbinfo\_version'
+test
+show tables
+show table status like 't1'
+SET SQL_QUOTE_SHOW_CREATE=1
+SET SESSION character_set_results = 'binary'
+show create table `t1`
+SET SESSION character_set_results = 'utf8'
+show fields from `t1`
+SELECT /*!40001 SQL_NO_CACHE */ * FROM `t1`
+SET SESSION character_set_results = 'binary'
+use `test`
+select @@collation_database
+SHOW TRIGGERS LIKE 't1'
+SET SESSION character_set_results = 'utf8'
+show table status like 't2'
+SET SQL_QUOTE_SHOW_CREATE=1
+SET SESSION character_set_results = 'binary'
+show create table `t2`
+SET SESSION character_set_results = 'utf8'
+show fields from `t2`
+SELECT /*!40001 SQL_NO_CACHE */ * FROM `t2`
+SET SESSION character_set_results = 'binary'
+use `test`
+select @@collation_database
+SHOW TRIGGERS LIKE 't2'
+SET SESSION character_set_results = 'utf8'
+SELECT argument FROM mysql.general_log WHERE argument != ''
+TRUNCATE TABLE mysql.general_log;
+# Check that --master-data does not disable --lock-for-backup
+SELECT argument FROM mysql.general_log WHERE argument != '';
+argument
+root@localhost on 
+/*!40100 SET @@SQL_MODE='' */
+/*!40103 SET TIME_ZONE='+00:00' */
+SHOW VARIABLES LIKE 'have_backup_locks'
+SHOW STATUS LIKE 'binlog_snapshot_%'
+LOCK TABLES FOR BACKUP
+SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ
+START TRANSACTION /*!40100 WITH CONSISTENT SNAPSHOT */
+SHOW VARIABLES LIKE 'gtid\_mode'
+SHOW STATUS LIKE 'binlog_snapshot_%'
+UNLOCK TABLES
+SELECT LOGFILE_GROUP_NAME, FILE_NAME, TOTAL_EXTENTS, INITIAL_SIZE, ENGINE, EXTRA FROM INFORMATION_SCHEMA.FILES WHERE FILE_TYPE = 'UNDO LOG' AND FILE_NAME IS NOT NULL AND LOGFILE_GROUP_NAME IN (SELECT DISTINCT LOGFILE_GROUP_NAME FROM INFORMATION_SCHEMA.FILES WHERE FILE_TYPE = 'DATAFILE' AND TABLESPACE_NAME IN (SELECT DISTINCT TABLESPACE_NAME FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_SCHEMA IN ('test'))) GROUP BY LOGFILE_GROUP_NAME, FILE_NAME, ENGINE ORDER BY LOGFILE_GROUP_NAME
+SELECT DISTINCT TABLESPACE_NAME, FILE_NAME, LOGFILE_GROUP_NAME, EXTENT_SIZE, INITIAL_SIZE, ENGINE FROM INFORMATION_SCHEMA.FILES WHERE FILE_TYPE = 'DATAFILE' AND TABLESPACE_NAME IN (SELECT DISTINCT TABLESPACE_NAME FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_SCHEMA IN ('test')) ORDER BY TABLESPACE_NAME, LOGFILE_GROUP_NAME
+SHOW VARIABLES LIKE 'ndbinfo\_version'
+test
+show tables
+show table status like 't1'
+SET SQL_QUOTE_SHOW_CREATE=1
+SET SESSION character_set_results = 'binary'
+show create table `t1`
+SET SESSION character_set_results = 'utf8'
+show fields from `t1`
+SELECT /*!40001 SQL_NO_CACHE */ * FROM `t1`
+SET SESSION character_set_results = 'binary'
+use `test`
+select @@collation_database
+SHOW TRIGGERS LIKE 't1'
+SET SESSION character_set_results = 'utf8'
+show table status like 't2'
+SET SQL_QUOTE_SHOW_CREATE=1
+SET SESSION character_set_results = 'binary'
+show create table `t2`
+SET SESSION character_set_results = 'utf8'
+show fields from `t2`
+SELECT /*!40001 SQL_NO_CACHE */ * FROM `t2`
+SET SESSION character_set_results = 'binary'
+use `test`
+select @@collation_database
+SHOW TRIGGERS LIKE 't2'
+SET SESSION character_set_results = 'utf8'
+SELECT argument FROM mysql.general_log WHERE argument != ''
+TRUNCATE TABLE mysql.general_log;
+SET GLOBAL log_output = @old_log_output;
+SET GLOBAL general_log = @old_general_log;
+DROP TABLE t1, t2;
+>>>>>>> MERGE-SOURCE
 
=== added file 'mysql-test/r/clone_consistent_snapshot.result'
--- mysql-test/r/clone_consistent_snapshot.result	1970-01-01 00:00:00 +0000
+++ mysql-test/r/clone_consistent_snapshot.result	2014-03-16 07:05:06 +0000
@@ -0,0 +1,145 @@
+# connection con1
+CREATE TABLE t1 (a INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES(1);
+START TRANSACTION WITH CONSISTENT SNAPSHOT;
+# connection con2
+INSERT INTO t1 VALUES(2);
+# connection con3
+SELECT * FROM t1;
+a
+1
+2
+# Basic syntax tests
+START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
+START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION CONNECTION_ID();
+ERROR HY000: Unknown thread id: ID
+START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION
+(SELECT MAX(a) FROM t1);
+ERROR 42000: This version of MySQL doesn't yet support 'Usage of subqueries or stored function calls as part of this statement'
+START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION (1,1);
+ERROR 21000: Operand should contain 1 column(s)
+START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION "foo";
+ERROR HY000: Unknown thread id: 0
+START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION NULL;
+ERROR HY000: Unknown thread id: 0
+# Functional tests
+START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION $con1_id;
+SELECT * FROM t1;
+a
+1
+# connection con2
+INSERT INTO t1 VALUES(3);
+SELECT * FROM t1;
+a
+1
+2
+3
+# connection con3
+SELECT * FROM t1;
+a
+1
+INSERT INTO t1 VALUES(4);
+SELECT * FROM t1;
+a
+1
+# connection con1
+INSERT INTO t1 VALUES(5);
+SELECT * FROM t1;
+a
+1
+5
+# connection con3
+SELECT * FROM t1;
+a
+1
+5
+# connection con1
+COMMIT;
+# Test cascading snapshot cloning
+# connection con2
+START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION $con3_id;
+SELECT * FROM t1;
+a
+1
+5
+COMMIT;
+SELECT * FROM t1;
+a
+1
+2
+3
+5
+# connection con3
+SELECT * FROM t1;
+a
+1
+5
+COMMIT;
+SELECT * FROM t1;
+a
+1
+2
+3
+4
+5
+# The following should fail to clone a read view as con1 does not have an
+# active transaction
+START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION $con1_id;
+Warnings:
+Warning	138	InnoDB: WITH CONSISTENT SNAPSHOT FROM SESSION was ignored because the target transaction has not been assigned a read view.
+# connection con1
+INSERT INTO t1 VALUES(6);
+# connection con3
+SELECT * FROM t1;
+a
+1
+2
+3
+4
+5
+6
+# connection con3
+COMMIT;
+# Now test cloning read view from a regular transaction
+# connection con1
+START TRANSACTION;
+INSERT INTO t1 VALUES(7);
+# connection con3
+# The following should fail to clone a read view as con1 does not yet have an
+# active transaction
+START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION $con1_id;
+Warnings:
+Warning	138	InnoDB: WITH CONSISTENT SNAPSHOT FROM SESSION was ignored because the target transaction has not been assigned a read view.
+SELECT * FROM t1;
+a
+1
+2
+3
+4
+5
+6
+# connection con1
+SELECT * FROM t1;
+a
+1
+2
+3
+4
+5
+6
+7
+INSERT INTO t1 VALUES(8);
+# connection con3
+START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION $con1_id;
+SELECT * FROM t1;
+a
+1
+2
+3
+4
+5
+6
+7
+8
+DROP TABLE t1;
 
=== modified file 'mysql-test/r/mysqldump-max.result'
--- mysql-test/r/mysqldump-max.result	2010-10-25 09:20:53 +0000
+++ mysql-test/r/mysqldump-max.result	2014-03-16 07:05:06 +0000
@@ -290,3 +290,60 @@
 DROP VIEW  v1;
 DROP TABLE t1;
 SET GLOBAL default_storage_engine=@old_engine;
+# Connection default
+SET binlog_format= mixed;
+RESET MASTER;
+CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1),(2);
+CREATE TABLE t2 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (1,0), (2,0);
+SELECT GET_LOCK("block_queries_1", 120);
+GET_LOCK("block_queries_1", 120)
+1
+# Connection c3
+SELECT GET_LOCK("block_queries_2", 120);
+GET_LOCK("block_queries_2", 120)
+1
+# Connection c1
+SET @c= 0;
+SELECT IF(@c<1, @c:=@c+1, GET_LOCK("block_queries_1", 120)) FROM t1 ORDER BY a;
+# Connection c2
+SET binlog_format="row";
+SET @d= 10;
+UPDATE t2 SET b=IF(@d<=10, @d:=@d+1, GET_LOCK("block_queries_2", 120)) ORDER BY a;
+# Connection default
+# Make sure other queries are running (and waiting).
+SELECT RELEASE_LOCK("block_queries_1");
+RELEASE_LOCK("block_queries_1")
+1
+# Connection c3
+SELECT RELEASE_LOCK("block_queries_2");
+RELEASE_LOCK("block_queries_2")
+1
+# Connection c1
+IF(@c<1, @c:=@c+1, GET_LOCK("block_queries_1", 120))
+1
+1
+# Connection c2
+# Connection default
+SELECT * FROM t2 ORDER BY a;
+a	b
+1	11
+2	1
+DROP TABLE t1;
+DROP TABLE t2;
+SHOW BINLOG EVENTS LIMIT 7,3;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	665	Query	1	773	use `test`; INSERT INTO t2 VALUES (1,0), (2,0)
+master-bin.000001	773	Xid	1	804	COMMIT /* XID */
+master-bin.000001	804	Query	1	876	BEGIN
+-- CHANGE MASTER TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=804;
+SELECT * FROM t1 ORDER BY a;
+a
+1
+2
+SELECT * FROM t2 ORDER BY a;
+a	b
+1	0
+2	0
+DROP TABLE t1,t2;
 
=== added file 'mysql-test/suite/binlog/r/binlog_consistent.result'
--- mysql-test/suite/binlog/r/binlog_consistent.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/binlog/r/binlog_consistent.result	2014-03-16 07:05:06 +0000
@@ -0,0 +1,178 @@
+RESET MASTER;
+# Connection default
+CREATE TABLE t1 (a INT, b VARCHAR(100), PRIMARY KEY (a,b)) ENGINE=innodb;
+SHOW MASTER STATUS;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB	Executed_Gtid_Set
+master-bin.000001	266			
+SHOW STATUS LIKE 'binlog_snapshot_%';
+Variable_name	Value
+Binlog_snapshot_file	master-bin.000001
+Binlog_snapshot_position	266
+BEGIN;
+INSERT INTO t1 VALUES (0, "");
+# Connection con1
+BEGIN;
+INSERT INTO t1 VALUES (1, "");
+# Connection con2
+CREATE TABLE t2 (a INT PRIMARY KEY) ENGINE=myisam;
+BEGIN;
+INSERT INTO t1 VALUES (2, "first");
+INSERT INTO t2 VALUES (2);
+INSERT INTO t1 VALUES (2, "second");
+# Connection default
+COMMIT;
+SET TRANSACTION ISOLATION LEVEL REPEATABLE READ;
+START TRANSACTION WITH CONSISTENT SNAPSHOT;
+# Connection con3
+BEGIN;
+INSERT INTO t1 VALUES (3, "");
+INSERT INTO t2 VALUES (3);
+# Connection con4
+BEGIN;
+INSERT INTO t1 VALUES (4, "");
+COMMIT;
+# Connection default
+SELECT * FROM t1 ORDER BY a,b;
+a	b
+0	
+SHOW STATUS LIKE 'binlog_snapshot_%';
+Variable_name	Value
+Binlog_snapshot_file	master-bin.000001
+Binlog_snapshot_position	860
+SHOW MASTER STATUS;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB	Executed_Gtid_Set
+master-bin.000001	1331			
+SELECT * FROM t2 ORDER BY a;
+a
+2
+3
+# Connection con1
+COMMIT;
+# Connection con2
+COMMIT;
+# Connection con3
+COMMIT;
+FLUSH LOGS;
+# Connection default
+SELECT * FROM t1 ORDER BY a,b;
+a	b
+0	
+SHOW STATUS LIKE 'binlog_snapshot_%';
+Variable_name	Value
+Binlog_snapshot_file	master-bin.000001
+Binlog_snapshot_position	860
+SHOW MASTER STATUS;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB	Executed_Gtid_Set
+master-bin.000002	120			
+COMMIT;
+SHOW STATUS LIKE 'binlog_snapshot_%';
+Variable_name	Value
+Binlog_snapshot_file	master-bin.000002
+Binlog_snapshot_position	120
+SHOW MASTER STATUS;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB	Executed_Gtid_Set
+master-bin.000002	120			
+# Test START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION
+DELETE FROM t1;
+START TRANSACTION WITH CONSISTENT SNAPSHOT;
+SHOW STATUS LIKE 'binlog_snapshot_%';
+Variable_name	Value
+Binlog_snapshot_file	master-bin.000002
+Binlog_snapshot_position	318
+SHOW MASTER STATUS;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB	Executed_Gtid_Set
+master-bin.000002	318			
+INSERT INTO t1 VALUES (1, "first");
+SELECT * FROM t1;
+a	b
+1	first
+# Connection con3
+INSERT INTO t1 VALUES (3, "third");
+SELECT * FROM t1;
+a	b
+3	third
+SHOW STATUS LIKE 'binlog_snapshot_%';
+Variable_name	Value
+Binlog_snapshot_file	master-bin.000002
+Binlog_snapshot_position	536
+SHOW MASTER STATUS;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB	Executed_Gtid_Set
+master-bin.000002	536			
+# Connection con2
+SELECT * FROM t1;
+a	b
+3	third
+SHOW STATUS LIKE 'binlog_snapshot_%';
+Variable_name	Value
+Binlog_snapshot_file	master-bin.000002
+Binlog_snapshot_position	536
+SHOW MASTER STATUS;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB	Executed_Gtid_Set
+master-bin.000002	536			
+START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION $donor_id;
+SELECT * FROM t1;
+a	b
+1	first
+SHOW STATUS LIKE 'binlog_snapshot_%';
+Variable_name	Value
+Binlog_snapshot_file	master-bin.000002
+Binlog_snapshot_position	318
+SHOW MASTER STATUS;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB	Executed_Gtid_Set
+master-bin.000002	536			
+# Connection con3
+FLUSH LOGS;
+SHOW STATUS LIKE 'binlog_snapshot_%';
+Variable_name	Value
+Binlog_snapshot_file	master-bin.000003
+Binlog_snapshot_position	120
+SHOW MASTER STATUS;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB	Executed_Gtid_Set
+master-bin.000003	120			
+# Connection con2
+SHOW STATUS LIKE 'binlog_snapshot_%';
+Variable_name	Value
+Binlog_snapshot_file	master-bin.000002
+Binlog_snapshot_position	318
+SHOW MASTER STATUS;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB	Executed_Gtid_Set
+master-bin.000003	120			
+COMMIT;
+# Connection default
+SHOW STATUS LIKE 'binlog_snapshot_%';
+Variable_name	Value
+Binlog_snapshot_file	master-bin.000002
+Binlog_snapshot_position	318
+SHOW MASTER STATUS;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB	Executed_Gtid_Set
+master-bin.000003	120			
+COMMIT;
+SHOW BINLOG EVENTS;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	4	Format_desc	1	120	Server ver: #, Binlog ver: #
+master-bin.000001	120	Query	1	266	use `test`; CREATE TABLE t1 (a INT, b VARCHAR(100), PRIMARY KEY (a,b)) ENGINE=innodb
+master-bin.000001	266	Query	1	389	use `test`; CREATE TABLE t2 (a INT PRIMARY KEY) ENGINE=myisam
+master-bin.000001	389	Query	1	468	BEGIN
+master-bin.000001	468	Query	1	567	use `test`; INSERT INTO t2 VALUES (2)
+master-bin.000001	567	Query	1	647	COMMIT
+master-bin.000001	647	Query	1	726	BEGIN
+master-bin.000001	726	Query	1	829	use `test`; INSERT INTO t1 VALUES (0, "")
+master-bin.000001	829	Xid	1	860	COMMIT /* XID */
+master-bin.000001	860	Query	1	939	BEGIN
+master-bin.000001	939	Query	1	1038	use `test`; INSERT INTO t2 VALUES (3)
+master-bin.000001	1038	Query	1	1118	COMMIT
+master-bin.000001	1118	Query	1	1197	BEGIN
+master-bin.000001	1197	Query	1	1300	use `test`; INSERT INTO t1 VALUES (4, "")
+master-bin.000001	1300	Xid	1	1331	COMMIT /* XID */
+master-bin.000001	1331	Query	1	1410	BEGIN
+master-bin.000001	1410	Query	1	1513	use `test`; INSERT INTO t1 VALUES (1, "")
+master-bin.000001	1513	Xid	1	1544	COMMIT /* XID */
+master-bin.000001	1544	Query	1	1623	BEGIN
+master-bin.000001	1623	Query	1	1731	use `test`; INSERT INTO t1 VALUES (2, "first")
+master-bin.000001	1731	Query	1	1840	use `test`; INSERT INTO t1 VALUES (2, "second")
+master-bin.000001	1840	Xid	1	1871	COMMIT /* XID */
+master-bin.000001	1871	Query	1	1950	BEGIN
+master-bin.000001	1950	Query	1	2053	use `test`; INSERT INTO t1 VALUES (3, "")
+master-bin.000001	2053	Xid	1	2084	COMMIT /* XID */
+master-bin.000001	2084	Rotate	1	2132	master-bin.000002;pos=4
+DROP TABLE t1,t2;
 
=== added file 'mysql-test/suite/binlog/t/binlog_consistent.test'
--- mysql-test/suite/binlog/t/binlog_consistent.test	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/binlog/t/binlog_consistent.test	2014-03-16 07:05:06 +0000
@@ -0,0 +1,144 @@
+--source include/have_innodb.inc
+--source include/have_log_bin.inc
+--source include/have_binlog_format_mixed_or_statement.inc
+
+RESET MASTER;
+
+# Test that we get the correct binlog position from START TRANSACTION WITH
+# CONSISTENT SNAPSHOT even when other transactions are active.
+
+connect(con1,localhost,root,,);
+connect(con2,localhost,root,,);
+connect(con3,localhost,root,,);
+connect(con4,localhost,root,,);
+
+connection default;
+--echo # Connection default
+
+CREATE TABLE t1 (a INT, b VARCHAR(100), PRIMARY KEY (a,b)) ENGINE=innodb;
+SHOW MASTER STATUS;
+SHOW STATUS LIKE 'binlog_snapshot_%';
+BEGIN;
+INSERT INTO t1 VALUES (0, "");
+
+connection con1;
+--echo # Connection con1
+BEGIN;
+INSERT INTO t1 VALUES (1, "");
+
+connection con2;
+--echo # Connection con2
+CREATE TABLE t2 (a INT PRIMARY KEY) ENGINE=myisam;
+BEGIN;
+INSERT INTO t1 VALUES (2, "first");
+INSERT INTO t2 VALUES (2);
+INSERT INTO t1 VALUES (2, "second");
+
+connection default;
+--echo # Connection default
+COMMIT;
+
+SET TRANSACTION ISOLATION LEVEL REPEATABLE READ;
+START TRANSACTION WITH CONSISTENT SNAPSHOT;
+
+connection con3;
+--echo # Connection con3
+BEGIN;
+INSERT INTO t1 VALUES (3, "");
+INSERT INTO t2 VALUES (3);
+
+connection con4;
+--echo # Connection con4
+BEGIN;
+INSERT INTO t1 VALUES (4, "");
+COMMIT;
+
+connection default;
+--echo # Connection default
+SELECT * FROM t1 ORDER BY a,b;
+SHOW STATUS LIKE 'binlog_snapshot_%';
+SHOW MASTER STATUS;
+SELECT * FROM t2 ORDER BY a;
+
+connection con1;
+--echo # Connection con1
+COMMIT;
+
+connection con2;
+--echo # Connection con2
+COMMIT;
+
+connection con3;
+--echo # Connection con3
+COMMIT;
+FLUSH LOGS;
+
+connection default;
+--echo # Connection default
+SELECT * FROM t1 ORDER BY a,b;
+SHOW STATUS LIKE 'binlog_snapshot_%';
+SHOW MASTER STATUS;
+COMMIT;
+SHOW STATUS LIKE 'binlog_snapshot_%';
+SHOW MASTER STATUS;
+
+--echo # Test START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION
+
+DELETE FROM t1;
+
+--let $donor_id=`SELECT CONNECTION_ID()`
+
+START TRANSACTION WITH CONSISTENT SNAPSHOT;
+SHOW STATUS LIKE 'binlog_snapshot_%';
+SHOW MASTER STATUS;
+
+INSERT INTO t1 VALUES (1, "first");
+SELECT * FROM t1;
+
+--connection con3
+--echo # Connection con3
+INSERT INTO t1 VALUES (3, "third");
+SELECT * FROM t1;
+SHOW STATUS LIKE 'binlog_snapshot_%';
+SHOW MASTER STATUS;
+
+--connection con2
+--echo # Connection con2
+SELECT * FROM t1;
+
+SHOW STATUS LIKE 'binlog_snapshot_%';
+SHOW MASTER STATUS;
+
+--disable_query_log
+--eval START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION $donor_id
+--echo START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION \$donor_id;
+--enable_query_log
+SELECT * FROM t1;
+
+SHOW STATUS LIKE 'binlog_snapshot_%';
+SHOW MASTER STATUS;
+
+--connection con3
+--echo # Connection con3
+FLUSH LOGS;
+SHOW STATUS LIKE 'binlog_snapshot_%';
+SHOW MASTER STATUS;
+
+--connection con2
+--echo # Connection con2
+SHOW STATUS LIKE 'binlog_snapshot_%';
+SHOW MASTER STATUS;
+
+COMMIT;
+
+--connection default
+--echo # Connection default
+SHOW STATUS LIKE 'binlog_snapshot_%';
+SHOW MASTER STATUS;
+
+COMMIT;
+
+--replace_regex /\/\* xid=.* \*\//\/* XID *\// /Server ver: .*, Binlog ver: .*/Server ver: #, Binlog ver: #/ /table_id: [0-9]+/table_id: #/
+SHOW BINLOG EVENTS;
+
+DROP TABLE t1,t2;
 
=== modified file 'mysql-test/suite/perfschema/r/dml_setup_instruments.result'
--- mysql-test/suite/perfschema/r/dml_setup_instruments.result	2013-12-05 17:23:10 +0000
+++ mysql-test/suite/perfschema/r/dml_setup_instruments.result	2014-03-16 07:05:06 +0000
@@ -23,12 +23,12 @@
 wait/synch/rwlock/sql/Binlog_storage_delegate::lock	YES	YES
 wait/synch/rwlock/sql/Binlog_transmit_delegate::lock	YES	YES
 wait/synch/rwlock/sql/gtid_commit_rollback	YES	YES
+wait/synch/rwlock/sql/LOCK_consistent_snapshot	YES	YES
 wait/synch/rwlock/sql/LOCK_dboptions	YES	YES
 wait/synch/rwlock/sql/LOCK_grant	YES	YES
 wait/synch/rwlock/sql/LOCK_system_variables_hash	YES	YES
 wait/synch/rwlock/sql/LOCK_sys_init_connect	YES	YES
 wait/synch/rwlock/sql/LOCK_sys_init_slave	YES	YES
-wait/synch/rwlock/sql/LOGGER::LOCK_logger	YES	YES
 select * from performance_schema.setup_instruments
 where name like 'Wait/Synch/Cond/sql/%'
   and name not in (
 
=== added file 'mysql-test/suite/sys_vars/r/have_snapshot_cloning_basic.result'
--- mysql-test/suite/sys_vars/r/have_snapshot_cloning_basic.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/sys_vars/r/have_snapshot_cloning_basic.result	2014-03-16 07:05:06 +0000
@@ -0,0 +1,11 @@
+SELECT @@GLOBAL.have_snapshot_cloning="YES";
+@@GLOBAL.have_snapshot_cloning="YES"
+1
+SELECT @@SESSION.have_snapshot_cloning;
+ERROR HY000: Variable 'have_snapshot_cloning' is a GLOBAL variable
+SHOW GLOBAL VARIABLES LIKE 'have_snapshot_cloning';
+Variable_name	Value
+have_snapshot_cloning	YES
+SHOW SESSION VARIABLES LIKE 'have_snapshot_cloning';
+Variable_name	Value
+have_snapshot_cloning	YES
 
=== added file 'mysql-test/suite/sys_vars/t/have_snapshot_cloning_basic.test'
--- mysql-test/suite/sys_vars/t/have_snapshot_cloning_basic.test	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/sys_vars/t/have_snapshot_cloning_basic.test	2014-03-16 07:05:06 +0000
@@ -0,0 +1,7 @@
+SELECT @@GLOBAL.have_snapshot_cloning="YES";
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT @@SESSION.have_snapshot_cloning;
+
+SHOW GLOBAL VARIABLES LIKE 'have_snapshot_cloning';
+
+SHOW SESSION VARIABLES LIKE 'have_snapshot_cloning';
 
=== modified file 'mysql-test/t/backup_locks_mysqldump.test'
--- mysql-test/t/backup_locks_mysqldump.test	2014-02-25 07:30:22 +0000
+++ mysql-test/t/backup_locks_mysqldump.test	2014-03-16 07:05:06 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 ########################################################################
 # mysqldump --lock-for-backup tests
 ########################################################################
@@ -56,3 +57,63 @@
 SET GLOBAL general_log = @old_general_log;
 
 DROP TABLE t1, t2;
+=======
+########################################################################
+# mysqldump --lock-for-backup tests
+########################################################################
+
+--source include/have_log_bin.inc
+--source include/have_innodb.inc
+--source include/not_embedded.inc
+
+SHOW VARIABLES LIKE 'have_backup_locks';
+
+CREATE TABLE t1 (a INT) ENGINE=InnoDB;
+CREATE TABLE t2 (a INT) ENGINE=MyISAM;
+
+SET @old_general_log = @@general_log;
+SET @old_log_output = @@log_output;
+
+TRUNCATE TABLE mysql.general_log;
+
+SET GLOBAL log_output = 'TABLE';
+SET GLOBAL general_log = ON;
+
+--let $file=$MYSQLTEST_VARDIR/tmp/dump.sql
+
+--error 1
+--exec $MYSQL_DUMP --lock-for-backup --lock-all-tables >$file
+
+--echo # Check that --lock-for-backup is converted to --lock-all-tables if
+--echo # --single-transaction is not specified
+
+--exec $MYSQL_DUMP --lock-for-backup test >$file
+
+SELECT argument FROM mysql.general_log WHERE argument != '';
+
+TRUNCATE TABLE mysql.general_log;
+
+--echo # Check that --lock-for-backup --single-transaction uses LOCK TABLES FOR
+--echo # BACKUP
+
+--exec $MYSQL_DUMP --lock-for-backup --single-transaction test >$file
+
+SELECT argument FROM mysql.general_log WHERE argument != '';
+
+TRUNCATE TABLE mysql.general_log;
+
+--echo # Check that --master-data does not disable --lock-for-backup
+
+--exec $MYSQL_DUMP --lock-for-backup --single-transaction --master-data test >$file
+
+SELECT argument FROM mysql.general_log WHERE argument != '';
+
+TRUNCATE TABLE mysql.general_log;
+
+--remove_file $file
+
+SET GLOBAL log_output = @old_log_output;
+SET GLOBAL general_log = @old_general_log;
+
+DROP TABLE t1, t2;
+>>>>>>> MERGE-SOURCE
 
=== added file 'mysql-test/t/clone_consistent_snapshot.test'
--- mysql-test/t/clone_consistent_snapshot.test	1970-01-01 00:00:00 +0000
+++ mysql-test/t/clone_consistent_snapshot.test	2014-03-16 07:05:06 +0000
@@ -0,0 +1,167 @@
+########################################################################
+# Tests for START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION
+########################################################################
+
+--source include/have_innodb.inc
+--source include/count_sessions.inc
+
+--connect (con1,localhost,root,,)
+--connect (con2,localhost,root,,)
+--connect (con3,localhost,root,,)
+
+--connection con1
+--echo # connection con1
+
+--let $con1_id=`SELECT CONNECTION_ID()`
+CREATE TABLE t1 (a INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES(1);
+START TRANSACTION WITH CONSISTENT SNAPSHOT;
+
+--connection con2
+--echo # connection con2
+
+INSERT INTO t1 VALUES(2);
+
+--connection con3
+--echo # connection con3
+
+SELECT * FROM t1;
+
+--echo # Basic syntax tests
+
+--error ER_PARSE_ERROR
+START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION;
+--replace_regex /id: [0-9]+/id: ID/
+--error ER_NO_SUCH_THREAD
+START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION CONNECTION_ID();
+--error ER_NOT_SUPPORTED_YET
+START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION
+      (SELECT MAX(a) FROM t1);
+--error ER_OPERAND_COLUMNS
+START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION (1,1);
+--error ER_NO_SUCH_THREAD
+START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION "foo";
+--error ER_NO_SUCH_THREAD
+START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION NULL;
+
+--echo # Functional tests
+--disable_query_log
+--echo START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION \$con1_id;
+--eval START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION $con1_id
+--enable_query_log
+SELECT * FROM t1;
+
+--connection con2
+--echo # connection con2
+
+INSERT INTO t1 VALUES(3);
+SELECT * FROM t1;
+
+--connection con3
+--echo # connection con3
+
+SELECT * FROM t1;
+INSERT INTO t1 VALUES(4);
+SELECT * FROM t1;
+
+--connection con1
+--echo # connection con1
+
+INSERT INTO t1 VALUES(5);
+SELECT * FROM t1;
+
+--connection con3
+--echo # connection con3
+
+--let $con3_id=`SELECT CONNECTION_ID()`
+
+SELECT * FROM t1;
+
+--connection con1
+--echo # connection con1
+
+COMMIT;
+
+--echo # Test cascading snapshot cloning
+--connection con2
+--echo # connection con2
+--disable_query_log
+--echo START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION \$con3_id;
+--eval START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION $con3_id
+--enable_query_log
+
+SELECT * FROM t1;
+
+COMMIT;
+
+SELECT * FROM t1;
+
+--connection con3
+--echo # connection con3
+
+SELECT * FROM t1;
+
+COMMIT;
+
+SELECT * FROM t1;
+
+--echo # The following should fail to clone a read view as con1 does not have an
+--echo # active transaction
+--disable_query_log
+--echo START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION \$con1_id;
+--eval START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION $con1_id
+--enable_query_log
+
+--connection con1
+--echo # connection con1
+
+INSERT INTO t1 VALUES(6);
+
+--connection con3
+--echo # connection con3
+SELECT * FROM t1;
+
+--connection con3
+--echo # connection con3
+
+COMMIT;
+
+--echo # Now test cloning read view from a regular transaction
+
+--connection con1
+--echo # connection con1
+
+START TRANSACTION;
+INSERT INTO t1 VALUES(7);
+
+--connection con3
+--echo # connection con3
+--echo # The following should fail to clone a read view as con1 does not yet have an
+--echo # active transaction
+--disable_query_log
+--echo START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION \$con1_id;
+--eval START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION $con1_id
+--enable_query_log
+SELECT * FROM t1;
+
+--connection con1
+--echo # connection con1
+SELECT * FROM t1;
+INSERT INTO t1 VALUES(8);
+
+--connection con3
+--echo # connection con3
+--disable_query_log
+--echo START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION \$con1_id;
+--eval START TRANSACTION WITH CONSISTENT SNAPSHOT FROM SESSION $con1_id
+--enable_query_log
+SELECT * FROM t1;
+
+--connection default
+--disconnect con1
+--disconnect con2
+--disconnect con3
+
+DROP TABLE t1;
+
+--source include/wait_until_count_sessions.inc
 
=== modified file 'mysql-test/t/mysqldump-max.test'
--- mysql-test/t/mysqldump-max.test	2010-10-25 09:20:53 +0000
+++ mysql-test/t/mysqldump-max.test	2014-03-16 07:05:06 +0000
@@ -2,6 +2,7 @@
 --source include/not_embedded.inc
 --source include/have_innodb.inc
 --source include/have_archive.inc
+--source include/have_log_bin.inc
 
 --disable_warnings
 drop table if exists t1, t2, t3, t4, t5, t6;
@@ -1124,3 +1125,85 @@
 DROP TABLE t1;
 
 SET GLOBAL default_storage_engine=@old_engine;
+
+# Test fully non-locking mysqldump with consistent binlog position (MWL#136).
+
+connect(c1,127.0.0.1,root,,test,$MASTER_MYPORT,);
+connect(c2,127.0.0.1,root,,test,$MASTER_MYPORT,);
+connect(c3,127.0.0.1,root,,test,$MASTER_MYPORT,);
+
+connection default;
+--echo # Connection default
+SET binlog_format= mixed;
+RESET MASTER;
+CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1),(2);
+CREATE TABLE t2 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (1,0), (2,0);
+SELECT GET_LOCK("block_queries_1", 120);
+
+connection c3;
+--echo # Connection c3
+SELECT GET_LOCK("block_queries_2", 120);
+
+# Start two queries that will be running on the tables during mysqldump
+connection c1;
+--echo # Connection c1
+SET @c= 0;
+send SELECT IF(@c<1, @c:=@c+1, GET_LOCK("block_queries_1", 120)) FROM t1 ORDER BY a;
+
+connection c2;
+--echo # Connection c2
+SET binlog_format="row";
+SET @d= 10;
+send UPDATE t2 SET b=IF(@d<=10, @d:=@d+1, GET_LOCK("block_queries_2", 120)) ORDER BY a;
+
+connection default;
+--echo # Connection default
+--echo # Make sure other queries are running (and waiting).
+let $wait_condition=
+  SELECT COUNT(*) FROM information_schema.processlist
+   WHERE state = "User lock" AND info LIKE 'SELECT%block_queries_1%';
+--source include/wait_condition.inc
+let $wait_condition=
+  SELECT COUNT(*) FROM information_schema.processlist
+   WHERE state = "User lock" AND info LIKE 'UPDATE%block_queries_2%';
+--source include/wait_condition.inc
+
+--exec $MYSQL_DUMP --master-data=2 --single-transaction test t1 t2 > $MYSQLTEST_VARDIR/tmp/mwl136.sql
+
+SELECT RELEASE_LOCK("block_queries_1");
+
+connection c3;
+--echo # Connection c3
+SELECT RELEASE_LOCK("block_queries_2");
+
+connection c1;
+--echo # Connection c1
+reap;
+
+connection c2;
+--echo # Connection c2
+reap;
+
+connection default;
+--echo # Connection default
+SELECT * FROM t2 ORDER BY a;
+DROP TABLE t1;
+DROP TABLE t2;
+--exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/mwl136.sql
+
+--replace_regex /\/\* xid=.* \*\//\/* XID *\// /Server ver: .*, Binlog ver: .*/Server ver: #, Binlog ver: #/ /table_id: [0-9]+/table_id: #/
+SHOW BINLOG EVENTS LIMIT 7,3;
+
+--perl
+my $f= "$ENV{MYSQLTEST_VARDIR}/tmp/mwl136.sql";
+open F, '<', $f or die "Failed to open $f: $!\n";
+while (<F>) {
+   print if /CHANGE MASTER TO/;
+}
+EOF
+SELECT * FROM t1 ORDER BY a;
+SELECT * FROM t2 ORDER BY a;
+
+DROP TABLE t1,t2;
 
=== modified file 'sql/binlog.cc'
--- sql/binlog.cc	2014-02-27 12:29:47 +0000
+++ sql/binlog.cc	2014-03-16 07:05:06 +0000
@@ -79,7 +79,21 @@
 static int binlog_commit(handlerton *hton, THD *thd, bool all);
 static int binlog_rollback(handlerton *hton, THD *thd, bool all);
 static int binlog_prepare(handlerton *hton, THD *thd, bool all);
-
+static int binlog_start_consistent_snapshot(handlerton *hton, THD *thd);
+static int binlog_clone_consistent_snapshot(handlerton *hton, THD *thd,
+                                            THD *from_thd);
+
+static char binlog_snapshot_file[FN_REFLEN];
+static ulonglong binlog_snapshot_position;
+
+static SHOW_VAR binlog_status_vars_detail[]=
+{
+  {"snapshot_file",
+    (char *)&binlog_snapshot_file, SHOW_CHAR},
+  {"snapshot_position",
+   (char *)&binlog_snapshot_position, SHOW_LONGLONG},
+  {NullS, NullS, SHOW_LONG}
+};
 
 /**
   Helper class to hold a mutex for the duration of the
@@ -768,6 +782,8 @@
   binlog_stmt_cache_data stmt_cache;
   binlog_trx_cache_data trx_cache;
 
+  LOG_INFO binlog_info;
+
 private:
 
   binlog_cache_mngr& operator=(const binlog_cache_mngr& info);
@@ -894,6 +910,8 @@
   binlog_hton->commit= binlog_commit;
   binlog_hton->rollback= binlog_rollback;
   binlog_hton->prepare= binlog_prepare;
+  binlog_hton->start_consistent_snapshot= binlog_start_consistent_snapshot;
+  binlog_hton->clone_consistent_snapshot= binlog_clone_consistent_snapshot;
   binlog_hton->flags= HTON_NOT_USER_SELECTABLE | HTON_HIDDEN;
   return 0;
 }
@@ -1305,6 +1323,76 @@
   return 0;
 }
 
+static int binlog_start_consistent_snapshot(handlerton *hton, THD *thd)
+{
+  int err= 0;
+  LOG_INFO li;
+  DBUG_ENTER("binlog_start_consistent_snapshot");
+
+  if ((err= thd->binlog_setup_trx_data()))
+    DBUG_RETURN(err);
+
+  binlog_cache_mngr * const cache_mngr= thd_get_cache_mngr(thd);
+
+  /* Server layer calls us with LOCK_log locked, so this is safe. */
+  mysql_bin_log.raw_get_current_log(&cache_mngr->binlog_info);
+
+  trans_register_ha(thd, TRUE, hton);
+
+  DBUG_RETURN(err);
+}
+
+static int binlog_clone_consistent_snapshot(handlerton *hton, THD *thd,
+                                            THD *from_thd)
+{
+  binlog_cache_mngr *from_cache_mngr;
+  binlog_cache_mngr *cache_mngr;
+  int err= 0;
+  char log_file_name[FN_REFLEN];
+  my_off_t pos;
+
+  DBUG_ENTER("binlog_start_consistent_snapshot");
+
+  from_cache_mngr= opt_bin_log ?
+    (binlog_cache_mngr *) thd_get_cache_mngr(from_thd) : NULL;
+
+  if (from_cache_mngr == NULL)
+  {
+    push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
+                        HA_ERR_UNSUPPORTED,
+                        "WITH CONSISTENT SNAPSHOT FROM SESSION was ignored for "
+                        "binary log, because the specified session does not "
+                        "have a consistent snapshot of binary log "
+                        "coordinates.");
+    DBUG_RETURN(0);
+  }
+
+  if ((err= thd->binlog_setup_trx_data()))
+    DBUG_RETURN(err);
+
+  cache_mngr= thd_get_cache_mngr(thd);
+
+  mysql_mutex_lock(&from_cache_mngr->binlog_info.lock);
+
+  pos= from_cache_mngr->binlog_info.pos;
+  strmake(log_file_name, from_cache_mngr->binlog_info.log_file_name,
+          sizeof(log_file_name) - 1);
+
+  mysql_mutex_unlock(&from_cache_mngr->binlog_info.lock);
+
+  mysql_mutex_lock(&cache_mngr->binlog_info.lock);
+
+  cache_mngr->binlog_info.pos = pos;
+  strmake(cache_mngr->binlog_info.log_file_name, log_file_name,
+          sizeof(cache_mngr->binlog_info.log_file_name) - 1);
+
+  mysql_mutex_unlock(&cache_mngr->binlog_info.lock);
+
+  trans_register_ha(thd, TRUE, hton);
+
+  DBUG_RETURN(err);
+}
+
 /**
   This function is called once after each statement.
 
@@ -1547,8 +1635,22 @@
     rollback.
    */
   if (thd->lex->sql_command != SQLCOM_ROLLBACK_TO_SAVEPOINT)
+  {
+    /*
+      Reset binlog_snapshot_% variables for the current connection so that the
+      current coordinates are shown after committing a consistent snapshot
+      transaction.
+    */
+    if (cache_mngr != NULL)
+    {
+      mysql_mutex_lock(&cache_mngr->binlog_info.lock);
+      cache_mngr->binlog_info.log_file_name[0]= '\0';
+      mysql_mutex_unlock(&cache_mngr->binlog_info.lock);
+    }
+
     if ((error= ha_rollback_low(thd, all)))
       goto end;
+  }
 
   /*
     If there is no cache manager, or if there is nothing in the
@@ -2416,7 +2518,7 @@
    is_relay_log(0), signal_cnt(0),
    checksum_alg_reset(BINLOG_CHECKSUM_ALG_UNDEF),
    relay_log_checksum_alg(BINLOG_CHECKSUM_ALG_UNDEF),
-   previous_gtid_set(0)
+   previous_gtid_set(0), snapshot_lock_acquired(false)
 {
   /*
     We don't want to initialize locks here as such initialization depends on
@@ -6293,6 +6395,18 @@
     DBUG_RETURN(RESULT_SUCCESS);
   }
 
+  /*
+    Reset binlog_snapshot_% variables for the current connection so that the
+    current coordinates are shown after committing a consistent snapshot
+    transaction.
+  */
+  if (all)
+  {
+    mysql_mutex_lock(&cache_mngr->binlog_info.lock);
+    cache_mngr->binlog_info.log_file_name[0]= '\0';
+    mysql_mutex_unlock(&cache_mngr->binlog_info.lock);
+  }
+
   THD_TRANS *trans= all ? &thd->transaction.all : &thd->transaction.stmt;
 
   DBUG_PRINT("debug", ("in_transaction: %s, no_2pc: %s, rw_ha_count: %d",
@@ -6790,9 +6904,22 @@
     /*
       storage engine commit
     */
-    if (thd->commit_error == THD::CE_NONE &&
-        ha_commit_low(thd, all, false))
-      thd->commit_error= THD::CE_COMMIT_ERROR;
+    if (thd->commit_error == THD::CE_NONE)
+    {
+      /*
+        Acquire a shared lock to block commits until START TRANSACTION WITH
+        CONSISTENT SNAPSHOT completes snapshot creation for all storage
+        engines. We only reach this code if binlog_order_commits=0.
+      */
+      DBUG_ASSERT(opt_binlog_order_commits == 0);
+
+      slock();
+
+      if (ha_commit_low(thd, all, false))
+        thd->commit_error= THD::CE_COMMIT_ERROR;
+
+      sunlock();
+    }
     /*
       Decrement the prepared XID counter after storage engine commit
     */
@@ -7171,6 +7298,99 @@
   return 1;
 }
 
+/*
+  Copy out the non-directory part of binlog position filename for the
+  `binlog_snapshot_file' status variable, same way as it is done for
+  SHOW MASTER STATUS.
+*/
+static void set_binlog_snapshot_file(const char *src)
+{
+  int dir_len = dirname_length(src);
+  strmake(binlog_snapshot_file, src + dir_len,
+          sizeof(binlog_snapshot_file) - 1);
+}
+
+/*
+  Copy out current values of status variables, for SHOW STATUS or
+  information_schema.global_status.
+
+  This is called only under LOCK_status, so we can fill in a static array.
+*/
+void MYSQL_BIN_LOG::set_status_variables(THD *thd)
+{
+  binlog_cache_mngr *cache_mngr;
+
+  if (thd && opt_bin_log)
+    cache_mngr= (binlog_cache_mngr*) thd_get_ha_data(thd, binlog_hton);
+  else
+    cache_mngr= 0;
+
+  bool have_snapshot= (cache_mngr &&
+                       cache_mngr->binlog_info.log_file_name[0] != '\0');
+  mysql_mutex_lock(&LOCK_log);
+  if (!have_snapshot)
+  {
+    set_binlog_snapshot_file(log_file_name);
+    binlog_snapshot_position= my_b_tell(&log_file);
+  }
+  mysql_mutex_unlock(&LOCK_log);
+
+  if (have_snapshot)
+  {
+    set_binlog_snapshot_file(cache_mngr->binlog_info.log_file_name);
+    binlog_snapshot_position= cache_mngr->binlog_info.pos;
+  }
+}
+
+
+void MYSQL_BIN_LOG::xlock(void)
+{
+  DBUG_ASSERT(!snapshot_lock_acquired);
+
+  mysql_mutex_lock(&LOCK_log);
+
+  /*
+    We must ensure that no writes to binlog and no commits to storage engines
+    occur after function is called for START TRANSACTION FOR CONSISTENT
+    SNAPSHOT. With binlog_order_commits=1 (the default) flushing to binlog is
+    performed under the LOCK_log mutex and commits are done under the
+    LOCK_commit mutex, both in the stage leader thread. So acquiring those 2
+    mutexes is sufficient to guarantee atomicity.
+
+    With binlog_order_commits=0 commits are performed in parallel by separate
+    threads with each acquiring a shared lock on LOCK_consistent_snapshot.
+
+    binlog_order_commits is a dynamic variable, so we have to keep track what
+    primitives should be used in unlock_for_snapshot().
+  */
+  if (opt_binlog_order_commits)
+  {
+    mysql_mutex_lock(&LOCK_commit);
+  }
+  else
+  {
+    snapshot_lock_acquired= true;
+    mysql_rwlock_wrlock(&LOCK_consistent_snapshot);
+  }
+}
+
+
+void MYSQL_BIN_LOG::xunlock(void)
+{
+  if (!snapshot_lock_acquired)
+  {
+    mysql_mutex_unlock(&LOCK_commit);
+  }
+  else
+  {
+    mysql_rwlock_unlock(&LOCK_consistent_snapshot);
+    snapshot_lock_acquired= false;
+  }
+
+  mysql_mutex_unlock(&LOCK_log);
+}
+
+
 Group_cache *THD::get_group_cache(bool is_transactional)
 {
   DBUG_ENTER("THD::get_group_cache(bool)");
@@ -9022,6 +9242,25 @@
 
 #endif /* !defined(MYSQL_CLIENT) */
 
+static int show_binlog_vars(THD *thd, SHOW_VAR *var, char *buff)
+{
+  if (mysql_bin_log.is_open())
+    mysql_bin_log.set_status_variables(thd);
+  else
+  {
+    binlog_snapshot_file[0]= '\0';
+    binlog_snapshot_position= 0;
+  }
+  var->type= SHOW_ARRAY;
+  var->value= (char *)&binlog_status_vars_detail;
+  return 0;
+}
+
+static SHOW_VAR binlog_status_vars_top[]= {
+  {"Binlog", (char *) &show_binlog_vars, SHOW_FUNC},
+  {NullS, NullS, SHOW_LONG}
+};
+
 struct st_mysql_storage_engine binlog_storage_engine=
 { MYSQL_HANDLERTON_INTERFACE_VERSION };
 
@@ -9038,7 +9277,7 @@
   binlog_init, /* Plugin Init */
   NULL, /* Plugin Deinit */
   0x0100 /* 1.0 */,
-  NULL,                       /* status variables                */
+  binlog_status_vars_top,     /* status variables                */
   NULL,                       /* system variables                */
   NULL,                       /* config options                  */
   0,  
 
=== modified file 'sql/binlog.h'
--- sql/binlog.h	2014-02-17 11:12:40 +0000
+++ sql/binlog.h	2014-03-16 07:05:06 +0000
@@ -501,6 +501,8 @@
 private:
   Gtid_set* previous_gtid_set;
 
+  bool snapshot_lock_acquired;
+
   int open(const char *opt_name) { return open_binlog(opt_name); }
   bool change_stage(THD *thd, Stage_manager::StageID stage,
                     THD* queue, mysql_mutex_t *leave,
@@ -528,7 +530,15 @@
   void update_thd_next_event_pos(THD *thd);
   int flush_and_set_pending_rows_event(THD *thd, Rows_log_event* event,
                                        bool is_transactional);
-
+  void xlock(void);
+  void xunlock(void);
+  void slock(void) { mysql_rwlock_rdlock(&LOCK_consistent_snapshot); }
+  void sunlock(void) { mysql_rwlock_unlock(&LOCK_consistent_snapshot); }
+#else
+  void xlock(void) { }
+  void xunlock(void) { }
+  void slock(void) { }
+  void sunlock(void) { }
 #endif /* !defined(MYSQL_CLIENT) */
   void add_bytes_written(ulonglong inc)
   {
@@ -667,6 +677,7 @@
   inline char* get_log_fname() { return log_file_name; }
   inline char* get_name() { return name; }
   inline mysql_mutex_t* get_log_lock() { return &LOCK_log; }
+  inline mysql_mutex_t* get_commit_lock() { return &LOCK_commit; }
   inline mysql_cond_t* get_log_cond() { return &update_cond; }
   inline IO_CACHE* get_log_file() { return &log_file; }
 
@@ -674,6 +685,7 @@
   inline void unlock_index() { mysql_mutex_unlock(&LOCK_index);}
   inline IO_CACHE *get_index_file() { return &index_file;}
   inline uint32 get_open_count() { return open_count; }
+  void set_status_variables(THD *thd);
 };
 
 typedef struct st_load_file_info
 
=== modified file 'sql/handler.cc'
--- sql/handler.cc	2014-03-03 17:51:33 +0000
+++ sql/handler.cc	2014-03-16 07:05:06 +0000
@@ -40,6 +40,7 @@
 #include "debug_sync.h"         // DEBUG_SYNC
 #include <my_bit.h>
 #include <list>
+#include "global_threads.h"
 
 #ifdef WITH_PARTITION_STORAGE_ENGINE
 #include "ha_partition.h"
@@ -2252,8 +2253,95 @@
 }
 
 
-static my_bool snapshot_handlerton(THD *thd, plugin_ref plugin,
-                                   void *arg)
+static my_bool clone_snapshot_handlerton(THD *thd, plugin_ref plugin,
+                                         void *arg)
+{
+  handlerton *hton= plugin_data(plugin, handlerton *);
+
+  if (hton->state == SHOW_OPTION_YES &&
+      hton->clone_consistent_snapshot)
+    hton->clone_consistent_snapshot(hton, thd, (THD *) arg);
+
+  return FALSE;
+}
+
+
+static int ha_clone_consistent_snapshot(THD *thd)
+{
+  THD *from_thd;
+  ulong id;
+  Item *val;
+  Thread_iterator it;
+  Thread_iterator end;
+
+  DBUG_ASSERT(!thd->lex->value_list.is_empty());
+
+  val= (Item *) thd->lex->value_list.head();
+
+  if (thd->lex->table_or_sp_used())
+  {
+    my_error(ER_NOT_SUPPORTED_YET, MYF(0), "Usage of subqueries or stored "
+             "function calls as part of this statement");
+    goto error;
+  }
+
+  if ((!val->fixed && val->fix_fields(thd, &val)) || val->check_cols(1))
+  {
+    my_error(ER_SET_CONSTANTS_ONLY, MYF(0));
+    goto error;
+  }
+
+  id= val->val_int();
+
+  mysql_mutex_lock(&LOCK_thread_count);
+
+  it= global_thread_list_begin();
+  end= global_thread_list_end();
+  from_thd= NULL;
+
+  for (; it != end; ++it)
+  {
+    if ((*it)->thread_id == id && *it != thd)
+    {
+      from_thd= *it;
+      mysql_mutex_lock(&from_thd->LOCK_thd_data);
+      break;
+    }
+  }
+
+  mysql_mutex_unlock(&LOCK_thread_count);
+
+  if (!from_thd)
+  {
+    my_error(ER_NO_SUCH_THREAD, MYF(0), id);
+    goto error;
+  }
+
+  /*
+    Blocking commits and binlog updates ensures that we get the same snapshot
+    for all engines (including the binary log). This allows us among other
+    things to do backups with START TRANSACTION WITH CONSISTENT SNAPSHOT and
+    have a consistent binlog position.
+  */
+  tc_log->xlock();
+
+  plugin_foreach(thd, clone_snapshot_handlerton, MYSQL_STORAGE_ENGINE_PLUGIN,
+                 from_thd);
+
+  tc_log->xunlock();
+
+  mysql_mutex_unlock(&from_thd->LOCK_thd_data);
+
+  return 0;
+
+error:
+
+  return 1;
+}
+
+
+static my_bool start_snapshot_handlerton(THD *thd, plugin_ref plugin,
+                                         void *arg)
 {
   handlerton *hton= plugin_data(plugin, handlerton *);
   if (hton->state == SHOW_OPTION_YES &&
@@ -2267,9 +2355,24 @@
 
 int ha_start_consistent_snapshot(THD *thd)
 {
+
+  if (!thd->lex->value_list.is_empty())
+      return ha_clone_consistent_snapshot(thd);
+
   bool warn= true;
 
-  plugin_foreach(thd, snapshot_handlerton, MYSQL_STORAGE_ENGINE_PLUGIN, &warn);
+  /*
+    Blocking commits and binlog updates ensures that we get the same snapshot
+    for all engines (including the binary log). This allows us among other
+    things to do backups with START TRANSACTION WITH CONSISTENT SNAPSHOT and
+    have a consistent binlog position.
+  */
+  tc_log->xlock();
+
+  plugin_foreach(thd, start_snapshot_handlerton, MYSQL_STORAGE_ENGINE_PLUGIN,
+                 &warn);
+
+  tc_log->xunlock();
 
   /*
     Same idea as when one wants to CREATE TABLE in one engine which does not
 
=== modified file 'sql/handler.h'
--- sql/handler.h	2014-02-27 12:29:47 +0000
+++ sql/handler.h	2014-03-16 07:05:06 +0000
@@ -892,6 +892,7 @@
    void (*drop_database)(handlerton *hton, char* path);
    int (*panic)(handlerton *hton, enum ha_panic_function flag);
    int (*start_consistent_snapshot)(handlerton *hton, THD *thd);
+   int (*clone_consistent_snapshot)(handlerton *hton, THD *thd, THD *from_thd);
    bool (*flush_logs)(handlerton *hton);
    bool (*show_status)(handlerton *hton, THD *thd, stat_print_fn *print, enum ha_stat_type stat);
    uint (*partition_flags)();
 
=== modified file 'sql/log.cc'
--- sql/log.cc	2014-03-03 17:51:33 +0000
+++ sql/log.cc	2014-03-16 07:05:06 +0000
@@ -53,6 +53,7 @@
 #include "rpl_handler.h"
 #include "debug_sync.h"
 #include "sql_show.h"
+#include "mysqld.h"
 
 /* max size of the log message */
 #define MAX_LOG_BUFFER_SIZE 1024
@@ -2901,12 +2902,21 @@
   DBUG_ENTER("TC_LOG_MMAP::commit");
   unsigned long cookie= 0;
   my_xid xid= thd->transaction.xid_state.xid.get_my_xid();
+  int rc;
 
   if (all && xid)
     if (!(cookie= log_xid(thd, xid)))
       DBUG_RETURN(RESULT_ABORTED);    // Failed to log the transaction
 
-  if (ha_commit_low(thd, all))
+  /*
+    Acquire a shared lock to block commits until START TRANSACTION WITH
+    CONSISTENT SNAPSHOT completes snapshot creation for all storage engines.
+  */
+  slock();
+  rc= ha_commit_low(thd, all);
+  sunlock();
+
+  if (rc)
     DBUG_RETURN(RESULT_INCONSISTENT); // Transaction logged, but not committed
 
   /* If cookie is non-zero, something was logged */
 
=== modified file 'sql/log.h'
--- sql/log.h	2014-02-17 11:12:40 +0000
+++ sql/log.h	2014-03-16 07:05:06 +0000
@@ -102,6 +102,26 @@
      @return Error code on failure, zero on success.
    */
   virtual int prepare(THD *thd, bool all) = 0;
+
+  /**
+     Acquire an exclusive lock to block binary log updates and commits. This is
+     used by START TRANSACTION WITH CONSISTENT SNAPSHOT to create an atomic
+     snapshot.
+  */
+  virtual void xlock(void) = 0;
+
+  /** Release lock acquired with xlock(). */
+  virtual void xunlock(void) = 0;
+
+  /**
+     Acquire a shared lock to block commits. This is used when calling
+     ha_commit_low() to block commits if there's an exclusive lock acquired by
+     START TRANSACTION WITH CONSISTENT SNAPSHOT.
+  */
+  virtual void slock(void) = 0;
+
+  /** Release lock acquired with slock(). */
+  virtual void sunlock(void) = 0;
 };
 
 
@@ -120,6 +140,10 @@
   int prepare(THD *thd, bool all) {
     return ha_prepare_low(thd, all);
   }
+  void xlock(void) {}
+  void xunlock(void) {}
+  void slock(void) {}
+  void sunlock(void) {}
 };
 
 #ifdef HAVE_MMAP
@@ -166,6 +190,10 @@
   enum_result commit(THD *thd, bool all);
   int rollback(THD *thd, bool all)      { return ha_rollback_low(thd, all); }
   int prepare(THD *thd, bool all)       { return ha_prepare_low(thd, all); }
+  void xlock(void) { mysql_rwlock_wrlock(&LOCK_consistent_snapshot); }
+  void xunlock(void) { mysql_rwlock_unlock(&LOCK_consistent_snapshot); }
+  void slock(void) { mysql_rwlock_rdlock(&LOCK_consistent_snapshot); }
+  void sunlock(void) { mysql_rwlock_unlock(&LOCK_consistent_snapshot); }
   int recover();
   uint size() const;
 
 
=== modified file 'sql/log_event.cc'
=== modified file 'sql/log_event.h'
=== modified file 'sql/mdl.cc'
=== modified file 'sql/mysqld.cc'
--- sql/mysqld.cc	2014-02-27 12:29:47 +0000
+++ sql/mysqld.cc	2014-03-16 07:05:06 +0000
@@ -717,7 +717,12 @@
 SHOW_COMP_OPTION have_geometry, have_rtree_keys;
 SHOW_COMP_OPTION have_crypt, have_compress;
 SHOW_COMP_OPTION have_profiling;
-SHOW_COMP_OPTION have_backup_locks;
+<<<<<<< TREE
+SHOW_COMP_OPTION have_backup_locks;
+=======
+SHOW_COMP_OPTION have_backup_locks;
+SHOW_COMP_OPTION have_snapshot_cloning;
+>>>>>>> MERGE-SOURCE
 
 ulonglong opt_log_warnings_suppress= 0;
 
@@ -780,6 +785,8 @@
 mysql_mutex_t LOCK_server_started;
 mysql_cond_t COND_server_started;
 
+mysql_rwlock_t LOCK_consistent_snapshot;
+
 int mysqld_server_started= 0;
 
 File_parser_dummy_hook file_parser_dummy_hook;
@@ -2061,6 +2068,7 @@
   mysql_mutex_destroy(&LOCK_global_user_client_stats);
   mysql_mutex_destroy(&LOCK_global_table_stats);
   mysql_mutex_destroy(&LOCK_global_index_stats);
+  mysql_rwlock_destroy(&LOCK_consistent_snapshot);
 }
 #endif /*EMBEDDED_LIBRARY*/
 
@@ -4321,6 +4329,8 @@
   mysql_rwlock_init(key_rwlock_LOCK_sys_init_connect, &LOCK_sys_init_connect);
   mysql_rwlock_init(key_rwlock_LOCK_sys_init_slave, &LOCK_sys_init_slave);
   mysql_rwlock_init(key_rwlock_LOCK_grant, &LOCK_grant);
+  mysql_rwlock_init(key_rwlock_LOCK_consistent_snapshot,
+                    &LOCK_consistent_snapshot);
   mysql_cond_init(key_COND_thread_count, &COND_thread_count, NULL);
   mysql_cond_init(key_COND_thread_cache, &COND_thread_cache, NULL);
   mysql_cond_init(key_COND_flush_thread_cache, &COND_flush_thread_cache, NULL);
@@ -8540,8 +8550,14 @@
   shared_memory_base_name= default_shared_memory_base_name;
 #endif
 
-  have_backup_locks= SHOW_OPTION_YES;
-
+<<<<<<< TREE
+  have_backup_locks= SHOW_OPTION_YES;
+
+=======
+  have_backup_locks= SHOW_OPTION_YES;
+  have_snapshot_cloning= SHOW_OPTION_YES;
+
+>>>>>>> MERGE-SOURCE
 #if defined(__WIN__)
   /* Allow Win32 users to move MySQL anywhere */
   {
@@ -9720,13 +9736,13 @@
   { &key_LOCK_thread_count, "LOCK_thread_count", PSI_FLAG_GLOBAL},
   { &key_LOCK_log_throttle_qni, "LOCK_log_throttle_qni", PSI_FLAG_GLOBAL},
   { &key_gtid_ensure_index_mutex, "Gtid_state", PSI_FLAG_GLOBAL},
-  { &key_LOCK_thread_created, "LOCK_thread_created", PSI_FLAG_GLOBAL }
+  { &key_LOCK_thread_created, "LOCK_thread_created", PSI_FLAG_GLOBAL },
 };
 
 PSI_rwlock_key key_rwlock_LOCK_grant, key_rwlock_LOCK_logger,
   key_rwlock_LOCK_sys_init_connect, key_rwlock_LOCK_sys_init_slave,
   key_rwlock_LOCK_system_variables_hash, key_rwlock_query_cache_query_lock,
-  key_rwlock_global_sid_lock;
+  key_rwlock_global_sid_lock, key_rwlock_LOCK_consistent_snapshot;
 
 PSI_rwlock_key key_rwlock_Trans_delegate_lock;
 PSI_rwlock_key key_rwlock_Binlog_storage_delegate_lock;
@@ -9752,7 +9768,8 @@
   { &key_rwlock_query_cache_query_lock, "Query_cache_query::lock", 0},
   { &key_rwlock_global_sid_lock, "gtid_commit_rollback", PSI_FLAG_GLOBAL},
   { &key_rwlock_Trans_delegate_lock, "Trans_delegate::lock", PSI_FLAG_GLOBAL},
-  { &key_rwlock_Binlog_storage_delegate_lock, "Binlog_storage_delegate::lock", PSI_FLAG_GLOBAL}
+  { &key_rwlock_Binlog_storage_delegate_lock, "Binlog_storage_delegate::lock", PSI_FLAG_GLOBAL},
+  { &key_rwlock_LOCK_consistent_snapshot, "LOCK_consistent_snapshot", PSI_FLAG_GLOBAL}
 };
 
 #ifdef HAVE_MMAP
 
=== modified file 'sql/mysqld.h'
--- sql/mysqld.h	2014-03-03 17:51:33 +0000
+++ sql/mysqld.h	2014-03-16 07:05:06 +0000
@@ -386,7 +386,7 @@
 extern PSI_rwlock_key key_rwlock_LOCK_grant, key_rwlock_LOCK_logger,
   key_rwlock_LOCK_sys_init_connect, key_rwlock_LOCK_sys_init_slave,
   key_rwlock_LOCK_system_variables_hash, key_rwlock_query_cache_query_lock,
-  key_rwlock_global_sid_lock;
+  key_rwlock_global_sid_lock, key_rwlock_LOCK_consistent_snapshot;
 
 #ifdef HAVE_MMAP
 extern PSI_cond_key key_PAGE_cond, key_COND_active, key_COND_pool;
@@ -620,6 +620,7 @@
 extern mysql_cond_t COND_server_started;
 extern mysql_rwlock_t LOCK_grant, LOCK_sys_init_connect, LOCK_sys_init_slave;
 extern mysql_rwlock_t LOCK_system_variables_hash;
+extern mysql_rwlock_t LOCK_consistent_snapshot;
 extern mysql_cond_t COND_manager;
 extern int32 thread_running;
 extern my_atomic_rwlock_t thread_running_lock;
 
=== modified file 'sql/rpl_rli.cc'
=== modified file 'sql/set_var.h'
--- sql/set_var.h	2014-03-03 17:51:33 +0000
+++ sql/set_var.h	2014-03-16 07:05:06 +0000
@@ -344,7 +344,12 @@
 extern SHOW_COMP_OPTION have_crypt;
 extern SHOW_COMP_OPTION have_compress;
 extern SHOW_COMP_OPTION have_statement_timeout;
-extern SHOW_COMP_OPTION have_backup_locks;
+<<<<<<< TREE
+extern SHOW_COMP_OPTION have_backup_locks;
+=======
+extern SHOW_COMP_OPTION have_backup_locks;
+extern SHOW_COMP_OPTION have_snapshot_cloning;
+>>>>>>> MERGE-SOURCE
 
 /*
   Prototypes for helper functions
 
=== modified file 'sql/share/errmsg-utf8.txt'
--- sql/share/errmsg-utf8.txt	2014-02-27 12:29:47 +0000
+++ sql/share/errmsg-utf8.txt	2014-03-16 07:05:06 +0000
@@ -7088,6 +7088,7 @@
 ER_TEMP_FILE_WRITE_FAILURE
   eng "Temporary file write failure."
 
+<<<<<<< TREE
 ER_INNODB_FT_AUX_NOT_HEX_ID
   eng "Upgrade index name failed, please use create index(alter table) algorithm copy to rebuild index."
 
@@ -7104,6 +7105,12 @@
 	eng "Can’t execute the query because you have a conflicting backup lock"
 	rus "Запрос не может быть выполнен из-за конфликтующей блокировки резервного копирования"
 
+=======
+ER_CANT_EXECUTE_WITH_BACKUP_LOCK
+	eng "Can’t execute the query because you have a conflicting backup lock"
+	rus "Запрос не может быть выполнен из-за конфликтующей блокировки резервного копирования"
+
+>>>>>>> MERGE-SOURCE
 #
 #  End of 5.6 error messages.
 #
 
=== modified file 'sql/sql_yacc.yy'
--- sql/sql_yacc.yy	2014-02-25 07:30:22 +0000
+++ sql/sql_yacc.yy	2014-03-16 07:05:06 +0000
@@ -8149,6 +8149,12 @@
           {
             $$= MYSQL_START_TRANS_OPT_WITH_CONS_SNAPSHOT;
           }
+        | WITH CONSISTENT_SYM SNAPSHOT_SYM FROM SESSION_SYM expr
+          {
+            $$= MYSQL_START_TRANS_OPT_WITH_CONS_SNAPSHOT;
+            Lex->value_list.empty();
+            Lex->value_list.push_front($6);
+          }
         | READ_SYM ONLY_SYM
           {
             $$= MYSQL_START_TRANS_OPT_READ_ONLY;
 
=== modified file 'sql/sys_vars.cc'
--- sql/sys_vars.cc	2014-03-03 17:51:33 +0000
+++ sql/sys_vars.cc	2014-03-16 07:05:06 +0000
@@ -4017,10 +4017,21 @@
        READ_ONLY GLOBAL_VAR(have_profiling), NO_CMD_LINE, NO_MUTEX_GUARD,
        NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0), DEPRECATED(""));
 
-static Sys_var_have Sys_have_backup_locks(
-       "have_backup_locks", "have_backup_locks",
-       READ_ONLY GLOBAL_VAR(have_backup_locks), NO_CMD_LINE);
-
+<<<<<<< TREE
+static Sys_var_have Sys_have_backup_locks(
+       "have_backup_locks", "have_backup_locks",
+       READ_ONLY GLOBAL_VAR(have_backup_locks), NO_CMD_LINE);
+
+=======
+static Sys_var_have Sys_have_backup_locks(
+       "have_backup_locks", "have_backup_locks",
+       READ_ONLY GLOBAL_VAR(have_backup_locks), NO_CMD_LINE);
+
+static Sys_var_have Sys_have_snapshot_cloning(
+       "have_snapshot_cloning", "have_snapshot_cloning",
+       READ_ONLY GLOBAL_VAR(have_snapshot_cloning), NO_CMD_LINE);
+
+>>>>>>> MERGE-SOURCE
 static Sys_var_have Sys_have_query_cache(
        "have_query_cache", "have_query_cache",
        READ_ONLY GLOBAL_VAR(have_query_cache), NO_CMD_LINE);
 
=== modified file 'storage/federated/ha_federated.cc'
=== modified file 'storage/innobase/buf/buf0flu.cc'
--- storage/innobase/buf/buf0flu.cc	2014-02-17 11:12:40 +0000
+++ storage/innobase/buf/buf0flu.cc	2014-03-16 07:05:06 +0000
@@ -1371,10 +1371,17 @@
 
 		/* These fields are protected by the buf_page_get_mutex()
 		mutex. */
+<<<<<<< TREE
 		/* Read the fields directly in order to avoid asserting on
 		BUF_BLOCK_REMOVE_HASH pages. */
 		ulint	space = bpage->space;
 		ulint	offset = bpage->offset;
+=======
+		/* Read the fields directly in order to avoid asserting on
+		BUF_BLOCK_REMOVE_HASH pages. */
+		space = bpage->space;
+		offset = bpage->offset;
+>>>>>>> MERGE-SOURCE
 
 		if (flush_type == BUF_FLUSH_LRU) {
 			mutex_exit(block_mutex);
 
=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- storage/innobase/handler/ha_innodb.cc	2014-03-03 17:51:33 +0000
+++ storage/innobase/handler/ha_innodb.cc	2014-03-16 07:05:06 +0000
@@ -1148,6 +1148,22 @@
 	THD*		thd);		/* in: MySQL thread handle of the
 					user for whom the transaction should
 					be committed */
+/*****************************************************************//**
+Creates an InnoDB transaction struct for the thd if it does not yet have one.
+Starts a new InnoDB transaction if a transaction is not yet started. And
+clones snapshot for a consistent read from another session, if it has one.
+@return	0 */
+static
+int
+innobase_start_trx_and_clone_read_view(
+/*====================================*/
+	handlerton*	hton,		/* in: Innodb handlerton */
+	THD*		thd,		/* in: MySQL thread handle of the
+					user for whom the transaction should
+					be committed */
+	THD*		from_thd);	/* in: MySQL thread handle of the
+					user session from which the consistent
+					read should be cloned */
 /****************************************************************//**
 Flushes InnoDB logs to disk and makes a checkpoint. Really, a commit flushes
 the logs, and the name of this function should be innobase_checkpoint.
@@ -3166,6 +3182,8 @@
 
 	innobase_hton->start_consistent_snapshot =
 		innobase_start_trx_and_assign_read_view;
+	innobase_hton->clone_consistent_snapshot =
+		innobase_start_trx_and_clone_read_view;
 
 	innobase_hton->flush_logs = innobase_flush_logs;
 	innobase_hton->show_status = innobase_show_status;
@@ -3928,6 +3946,102 @@
 
 
 /*****************************************************************//**
+Creates an InnoDB transaction struct for the thd if it does not yet have one.
+Starts a new InnoDB transaction if a transaction is not yet started. And
+clones snapshot for a consistent read from another session, if it has one.
+@return	0 */
+static
+int
+innobase_start_trx_and_clone_read_view(
+/*====================================*/
+	handlerton*	hton,		/* in: Innodb handlerton */
+	THD*		thd,		/* in: MySQL thread handle of the
+					user for whom the transaction should
+					be committed */
+	THD*		from_thd)	/* in: MySQL thread handle of the
+					user session from which the consistent
+					read should be cloned */
+{
+	trx_t*	trx;
+	trx_t*	from_trx;
+
+	DBUG_ENTER("innobase_start_trx_and_clone_read_view");
+	DBUG_ASSERT(hton == innodb_hton_ptr);
+
+	/* Get transaction handle from the donor session */
+
+	from_trx = thd_to_trx(from_thd);
+
+	if (!from_trx) {
+		push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
+				    HA_ERR_UNSUPPORTED,
+				    "InnoDB: WITH CONSISTENT SNAPSHOT "
+				    "FROM SESSION was ignored because the "
+				    "specified session does not have an open "
+				    "transaction inside InnoDB.");
+
+		DBUG_RETURN(0);
+	}
+
+	/* Create a new trx struct for thd, if it does not yet have one */
+
+	trx = check_trx_exists(thd);
+
+	/* This is just to play safe: release a possible FIFO ticket and
+	search latch. Since we can potentially reserve the trx_sys->mutex,
+	we have to release the search system latch first to obey the latching
+	order. */
+
+	trx_search_latch_release_if_reserved(trx);
+
+	innobase_srv_conc_force_exit_innodb(trx);
+
+	/* If the transaction is not started yet, start it */
+
+	trx_start_if_not_started_xa(trx);
+
+	/* Clone the read view from the donor transaction.  Do this only if
+	transaction is using REPEATABLE READ isolation level. */
+	trx->isolation_level = innobase_map_isolation_level(
+		thd_get_trx_isolation(thd));
+
+	if (trx->isolation_level != TRX_ISO_REPEATABLE_READ) {
+
+		push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
+				    HA_ERR_UNSUPPORTED,
+				    "InnoDB: WITH CONSISTENT SNAPSHOT "
+				    "was ignored because this phrase "
+				    "can only be used with "
+				    "REPEATABLE READ isolation level.");
+	} else {
+
+		lock_mutex_enter();
+		mutex_enter(&trx_sys->mutex);
+		trx_mutex_enter(from_trx);
+
+		if (!trx_clone_read_view(trx, from_trx)) {
+
+			push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
+					    HA_ERR_UNSUPPORTED,
+					    "InnoDB: WITH CONSISTENT SNAPSHOT "
+					    "FROM SESSION was ignored because "
+					    "the target transaction has not been "
+					    "assigned a read view.");
+		}
+
+		trx_mutex_exit(from_trx);
+		mutex_exit(&trx_sys->mutex);
+		lock_mutex_exit();
+	}
+
+	/* Set the MySQL flag to mark that there is an active transaction */
+
+	innobase_register_trx(hton, current_thd, trx);
+
+	DBUG_RETURN(0);
+}
+
+/*****************************************************************//**
 Commits a transaction in an InnoDB database or marks an SQL statement
 ended.
 @return	0 */
 
=== modified file 'storage/innobase/include/read0read.h'
--- storage/innobase/include/read0read.h	2013-10-23 08:48:28 +0000
+++ storage/innobase/include/read0read.h	2014-03-16 07:05:06 +0000
@@ -50,6 +50,27 @@
 					NULL if a new one needs to be created */
 
 /*********************************************************************//**
+Clones a read view object. This function will allocate space for two read
+views contiguously, one identical in size and content as @param view (starting
+at returned pointer) and another view immediately following the trx_ids array.
+The second view will have space for an extra trx_id_t element.
+@return	read view struct */
+UNIV_INTERN
+read_view_t*
+read_view_clone(
+/*============*/
+	const read_view_t*	view,		/*!< in: view to clone */
+	read_view_t*&		prebuilt_clone);/*!< in,out: prebuilt view or
+						NULL */
+/*********************************************************************//**
+Insert the view in the proper order into the trx_sys->view_list. The
+read view list is ordered by read_view_t::low_limit_no in descending order. */
+UNIV_INTERN
+void
+read_view_add(
+/*==========*/
+	read_view_t*	view);		/*!< in: view to add to */
+/*********************************************************************//**
 Makes a copy of the oldest existing read view, or opens a new. The view
 must be closed with ..._close.
 @return	own: read view struct */
 
=== modified file 'storage/innobase/include/trx0trx.h'
--- storage/innobase/include/trx0trx.h	2014-02-17 11:12:40 +0000
+++ storage/innobase/include/trx0trx.h	2014-03-16 07:05:06 +0000
@@ -275,6 +275,16 @@
 trx_assign_read_view(
 /*=================*/
 	trx_t*	trx);	/*!< in: active transaction */
+/********************************************************************//**
+Clones the read view from another transaction. All the consistent reads within
+the receiver transaction will get the same read view as the donor transaction
+@return read view clone */
+UNIV_INTERN
+read_view_t*
+trx_clone_read_view(
+/*================*/
+	trx_t*	trx,		/*!< in: receiver transaction */
+	trx_t*	from_trx);	/*!< in: donor transaction */
 /****************************************************************//**
 Prepares a transaction for commit/rollback. */
 UNIV_INTERN
 
=== modified file 'storage/innobase/read/read0read.cc'
--- storage/innobase/read/read0read.cc	2013-10-23 08:48:28 +0000
+++ storage/innobase/read/read0read.cc	2014-03-16 07:05:06 +0000
@@ -221,7 +221,7 @@
 at returned pointer) and another view immediately following the trx_ids array.
 The second view will have space for an extra trx_id_t element.
 @return	read view struct */
-UNIV_INLINE
+UNIV_INTERN
 read_view_t*
 read_view_clone(
 /*============*/
@@ -256,7 +256,7 @@
 /*********************************************************************//**
 Insert the view in the proper order into the trx_sys->view_list. The
 read view list is ordered by read_view_t::low_limit_no in descending order. */
-static
+UNIV_INTERN
 void
 read_view_add(
 /*==========*/
 
=== modified file 'storage/innobase/trx/trx0trx.cc'
--- storage/innobase/trx/trx0trx.cc	2014-02-17 11:12:40 +0000
+++ storage/innobase/trx/trx0trx.cc	2014-03-16 07:05:06 +0000
@@ -1692,6 +1692,38 @@
 	return(trx->read_view);
 }
 
+/********************************************************************//**
+Clones the read view from another transaction. All consistent reads within
+the receiver transaction will get the same read view as the donor transaction
+@return read view clone */
+UNIV_INTERN
+read_view_t*
+trx_clone_read_view(
+/*================*/
+	trx_t*	trx,		/*!< in: receiver transaction */
+	trx_t*	from_trx)	/*!< in: donor transaction */
+{
+	ut_ad(lock_mutex_own());
+	ut_ad(mutex_own(&trx_sys->mutex));
+	ut_ad(trx_mutex_own(from_trx));
+	ut_ad(trx->read_view == NULL);
+
+	if (from_trx->state != TRX_STATE_ACTIVE ||
+	    from_trx->read_view == NULL) {
+
+		return(NULL);
+	}
+
+	trx->read_view = read_view_clone(from_trx->read_view,
+					 trx->prebuilt_view);
+
+	read_view_add(trx->read_view);
+
+	trx->global_read_view = trx->read_view;
+
+	return(trx->read_view);
+}
+
 /****************************************************************//**
 Prepares a transaction for commit/rollback. */
 UNIV_INTERN
 
=== modified file 'storage/perfschema/ha_perfschema.cc'