Merge branch 'travis_mariadb'

Author: sodabrew

.travis.yml

@@ -1,20 +1,42 @@
 language: ruby
-rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - 2.1.1
-  - ree
-  - rbx
-env: RBXOPT=-Xgc.honor_start=true
 bundler_args: --without benchmarks
 script:
   - bundle exec rake spec
 # Temporary workaround for broken Rubygems on Travis
 before_install:
   - gem update --system 2.1.11
   - gem --version
+  - |
+    bash -c " # Install MariaDB if DB=mariadb
+    if [[ x$DB =~ xmariadb ]]; then
+      sudo service mysql stop
+      sudo apt-get purge '^mysql*' 'libmysql*'
+      sudo apt-get install python-software-properties
+      sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db
+      if [[ x$DB = xmariadb55 ]]; then
+        sudo add-apt-repository 'deb http://ftp.osuosl.org/pub/mariadb/repo/5.5/ubuntu precise main'
+      elif [[ x$DB = xmariadb10 ]]; then
+        sudo add-apt-repository 'deb http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu precise main'
+      fi
+      sudo apt-get update
+      sudo apt-get -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confold -y install mariadb-server libmariadbd-dev
+    fi
+    "
+  - mysqld --version
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - 2.1.1
+  - ree
 matrix:
   allow_failures:
     - rvm: rbx
+  include:
+    - rvm: 2.0.0
+      env: DB=mariadb55
+    - rvm: 2.0.0
+      env: DB=mariadb10
+    - rvm: rbx
+      env: RBXOPT=-Xgc.honor_start=true

README.md

@@ -445,15 +445,22 @@ As for field values themselves, I'm workin on it - but expect that soon.
 
 ## Compatibility
 
-This gem is regularly tested against the following Ruby versions on Linux and Mac OS X:
+This gem is tested with the following Ruby versions on Linux and Mac OS X:
 
- * Ruby MRI 1.8.7, 1.9.2, 1.9.3, 2.0.0 (ongoing patch releases).
- * Ruby Enterprise Edition (based on MRI 1.8.7).
- * Rubinius 2.0 in compatibility modes 1.8, 1.9, 2.0.
+ * Ruby MRI 1.8.7, 1.9.2, 1.9.3, 2.0.0, 2.1.x (ongoing patch releases)
+ * Ruby Enterprise Edition (based on MRI 1.8.7)
+ * Rubinius 2.x
 
-The mysql2 gem 0.2.x series includes an Active Record driver that works with AR
-2.3.x and 3.0.x. Starting in Active Record 3.1, a mysql2 driver is included in
-the Active Record codebase and no longer provided in mysql2 gem 0.3 and above.
+This gem is tested with the following MySQL and MariaDB versions:
+
+ * MySQL 5.0, 5.1, 5.5, 5.6
+ * MySQL Connector/C 6.0 and 6.1 (primarily on Windows)
+ * MariaDB 5.5, 10.0
+
+This gem has two version families:
+
+ * mysql2 0.2.x includes an Active Record driver compatible with AR 2.3 and 3.0
+ * mysql2 0.3.x does not include an AR driver because it is included in AR 3.1 and above
 
 ## Yeah... but why?