From f19648f615fd3c7214aabf04eebb52c418f72bd8 Mon Sep 17 00:00:00 2001
From: KimLS <KLS@peqtgc.com>
Date: Sat, 10 Oct 2015 22:06:54 -0700
Subject: [PATCH] Will prefer libmysql(dynamic) over mysqlclient(static)
 library for linking.  Update travis.yml for new travis-ci container types.

---
 .travis.yml           | 14 ++++++++++----
 cmake/FindMySQL.cmake |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 71606e74c..74e5701ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,17 @@
 language: cpp
 compiler: gcc
-before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -y libmysqlclient-dev libperl-dev libboost-dev liblua5.1-0-dev zlib1g-dev
+sudo: false
+addons:
+  apt:
+    packages:
+    - libmysqlclient-dev
+    - libperl-dev
+    - libboost-dev
+    - liblua5.1-0-dev
+    - zlib1g-dev
 script:
   - cmake -G "Unix Makefiles" -DEQEMU_BUILD_TESTS=ON -DEQEMU_ENABLE_BOTS=ON
-  - make
+  - make -j8
   - ./bin/tests
 branches:
   only:
diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
index 14d08b695..0578c8b0c 100644
--- a/cmake/FindMySQL.cmake
+++ b/cmake/FindMySQL.cmake
@@ -30,7 +30,7 @@ ELSE(MYSQL_ROOT)
 ENDIF(MYSQL_ROOT)
 
 # Library
-SET(MySQL_NAMES mysqlclient_r mysqlclient)
+SET(MySQL_NAMES libmysql mysqlclient_r mysqlclient)
 IF(MYSQL_ROOT)
 	FIND_LIBRARY(MySQL_LIBRARY_DEBUG
 		NAMES ${MySQL_NAMES}