Recovered other Travis CI systems

.travis.yml

@@ -41,15 +41,67 @@ language: cpp
 
 matrix:
   include:
+    - name: linux_gcc_x64_debug_mysql
+      <<: *__linux_mysql_defaults
+      compiler: gcc
+      env:
+        - CMAKE_BUILD_TYPE=Debug
+    - name: linux_gcc_x64_release_mysql
+      <<: *__linux_mysql_defaults
+      compiler: gcc
+      env:
+        - CMAKE_BUILD_TYPE=Release
+    - name: linux_clang_x64_debug_mysql
+      <<: *__linux_mysql_defaults
+      compiler: clang
+      env:
+        - CMAKE_BUILD_TYPE=Debug
+    - name: linux_clang_x64_release_mysql
+      <<: *__linux_mysql_defaults
+      compiler: clang
+      env:
+        - CMAKE_BUILD_TYPE=Release
+    - name: linux_gcc_x64_debug_mariadb
+      <<: *__linux_mariadb_defaults
+      compiler: gcc
+      env:
+        - CMAKE_BUILD_TYPE=Debug
+    - name: linux_gcc_x64_release_mariadb
+      <<: *__linux_mariadb_defaults
+      compiler: gcc
+      env:
+        - CMAKE_BUILD_TYPE=Release
+    - name: linux_clang_x64_debug_mariadb
+      <<: *__linux_mariadb_defaults
+      compiler: clang
+      env:
+        - CMAKE_BUILD_TYPE=Debug
+    - name: linux_clang_x64_release_mariadb
+      <<: *__linux_mariadb_defaults
+      compiler: clang
+      env:
+        - CMAKE_BUILD_TYPE=Release
     - name: osx_clang_x64_debug_mysql
       <<: *__osx_defaults
       env:
         - *__osx_cmake_options
         - CMAKE_BUILD_TYPE=Debug
         - DATABASE=mysql
+    - name: osx_clang_x64_release_mysql
+      <<: *__osx_defaults
+      env:
+        - *__osx_cmake_options
+        - CMAKE_BUILD_TYPE=Release
+        - DATABASE=mysql
     - name: osx_clang_x64_debug_mariadb
       <<: *__osx_defaults
       env:
         - *__osx_cmake_options
         - CMAKE_BUILD_TYPE=Debug
         - DATABASE=mariadb
+    - name: osx_clang_x64_release_mariadb
+      <<: *__osx_defaults
+      env:
+        - *__osx_cmake_options
+        - CMAKE_BUILD_TYPE=Release
+        - DATABASE=mariadb

ci/build_unix.sh

@@ -5,12 +5,8 @@ cp ci/*.pem /tmp # Copy SSL certs/keys to a known location
 if [ $TRAVIS_OS_NAME == "osx" ]; then
 	brew update
 	brew install $DATABASE
-	#sudo cp ci/unix-ssl.cnf /etc/my.cnf  # In OSX, there is no default /etc/my.cnf
-	cp ci/unix-ssl.cnf ~/.my.cnf
-	mysqld --help --verbose
+	cp ci/unix-ssl.cnf ~/.my.cnf  # This location is checked by both MySQL and MariaDB
 	mysql.server start # Note that running this with sudo fails
-	cat /tmp/mysql-log.txt || echo "Could not open this log"
-	cat /usr/local/var/mysql/Traviss-Mac.local.err || echo "Could not open this log"
 	if [ $DATABASE == "mariadb" ]; then
 		sudo mysql -u root < ci/root_user_setup.sql
 	fi