Merge MWL#116 after-review fixes.

include/my_sys.h

@@ -561,6 +561,8 @@ typedef int (*qsort2_cmp)(const void *, const void *, const void *);
 
 #define my_b_tell(info) ((info)->pos_in_file + \
 			 (size_t) (*(info)->current_pos - (info)->request_pos))
+#define my_b_write_tell(info) ((info)->pos_in_file + \
+			 ((info)->write_pos - (info)->write_buffer))
 
 #define my_b_get_buffer_start(info) (info)->request_pos 
 #define my_b_get_bytes_in_buffer(info) (char*) (info)->read_end -   \

mysql-test/r/xa_binlog.result

+CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
+SET binlog_format= mixed;
+RESET MASTER;
+XA START 'xatest';
+INSERT INTO t1 VALUES (1);
+XA END 'xatest';
+XA PREPARE 'xatest';
+XA COMMIT 'xatest';
+XA START 'xatest';
+INSERT INTO t1 VALUES (2);
+XA END 'xatest';
+XA COMMIT 'xatest' ONE PHASE;
+BEGIN;
+INSERT INTO t1 VALUES (3);
+COMMIT;
+SELECT * FROM t1 ORDER BY a;
+a
+1
+2
+3
+SHOW BINLOG EVENTS LIMIT 1,9;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	1	#	BEGIN
+master-bin.000001	#	Query	1	#	use `test`; INSERT INTO t1 VALUES (1)
+master-bin.000001	#	Query	1	#	COMMIT
+master-bin.000001	#	Query	1	#	BEGIN
+master-bin.000001	#	Query	1	#	use `test`; INSERT INTO t1 VALUES (2)
+master-bin.000001	#	Query	1	#	COMMIT
+master-bin.000001	#	Query	1	#	BEGIN
+master-bin.000001	#	Query	1	#	use `test`; INSERT INTO t1 VALUES (3)
+master-bin.000001	#	Xid	1	#	COMMIT /* xid=XX */
+DROP TABLE t1;

mysql-test/suite/binlog/t/binlog_ioerr.test

@@ -21,7 +21,8 @@ SELECT * FROM t1;
 # Actually the output from this currently shows a bug.
 # The injected IO error leaves partially written transactions in the binlog in
 # the form of stray "BEGIN" events.
-# These should disappear from the output if binlog error handling is improved.
+# These should disappear from the output if binlog error handling is improved
+# (see MySQL Bug#37148 and WL#1790).
 --replace_regex /\/\* xid=.* \*\//\/* XID *\// /Server ver: .*, Binlog ver: .*/Server ver: #, Binlog ver: #/ /table_id: [0-9]+/table_id: #/
 --replace_column 1 BINLOG 2 POS 5 ENDPOS
 SHOW BINLOG EVENTS;

mysql-test/suite/pbxt/r/pbxt_xa_binlog.result

@@ -16,6 +16,7 @@ select * from t2;
 b
 2
 SET sql_log_bin = 0;
+BEGIN;
 INSERT INTO t1 VALUES (3);
 INSERT INTO t2 VALUES (4);
 COMMIT;

mysql-test/suite/pbxt/t/pbxt_xa_binlog.test

@@ -20,6 +20,7 @@ select * from t2;
 
 # Test 2-phase commit when we disable binlogging.
 SET sql_log_bin = 0;
+BEGIN;
 INSERT INTO t1 VALUES (3);
 INSERT INTO t2 VALUES (4);
 COMMIT;

mysql-test/t/group_commit_binlog_pos.test

@@ -8,6 +8,10 @@
 # Don't test this under valgrind, memory leaks will occur as we crash
 --source include/not_valgrind.inc
 
+# The test case currently uses grep and tail, which may be unavailable on
+# some windows systems. But see MWL#191 for how to remove the need for grep.
+--source include/not_windows.inc
+
 # XtraDB stores the binlog position corresponding to the last commit, and
 # prints it during crash recovery.
 # Test that we get the correct position when we group commit several

mysql-test/t/xa_binlog.test

