Update upstream to mariadb 10.2.14

.travis.yml

@@ -12,7 +12,7 @@ services:
 language: c
 
 before_install:
-    - docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
+    - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
     # docker image from public hub are cached by travis
     - docker pull qserv/mariadb_build:centos
     # image below won't be cached

ups/eupspkg.cfg.sh

@@ -13,35 +13,17 @@ config()
     # TokuDB requires third-party software jemalloci (see http://www.canonware.com/jemalloc/)
     ARGS+=('-DPLUGIN_TOKUDB=NO')
 
-    # Always use bundled PCRE
+    # Due to cmake library discovery being overly energetic (searching every
+    # lib directory relative to each entry in $PATH) we use the bundled ZLIB and
+    # PCRE libraries to avoid link confusion downstream
+    ARGS+=('-DWITH_ZLIB=bundled')
     ARGS+=('-DWITH_PCRE=bundled')
 
     # Prevent CMake from finding and linking against libraries distributed in $(dirname
-    # python)/../lib. This is CMake's default behaviour, but can cause us to erroneously link
+    # python)/../lib. This is CMake's default behavior, but can cause us to erroneously link
     # against libraries distributed by e.g. Anaconda.
     PYTHONLIBDIR=$(which python | sed -e's|bin/python|lib|')
     ARGS+=("-DCMAKE_SYSTEM_IGNORE_PATH=${PYTHONLIBDIR}")
 
-    case $(uname) in
-        Linux*)
-            if grep -q -i "CentOS release 5" /etc/redhat-release; then
-                # mroonga does not build on EL5 (conda ref platform) and is
-                # unused by LSST
-                ARGS+=('-DPLUGIN_MROONGA=NO')
-                # required to build on EL5
-                ARGS+=('-DHAVE_CXX_NEW=NO')
-            fi
-            ;;
-        Darwin*)
-            # Disable external SSL on OS X as it is not a standard library
-            # and LSST does not need full SSL support.
-            ARGS+=('-DWITH_SSL=bundled')
-            ;;
-        *)
-            # non-fatal
-            echo "unsupported platform: $(uname)"
-            ;;
-    esac
-
     cmake . "${ARGS[@]}"
 }