Merge branch 'mysql-5.7' into mysql-trunk

Daogang Qu · Daogang Qu · commit ba597ce76a72 · 2016-04-07T18:13:39.000+08:00
diff --git a/mysql-test/t/no_binlog_gtid_next_partially_failed_stmts_error.test b/mysql-test/t/no_binlog_gtid_next_partially_failed_stmts_error.test
@@ -27,6 +27,8 @@
 # See mysql-test/t/no_binlog_gtid_next_partially_failed_stmts_anonymous.test
 #
 
+# Restrict the test runs to only debug builds, since we set DEBUG point in the test.
+--source include/have_debug.inc
 # Test is not required to run against embedded server
 --source include/not_embedded.inc
 # Should be tested against "binlog disabled" server

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@`
`27`	`27`	`# See mysql-test/t/no_binlog_gtid_next_partially_failed_stmts_anonymous.test`
`28`	`28`	`#`
`29`	`29`
	`30`	`+# Restrict the test runs to only debug builds, since we set DEBUG point in the test.`
	`31`	`+--source include/have_debug.inc`
`30`	`32`	`# Test is not required to run against embedded server`
`31`	`33`	`--source include/not_embedded.inc`
`32`	`34`	`# Should be tested against "binlog disabled" server`