Merge tag 'upstream/5.5.49' into ubuntu-14.04

Upstream version 5.5.49

Merge tag 'upstream/5.5.49' into ubuntu-14.04
Upstream version 5.5.49
9f8aec7a · Otto Kekäläinen · 516ad142 · d97fe3f6 · 9f8aec7a · 9f8aec7a
Commit 9f8aec7a authored Apr 22, 2016 by Otto Kekäläinen
--- a/strings/decimal.c
+++ b/strings/decimal.c
--- a/unittest/my_decimal/CMakeLists.txt
+++ b/unittest/my_decimal/CMakeLists.txt
--- a/unittest/my_decimal/my_decimal-t.cc
+++ b/unittest/my_decimal/my_decimal-t.cc
--- a/unittest/mysys/CMakeLists.txt
+++ b/unittest/mysys/CMakeLists.txt
--- a/unittest/mysys/dynstring-t.c
+++ b/unittest/mysys/dynstring-t.c
--- a/unittest/strings/CMakeLists.txt
+++ b/unittest/strings/CMakeLists.txt
--- a/vio/viosslfactories.c
+++ b/vio/viosslfactories.c
--- a/win/packaging/CMakeLists.txt
+++ b/win/packaging/CMakeLists.txt
--- a/win/packaging/ca/CMakeLists.txt
+++ b/win/packaging/ca/CMakeLists.txt