diff --git a/config/database.yml.SAMPLE b/config/database.yml.SAMPLE
--- a/config/database.yml.SAMPLE
+++ b/config/database.yml.SAMPLE
@@ -1,36 +1,42 @@
-# MySQL (default setup).  Versions 4.1 and 5.0 are recommended.
+# MySQL.  Versions 4.1 and 5.0 are recommended.
+# 
+# Install the MYSQL driver
+#   gem install mysql2
 #
-# Install the MySQL driver:
-#   gem install mysql
-# On MacOS X:
-#   gem install mysql -- --include=/usr/local/lib
-# On Windows:
-#   gem install mysql
-#       Choose the win32 build.
-#       Install MySQL and put its /bin directory on your path.
+# Ensure the MySQL gem is defined in your Gemfile
+#   gem 'mysql2'
 #
 # And be sure to use new-style password hashing:
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:
-  adapter: mysql
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
   database: ioi
+  pool: 5
   username: ioi
   password: ioi
-  host: localhost
+  socket: /var/run/mysqld/mysqld.sock
 
-# Warning: The database defined as 'test' will be erased and
-# re-generated from your development database when you run 'rake'.
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
-  adapter: mysql
-  database: grader_test
-  username: root
-  password:
-  host: localhost
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  database: ioi_test
+  pool: 5
+  username: ioi
+  password: ioi
+  socket: /var/run/mysqld/mysqld.sock
 
 production:
-  adapter: mysql
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
   database: ioi
+  pool: 5
   username: ioi
   password: ioi
-  host: localhost
+  socket: /var/run/mysqld/mysqld.sock