Merge lp:~akopytov/percona-server/enhancements-for-start-transaction-with-consistent into lp:percona-server/5.6

[Alexey Kopytov]

    Implementation of
    https://blueprints.launchpad.net/percona-server/+spec/enhancements-for-start-transaction-with-consistent.

    This is a port of enhancements to START TRANSACTION WITH CONSISTENT
    SNAPSHOT in MariaDB 5.3+ to the group commit implementation available in
    MySQL/PS 5.6.

    The major difference with the MariaDB group commit implementation is
    that there’s just one mutex to block storage engine commits and binary
    log updates, LOCK_commit_ordered, which is used by both TC_LOG_MMAP and
    MYSQL_BIN_LOG. In PS 5.6 LOCK_log is used to protect binary log updates
    and commits are performed by the commit stage leader thread under the
    LOCK_commit mutex. Unless binlog_order_commits is 0, in which case
    commits are performed in parallel by the corresponding threads. When
    binary log is not used as a transaction coordinator, there is no mutex
    protecting commits neither.

    Introducing new mutexes to provide atomicity for START TRANSACTION WITH
    CONSISTENT SNAPSHOT would have a serious performance impact: we don’t
    really want to serialize commits, but rather make block them for a short
    duration when STWCS initiates snapshot creation for all storage
    engines. Therefore, this patch introduces four new “methods” to the
    transaction coordinator class: xlock(), xunlock(), slock() and
    sunlock(). The first 2 acquire/release an exclusive lock on commits,
    whereas the other 2 acquire/release a shared lock. Depending on the
    transaction coordinator being used and the binlog_order_commits value,
    those functions may either:

    1) be no-ops (for TC_LOG_DUMMY)
    2) just lock LOCK_log and LOCK_commit, as that guarantees that no binary
    log updates and commits will occur with binlog_order_commits=1
    3) lock LOCK_log and a new global rwlock, LOCK_consistent_snapshot. A
    shared lock on it may be acquired on commits, and an exclusive lock may
    only be acquired for STWCS.
    4) use only LOCK_consistent_snapshot without LOCK_log when no binary log
    is used (i.e. in TC_LOG_MMAP).

    mysqldump changes have been merged with backup locks changes. Now
    mysqldump --lock-for-backup --single-transaction does not resort to
    FTWRL even if --master-data is also requested.

http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/527/

[Laurynas Biveinis (laurynas-biveinis)]

    - mysqlbinlog.c:check_consistent_binlog_pos: shouldn't the first
      exit from the function return 0 not 1?
    - check_consistent_binlog_pos returns 1 for position found, 0 for
      not found. Most other mysqldump.c functions return 0 for
      success, 1 failure. Don't have a strong opinion whether this
      should be fixed, just pointing out.
    - Might be a good idea to include show_binlog_events[2].inc in MTR
      instead of direct replace_regex/SHOW BINLOG EVENTS, to save any
      future regexp maintenance, and, if we ever do MTR collections
      runs, make the testcase more compatible with GTID mode I guess.
    - MYSQL_BIN_LOG::get_commit_lock is unused.
    - Diff lines 1077/1078: spurious change?

review: Needs Fixing

[Alexey Kopytov (akopytov)]

Hi Laurynas,

On Tue, May 06 2014 11:03:13 +0400, Laurynas Biveinis wrote:

> Review: Needs Fixing
>
> - mysqlbinlog.c:check_consistent_binlog_pos: shouldn't the first
> exit from the function return 0 not 1?

Hard to tell. The only case when we reach the first exit in
check_consistent_binlog_pos() is when the SHOW STATUS LIKE query
fails (as in, not returns an empty result set, but fails), and mysqldump
is invoked with --force. Now, if we are running with --force and the
SHOW STATUS query fails for whatever reasons, should we proceed with the
assumption that STWCS enhancements are available or not?

The original MariaDB patch assumes that they are available. I didn’t
mind. Looked like a corner case to me.

> - check_consistent_binlog_pos returns 1 for position found, 0 for
> not found. Most other mysqldump.c functions return 0 for
> success, 1 failure. Don't have a strong opinion whether this
> should be fixed, just pointing out.

That’s correct, but OTOH the purpose of the function is to check whether
something is available. I.e. it should be boolean and named something
like ‘has_consistent_binlog_pos’. I.e. the return code of 0 actually
indicates ‘false’ rather than a failure.

> - Might be a good idea to include show_binlog_events[2].inc in MTR
> instead of direct replace_regex/SHOW BINLOG EVENTS, to save any
> future regexp maintenance, and, if we ever do MTR collections
> runs, make the testcase more compatible with GTID mode I guess.

