[Commits] 7905ea8: MDEV-6720 - enable connection log in mysqltest by default

Sergey Vojtovich svoj at mariadb.org
Thu May 5 10:23:31 EEST 2016


revision-id: 7905ea89048e5e221870c355e87bb6fbe0a28387 (mariadb-10.2.0-18-g7905ea8)
parent(s): c788a13c6439122b0637adc28397eb143444b92f
committer: Sergey Vojtovich
timestamp: 2016-05-05 11:20:37 +0400
message:

MDEV-6720 - enable connection log in mysqltest by default

This is an addition to original patch. Removed meaningless
"echo SET SESSION AUTOCOMMIT=0" (transaction is started explicitely on
master anyway).

---
 mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result | 2 --
 mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test   | 2 --
 2 files changed, 4 deletions(-)

diff --git a/mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result b/mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result
index 5e16bef..889db65 100644
--- a/mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result
+++ b/mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result
@@ -116,7 +116,6 @@ include/wait_for_slave_sql_to_start.inc
 # SAVEPOINT and ROLLBACK TO have the same problem in BUG#43263
 # This was reported by BUG#50407
 connection master;
-SET SESSION AUTOCOMMIT=0
 BEGIN;
 INSERT INTO db1.t1 VALUES(20);
 # 
@@ -164,7 +163,6 @@ master-bin.000001	#	Query	#	#	use `db1`; INSERT INTO db1.t2 VALUES("after rollba
 master-bin.000001	#	Query	#	#	use `db1`; INSERT INTO db1.t1 VALUES(50)
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 connection slave;
-[on slave]
 #
 # Verify INSERT statements in savepoints are executed, for MyISAM table
 # is not effected by ROLLBACK TO
diff --git a/mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test b/mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test
index 347e884..f0ed5dc 100644
--- a/mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test
+++ b/mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test
@@ -129,7 +129,6 @@ source include/wait_for_slave_sql_to_start.inc;
 --echo # SAVEPOINT and ROLLBACK TO have the same problem in BUG#43263
 --echo # This was reported by BUG#50407
 connection master;
-echo SET SESSION AUTOCOMMIT=0;
 let $binlog_start=query_get_value(SHOW MASTER STATUS, Position, 1);
 
 BEGIN;
@@ -157,7 +156,6 @@ COMMIT;
 source include/show_binlog_events.inc;
 sync_slave_with_master;
 
---echo [on slave]
 --echo #
 --echo # Verify INSERT statements in savepoints are executed, for MyISAM table
 --echo # is not effected by ROLLBACK TO


More information about the commits mailing list