+--source include/have_innodb.inc
+--source include/have_log_bin.inc
+
+CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
+
+# Fix binlog format (otherwise SHOW BINLOG EVENTS will fluctuate).
+SET binlog_format= mixed;
+
+RESET MASTER;
+
+XA START 'xatest';
+INSERT INTO t1 VALUES (1);
+XA END 'xatest';
+XA PREPARE 'xatest';
+XA COMMIT 'xatest';
+
+XA START 'xatest';
+INSERT INTO t1 VALUES (2);
+XA END 'xatest';
+XA COMMIT 'xatest' ONE PHASE;
+
+BEGIN;
+INSERT INTO t1 VALUES (3);
+COMMIT;
+
+SELECT * FROM t1 ORDER BY a;
+
+--replace_column 2 # 5 #
+--replace_regex /xid=[0-9]+/xid=XX/
+SHOW BINLOG EVENTS LIMIT 1,9;
+
+DROP TABLE t1;

sql/handler.cc

@@ -1193,17 +1193,16 @@ int ha_commit_trans(THD *thd, bool all)
       Sic: we know that prepare() is not NULL since otherwise
       trans->no_2pc would have been set.
     */
-    if ((err= ht->prepare(ht, thd, all)))
-      my_error(ER_ERROR_DURING_COMMIT, MYF(0), err);
+    err= ht->prepare(ht, thd, all);
     status_var_increment(thd->status_var.ha_prepare_count);
+    if (err)
+      my_error(ER_ERROR_DURING_COMMIT, MYF(0), err);
 
     if (err)
       goto err;
 
-    if (ht->prepare_ordered)
-      need_prepare_ordered= TRUE;
-    if (ht->commit_ordered)
-      need_commit_ordered= TRUE;
+    need_prepare_ordered|= (ht->prepare_ordered != NULL);
+    need_commit_ordered|= (ht->commit_ordered != NULL);
   }
   DBUG_EXECUTE_IF("crash_commit_after_prepare", DBUG_SUICIDE(););
 
@@ -1232,8 +1231,7 @@ int ha_commit_trans(THD *thd, bool all)
 
   /* Come here if error and we need to rollback. */
 err:
-  if (!error)
-    error= 1;
+  error= 1;                                  /* Transaction was rolled back */
   ha_rollback_trans(thd, all);
 
 end:
@@ -1885,8 +1883,11 @@ int ha_start_consistent_snapshot(THD *thd)
   bool warn= true;
 
   /*
-    Holding the LOCK_commit_ordered mutex ensures that for any transaction
-    we either see it committed in all engines, or in none.
+    Holding the LOCK_commit_ordered mutex 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.
   */
   pthread_mutex_lock(&LOCK_commit_ordered);
   plugin_foreach(thd, snapshot_handlerton, MYSQL_STORAGE_ENGINE_PLUGIN, &warn);

sql/handler.h

@@ -776,7 +776,7 @@ struct handlerton
      Not that like prepare(), commit_ordered() is only called when 2-phase
      commit takes place. Ie. when no binary log and only a single engine
      participates in a transaction, one commit() is called, no
-     commit_orderd(). So engines must be prepared for this.
+     commit_ordered(). So engines must be prepared for this.
 
      The calls to commit_ordered() in multiple parallel transactions is
      guaranteed to happen in the same order in every participating
@@ -789,7 +789,7 @@ struct handlerton
      transaction visible to other transactions, thereby making the order of
      transaction commits be defined by the order of commit_ordered() calls.
 
-     The intension is that commit_ordered() should do the minimal amount of
+     The intention is that commit_ordered() should do the minimal amount of
      work that needs to happen in consistent commit order among handlers. To
      preserve ordering, calls need to be serialised on a global mutex, so
      doing any time-consuming or blocking operations in commit_ordered() will
@@ -833,7 +833,7 @@ struct handlerton
      order transactions will be eventually committed.
 
      Like commit_ordered(), prepare_ordered() calls are serialised to maintain
