Merge tag 'upstream/5.5.50' into ubuntu-14.04

Upstream version 5.5.50

Merge tag 'upstream/5.5.50' into ubuntu-14.04
Upstream version 5.5.50
28a18fef · Otto Kekäläinen · 3747036d · 95c6357a · 28a18fef · 28a18fef
Commit 28a18fef authored Jul 21, 2016 by Otto Kekäläinen
--- a/storage/maria/ma_servicethread.c
+++ b/storage/maria/ma_servicethread.c
--- a/storage/maria/ma_servicethread.h
+++ b/storage/maria/ma_servicethread.h
--- a/storage/maria/ma_sort.c
+++ b/storage/maria/ma_sort.c
--- a/storage/maria/maria_def.h
+++ b/storage/maria/maria_def.h
--- a/storage/myisam/sort.c
+++ b/storage/myisam/sort.c
--- a/storage/tokudb/ft-index/ft/logger/recover.cc
+++ b/storage/tokudb/ft-index/ft/logger/recover.cc
--- a/storage/tokudb/ft-index/ft/serialize/ft_node-serialize.cc
+++ b/storage/tokudb/ft-index/ft/serialize/ft_node-serialize.cc
--- a/storage/tokudb/ft-index/ft/txn/txn.cc
+++ b/storage/tokudb/ft-index/ft/txn/txn.cc
--- a/storage/tokudb/ft-index/portability/toku_pthread.h
+++ b/storage/tokudb/ft-index/portability/toku_pthread.h
--- a/storage/tokudb/ft-index/src/tests/threaded_stress_test_helpers.h
+++ b/storage/tokudb/ft-index/src/tests/threaded_stress_test_helpers.h
--- a/storage/xtradb/dict/dict0crea.c
+++ b/storage/xtradb/dict/dict0crea.c
--- a/storage/xtradb/handler/ha_innodb.cc
+++ b/storage/xtradb/handler/ha_innodb.cc
--- a/storage/xtradb/handler/handler0alter.cc
+++ b/storage/xtradb/handler/handler0alter.cc
--- a/storage/xtradb/include/os0sync.h
+++ b/storage/xtradb/include/os0sync.h
--- a/storage/xtradb/include/univ.i
+++ b/storage/xtradb/include/univ.i
--- a/storage/xtradb/log/log0recv.c
+++ b/storage/xtradb/log/log0recv.c
--- a/storage/xtradb/os/os0file.c
+++ b/storage/xtradb/os/os0file.c
--- a/vio/viosslfactories.c
+++ b/vio/viosslfactories.c
--- a/win/packaging/extra.wxs.in
+++ b/win/packaging/extra.wxs.in
--- a/win/packaging/heidisql.cmake
+++ b/win/packaging/heidisql.cmake