Merge branch 'mysql-5.7' into mysql-8.0

Shivashankar Nagaraj · Shivashankar Nagaraj · commit 375974ff0ad2 · 2017-11-28T17:17:53.000+05:30
diff --git a/mysql-test/collections/default.experimental b/mysql-test/collections/default.experimental
@@ -3,7 +3,9 @@
 #
 
 
-main.mysqlslap @windows                  # Bug#11761520 2010-08-10 alik mysqlslap fails sporadically starting from Dahlia
+main.func_math @freebsd                  # Bug#11751977 2010-05-04 alik main.func_math fails on FreeBSD in PB2
+main.explain_for_connection_rqg_json @linux # Bug#20697533 2015-03-13 anitha Fails several times each day on linux platforms
+main.explain_for_connection_rqg_trad @linux # Bug#20697533 2015-03-20 erlend Fails several times each day on linux platforms
 
 innodb.log_file_name                     # Bug#19442959 2014-08-14 marko calling exit() trips ut_ad(!m_freed)
 innodb.innodb_page_size_func @windows    # Bug#19527616 2015-03-13 anitha Test fails almost daily on windows

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,9 @@`
`3`	`3`	`#`
`4`	`4`
`5`	`5`
`6`		`-main.mysqlslap @windows # Bug#11761520 2010-08-10 alik mysqlslap fails sporadically starting from Dahlia`
	`6`	`+main.func_math @freebsd # Bug#11751977 2010-05-04 alik main.func_math fails on FreeBSD in PB2`
	`7`	`+main.explain_for_connection_rqg_json @linux # Bug#20697533 2015-03-13 anitha Fails several times each day on linux platforms`
	`8`	`+main.explain_for_connection_rqg_trad @linux # Bug#20697533 2015-03-20 erlend Fails several times each day on linux platforms`
`7`	`9`
`8`	`10`	`innodb.log_file_name # Bug#19442959 2014-08-14 marko calling exit() trips ut_ad(!m_freed)`
`9`	`11`	`innodb.innodb_page_size_func @windows # Bug#19527616 2015-03-13 anitha Test fails almost daily on windows`