That’s one of the things I tried to change from the MariaDB’s
implementation. That didn’t work out, because show_binlog_events[2] also
mask binlog positions. Which are essential to that specific test case:
we want to make sure that reported binlog coordinates map to specific
binlog positions. Which is hard to do without positions being reported
in SHOW BINLOG EVENTS.

> - MYSQL_BIN_LOG::get_commit_lock is unused.

Yep, fixed.

> - Diff lines 1077/1078: spurious change?

Yep, fixed.

http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/598/

[Laurynas Biveinis (laurynas-biveinis)]

Looks good.

The diff shows many spurious changes now. Would you mind either rebasing the branch on the current trunk, either just pushing to the trunk yourself?

review: Approve

[Alexey Kopytov (akopytov)]

Yep, noticed the conflicts. I will merge it to trunk and see what is.

[Alexey Kopytov (akopytov)]

No conflicts occurred with bzr merge --weave (it was a criss-cross merge due to backup locks dependency).

=== modified file 'build-ps/debian/control'
--- build-ps/debian/control	2014-04-25 10:55:01 +0000
+++ build-ps/debian/control	2014-05-06 08:36:28 +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
@@ -140,6 +145,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
@@ -175,6 +181,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
@@ -214,10 +227,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'
--- build-ps/debian/rules	2014-04-25 10:55:01 +0000
+++ build-ps/debian/rules	2014-05-06 08:36:28 +0000
@@ -73,6 +73,7 @@
 		-DWITH_LIBWRAP=ON \
 		-DWITH_ZLIB=system \
 		-DWITH_SSL=system \
+<<<<<<< TREE
 		-DCOMPILATION_COMMENT="($(DISTRIBUTION))" \
 		-DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \
 		-DSYSTEM_TYPE="debian-linux-gnu" \
@@ -85,6 +86,19 @@
 		-DWITH_BLACKHOLE_STORAGE_ENGINE=ON \
 		-DWITH_FEDERATED_STORAGE_ENGINE=ON \
 		-DWITH_PAM=ON \
+=======
+		-DCOMPILATION_COMMENT="($(DISTRIBUTION))" \
+		-DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \
+		-DSYSTEM_TYPE="debian-linux-gnu" \
+		-DINSTALL_LAYOUT=RPM \
+		-DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
+		-DINSTALL_PLUGINDIR=lib/mysql/plugin \
+		-DWITH_EMBEDDED_SERVER=OFF \
+		-DWITH_ARCHIVE_STORAGE_ENGINE=ON \
+		-DWITH_BLACKHOLE_STORAGE_ENGINE=ON \
+		-DWITH_FEDERATED_STORAGE_ENGINE=ON \
+		-DWITH_PAM=ON \
+>>>>>>> MERGE-SOURCE
 		-DWITH_EXTRA_CHARSETS=all ..'
 	touch $@
 
@@ -258,8 +272,13 @@
 	dh_installinfo -a
 	dh_installlogcheck -a
 	dh_installchangelogs -a
+<<<<<<< TREE
 	dh_strip -a --dbg-package=percona-server-5.6-dbg
 	dh_lintian
+=======
+	dh_strip -a
+	dh_lintian
+>>>>>>> MERGE-SOURCE
 	dh_link -a	# .so muss nach .so.1.2.3 installier werden!
 	dh_compress -a
 	dh_fixperms -a

=== modified file 'client/client_priv.h'
--- client/client_priv.h	2014-02-25 17:05:01 +0000
+++ client/client_priv.h	2014-05-06 08:36:28 +0000
@@ -104,8 +104,12 @@
   OPT_SERVER_PUBLIC_KEY,
   OPT_ENABLE_CLEARTEXT_PLUGIN,
   OPT_INNODB_OPTIMIZE_KEYS,
+<<<<<<< TREE
   OPT_REWRITE_DB,
   OPT_LOCK_FOR_BACKUP,
+=======
+  OPT_LOCK_FOR_BACKUP,
+>>>>>>> MERGE-SOURCE
   OPT_MAX_CLIENT_OPTION
 };
 

=== modified file 'client/mysqldump.c'
--- client/mysqldump.c	2014-04-24 05:16:52 +0000
+++ client/mysqldump.c	2014-05-06 08:36:28 +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,
@@ -419,9 +422,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.",
@@ -1226,6 +1230,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,
@@ -5302,41 +5344,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;
 }
 