-     ordering, so the intension is that they should execute fast, with only
+     ordering, so the intention is that they should execute fast, with only
      the minimal amount of work needed to define commit order. Handlers can
      rely on this serialisation, and do not need to do any extra locking to
      avoid two prepare_ordered() calls running in parallel.
@@ -853,8 +853,7 @@ struct handlerton
      require blocking all other commits for an indefinite time).
 
      When 2-phase commit is not used (eg. only one engine (and no binlog) in
-     transaction), prepare() is not called and in such cases prepare_ordered()
-     also is not called.
+     transaction), neither prepare() nor prepare_ordered() is called.
    */
    void (*prepare_ordered)(handlerton *hton, THD *thd, bool all);
    int  (*recover)(handlerton *hton, XID *xid_list, uint len);

sql/sql_class.cc

@@ -4168,8 +4168,8 @@ THD::signal_wakeup_ready()
 {
   pthread_mutex_lock(&LOCK_wakeup_ready);
   wakeup_ready= true;
-  pthread_cond_signal(&COND_wakeup_ready);
   pthread_mutex_unlock(&LOCK_wakeup_ready);
+  pthread_cond_signal(&COND_wakeup_ready);
 }
 
 

storage/xtradb/handler/ha_innodb.cc

@@ -11725,6 +11725,12 @@ static MYSQL_SYSVAR_ENUM(adaptive_checkpoint, srv_adaptive_checkpoint,
   "Enable/Disable flushing along modified age. (none, reflex, [estimate])",
   NULL, innodb_adaptive_checkpoint_update, 2, &adaptive_checkpoint_typelib);
 
+static MYSQL_SYSVAR_ULONG(enable_unsafe_group_commit, srv_deprecated_enable_unsafe_group_commit,
+  PLUGIN_VAR_RQCMDARG,
+  "Enable/Disable unsafe group commit when support_xa=OFF and use with binlog or other XA storage engine. "
+  "(Deprecated, and does nothing, group commit is always enabled in a safe way)",
+  NULL, NULL, 0, 0, 1, 0);
+
 static MYSQL_SYSVAR_ULONG(expand_import, srv_expand_import,
   PLUGIN_VAR_RQCMDARG,
   "Enable/Disable converting automatically *.ibd files when import tablespace.",
@@ -11833,6 +11839,7 @@ static struct st_mysql_sys_var* innobase_system_variables[]= {
   MYSQL_SYSVAR(read_ahead),
   MYSQL_SYSVAR(adaptive_checkpoint),
   MYSQL_SYSVAR(flush_log_at_trx_commit_session),
+  MYSQL_SYSVAR(enable_unsafe_group_commit),
   MYSQL_SYSVAR(expand_import),
   MYSQL_SYSVAR(extra_rsegments),
   MYSQL_SYSVAR(dict_size_limit),

storage/xtradb/include/srv0srv.h

@@ -229,7 +229,7 @@ extern ulong	srv_ibuf_active_contract;
 extern ulong	srv_ibuf_accel_rate;
 extern ulint	srv_checkpoint_age_target;
 extern ulong	srv_flush_neighbor_pages;
-extern ulong	srv_enable_unsafe_group_commit;
+extern ulong	srv_deprecated_enable_unsafe_group_commit;
 extern ulong	srv_read_ahead;
 extern ulong	srv_adaptive_checkpoint;
 

storage/xtradb/srv/srv0srv.c

@@ -402,7 +402,7 @@ UNIV_INTERN ulong	srv_ibuf_accel_rate = 100;
 UNIV_INTERN ulint	srv_checkpoint_age_target = 0;
 UNIV_INTERN ulong	srv_flush_neighbor_pages = 1; /* 0:disable 1:enable */
 
-UNIV_INTERN ulong	srv_enable_unsafe_group_commit = 0; /* 0:disable 1:enable */
+UNIV_INTERN ulong	srv_deprecated_enable_unsafe_group_commit = 0;
 UNIV_INTERN ulong	srv_read_ahead = 3; /* 1: random  2: linear  3: Both */
 UNIV_INTERN ulong	srv_adaptive_checkpoint = 0; /* 0: none  1: reflex  2: estimate */