Merge branch 'mysql-5.6' into mysql-5.7

Tor Didriksen · Tor Didriksen · commit 2930ffd60cae · 2015-06-16T15:57:26.000+02:00
Conflicts:
	sql/filesort.cc
diff --git a/mysql-test/valgrind.supp b/mysql-test/valgrind.supp
@@ -869,6 +869,15 @@
    fun:_Z8filesortP3THDP7QEP_TABP8FilesortbPyS5_
 }
 
+{
+   Bug#12856915 VALGRIND FAILURE IN FILESORT/CREATE_SORT_INDEX / three
+   Memcheck:Param
+   write(buf)
+   ...
+   fun:my_b_flush_io_cache
+   fun:_Z8filesortP3THDP7QEP_TABP8FilesortbPyS5_
+}
+
 {
    OpenSSL still reachable.
    Memcheck:Leak