@@ -6295,6 +6360,7 @@
 {
   char bin_log_name[FN_REFLEN];
   int exit_code;
+  int consistent_binlog_pos= 0;
   MY_INIT("mysqldump");
 
   compatible_mode_normal_str[0]= 0;
@@ -6343,6 +6409,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)))
   {
@@ -6350,6 +6417,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;
 
   /*
@@ -6390,7 +6475,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/upstream-bug-fixes.rst'
--- doc/source/upstream-bug-fixes.rst	2014-04-25 10:55:01 +0000
+++ doc/source/upstream-bug-fixes.rst	2014-05-06 08:36:28 +0000
@@ -5,6 +5,7 @@
 =============================================================
 
 +-------------------------------------------------------------------------------------------------------------+
+<<<<<<< TREE
 |:Upstream bug: :mysqlbug:`71374` - Slave IO thread won't attempt auto reconnect to the master/error-code 1159|
 |:Launchpad bug: :bug:`1268729`                                                                               |
 |:Upstream state: Verified (checked on 2014-03-17)                                                            |
@@ -71,6 +72,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                                                                                      |
@@ -81,12 +90,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-17)                                                            |
 |: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 ...     |
@@ -97,7 +115,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-17)                                                         |
+=======
+|:Upstream state: No Feedback (checked on 2014-02-05)                                                         |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.13-61.0`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
@@ -109,7 +131,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-17)                                                                |
+=======
+|:Upstream state: Open (checked on 2014-02-05)                                                                |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.13-61.0`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
@@ -127,31 +153,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-17)                                                            |
+=======
+|: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-17)                                                            |
+=======
+|: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-17)                                                            |
+=======
+|: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-17)                                                            |
+=======
+|: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-17)                                                            |
+=======
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.13-60.6`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
@@ -169,13 +215,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-17)                                                            |
+=======
+|: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-17)                                                            |
+=======
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.13-60.6`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
@@ -193,13 +247,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-17)                                                            |
+=======
+|: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-17)                                                                |
+=======
+|:Upstream state: Open (checked on 2014-02-05)                                                                |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.13-60.5`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
@@ -217,10 +279,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-17)                                                            |
+=======
+|: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                                                                                         |
@@ -233,6 +300,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                                                                                      |
@@ -247,7 +322,11 @@
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`69252` - All the parts.partition_max* tests are broken with MTR --parallel         |
 |:Launchpad bug: :bug:`1180481`                                                                               |
+<<<<<<< TREE
 |:Upstream state: Closed                                                                                      |
+=======
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.11-60.3`                                                                             |
 |:Upstream fix: 5.6.15                                                                                        |
 +-------------------------------------------------------------------------------------------------------------+
@@ -259,7 +338,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-17)                                                            |
+=======
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.11-60.3`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
@@ -283,13 +366,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-17)                                                            |
+=======
+|: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-17)                                                            |
+=======
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.11-60.3`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
@@ -301,13 +392,21 @@
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`68999` - SSL_OP_NO_COMPRESSION not defined                                         |
 |:Launchpad bug: :bug:`1183610`                                                                               |
+<<<<<<< TREE
 |:Upstream state: No Feedback (checked on 2014-03-17)                                                         |
+=======
+|: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-17)                                                            |
+=======
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.11-60.3`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
@@ -337,7 +436,11 @@
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`68476` - Suboptimal code in my_strnxfrm_simple()                                   |
 |:Launchpad bug: :bug:`1132350`                                                                               |
+<<<<<<< TREE
 |:Upstream state: Verified (checked on 2014-03-17)                                                            |
+=======
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.11-60.3`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
@@ -391,13 +494,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-17)                                                            |
+=======
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.11-60.3`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
@@ -409,7 +520,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-17)                                                            |
+=======
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.11-60.3`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
@@ -439,13 +554,21 @@
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`25007` - memory tables with dynamic rows format                                    |
 |:Launchpad bug: N/A                                                                                          |
+<<<<<<< TREE
 |:Upstream state: Verified (checked on 2014-03-17)                                                            |
+=======
+|: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-17)                                                            |
+=======
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.11-60.3`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
@@ -457,7 +580,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-17)                                                            |
+=======
+|:Upstream state: Verified (checked on 2014-02-05)                                                            |
+>>>>>>> MERGE-SOURCE
 |:Fix Released: :rn:`5.6.10-60.2`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
@@ -469,13 +596,21 @@
 +-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`20001` - Support for temp-tables in INFORMATION_SCHEMA                             |
 |:Launchpad bug: N/A                                                                                          |
+<<<<<<< TREE
 |:Upstream state: Verified (checked on 2014-03-17)                                                            |
+=======
+|: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-17)                                                                |
+=======
+|: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-05-06 08:36:28 +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

=== 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-05-06 08:36:28 +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-05-06 08:36:28 +0000
@@ -0,0 +1,103 @@
+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			
+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-05-06 08:36:28 +0000
@@ -0,0 +1,88 @@
+--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;
+
+--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-05-06 08:36:28 +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 (

=== 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-05-06 08:36:28 +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

=== 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-05-06 08:36:28 +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-04-24 05:16:52 +0000
+++ sql/binlog.cc	2014-05-06 08:36:28 +0000
@@ -79,7 +79,19 @@
 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 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
@@ -788,6 +800,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);
@@ -914,6 +928,7 @@
   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->flags= HTON_NOT_USER_SELECTABLE | HTON_HIDDEN;
   return 0;
 }
@@ -1325,6 +1340,25 @@
   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);
+}
+
 /**
   This function is called once after each statement.
 
@@ -1567,8 +1601,18 @@
     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)
+      cache_mngr->binlog_info.log_file_name[0]= '\0';
+
     if ((error= ha_rollback_low(thd, all)))
       goto end;
+  }
 
   /*
     If there is no cache manager, or if there is nothing in the
@@ -2436,7 +2480,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
@@ -6313,6 +6357,14 @@
     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)
+    cache_mngr->binlog_info.log_file_name[0]= '\0';
+
   THD_TRANS *trans= all ? &thd->transaction.all : &thd->transaction.stmt;
 
   DBUG_PRINT("debug", ("in_transaction: %s, no_2pc: %s, rw_ha_count: %d",
@@ -6810,9 +6862,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
     */
@@ -7201,6 +7266,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)");
@@ -9052,6 +9210,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 };
 
