Merge branch 'mysql-5.6' into mysql-5.7

Author: agopi

mysql-test/collections/default.weekly.basic

@@ -1,22 +1,13 @@
 # Smaller batch of weekly run for tier2 platforms
 # Same as default.weekly, but all tests are run without big-test option.
 # big-test runs were leading to sporadic failures in tier2 platforms
-# Comprises of the following
-# 1. Repeat of daily runs
-# 2. All suites in normal mode
-# 3. nist suite
-# 4. engine independant suite
-# 5. Covers debug and non-debug runs
-# 6. Covers all suites with Multi-Threaded-Slave and MIXED binlog-format
-# 7. Covers all suites with innodb-page-size=4k and 8k
-
-# Repeat daily run
-# big-test option for normal runs
-# Default suites (in modes binlog format stmt/mixed/row, parts), embedded and ps-protocol
+
+# Default suites (in modes binlog format stmt/mixed/row, parts)
 perl mysql-test-run.pl --force --timer  --debug-server --parallel=auto --experimental=collections/default.experimental --comment=normal-debug  --vardir=var-normal-debug  --report-features --skip-test-list=collections/disabled-daily.list --mysqld=--innodb_autoextend_increment=64 --unit-tests-report
 
 # Run all default suites with embedded server
-# --debug-server is not used for embedded runs since debug build of embedded server is not available
+# --debug-server is not used for embedded runs 
+# since debug build of embedded server is not available
 perl mysql-test-run.pl --force --timer  --parallel=auto --experimental=collections/default.experimental --comment=embedded  --vardir=var-embedded  --embedded-server
 
 # Run default suites with ps protocol
@@ -42,9 +33,3 @@ perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=
 
 # Memcached tests
 perl mysql-test-run.pl --timer --force --debug-server --comment=memcached-debug --vardir=var-debug-memcached --experimental=collections/default.experimental --parallel=1 --retry=0 --suite=memcached  --skip-test-list=collections/disabled-weekly.list
-
-
-
-
-
-