@@ -9068,7 +9245,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-05-06 08:36:28 +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)
   {
@@ -674,6 +684,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-04-24 05:16:52 +0000
+++ sql/handler.cc	2014-05-06 08:36:28 +0000
@@ -2270,8 +2270,18 @@
 {
   bool warn= true;
 
+  /*
+    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, 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
     exist:

=== modified file 'sql/handler.h'
--- sql/handler.h	2014-04-24 05:16:52 +0000
+++ sql/handler.h	2014-05-06 08:36:28 +0000
@@ -1024,6 +1024,7 @@
 
 #define HTON_SUPPORTS_EXTENDED_KEYS  (1 << 10)
 
+<<<<<<< TREE
 /**
    Set if the storage engine supports 'online' backups. This means that there
    exists a way to create a consistent copy of its tables without blocking
@@ -1036,6 +1037,15 @@
   Engine supports secondary clustered keys.
 */
 #define HTON_SUPPORTS_CLUSTERED_KEYS (1 << 12)
+=======
+/**
+   Set if the storage engine supports 'online' backups. This means that there
+   exists a way to create a consistent copy of its tables without blocking
+   updates to them. If so, statements that update such tables will not be
+   affected by an active LOCK TABLES FOR BACKUP.
+*/
+#define HTON_SUPPORTS_ONLINE_BACKUPS (1 << 11)
+>>>>>>> MERGE-SOURCE
 
 enum enum_tx_isolation { ISO_READ_UNCOMMITTED, ISO_READ_COMMITTED,
 			 ISO_REPEATABLE_READ, ISO_SERIALIZABLE};

=== modified file 'sql/log.cc'
--- sql/log.cc	2014-04-25 10:55:01 +0000
+++ sql/log.cc	2014-05-06 08:36:28 +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
@@ -2899,12 +2900,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-05-06 08:36:28 +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/mysqld.cc'
--- sql/mysqld.cc	2014-04-25 10:55:01 +0000
+++ sql/mysqld.cc	2014-05-06 08:36:28 +0000
@@ -781,6 +781,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;
@@ -2062,6 +2064,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*/
 
@@ -4322,6 +4325,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);
@@ -9727,7 +9732,7 @@
 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;
@@ -9753,7 +9758,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-04-25 10:55:01 +0000
+++ sql/mysqld.h	2014-05-06 08:36:28 +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/share/errmsg-utf8.txt'
--- sql/share/errmsg-utf8.txt	2014-04-24 05:16:52 +0000
+++ sql/share/errmsg-utf8.txt	2014-05-06 08:36:28 +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."
 
@@ -7108,6 +7109,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 'storage/innobase/buf/buf0flu.cc'
--- storage/innobase/buf/buf0flu.cc	2014-04-24 05:16:52 +0000
+++ storage/innobase/buf/buf0flu.cc	2014-05-06 08:36:28 +0000
@@ -1376,10 +1376,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);