Merge branch 'master' into styleguide

Conflicts:
	CONTRIBUTING.md

1 files changed, 45 insertions, 0 deletions

diff --git a/doc/install/database_mysql.md b/doc/install/database_mysql.md
new file mode 100644
index 00000000000..4cf9b94c1a0
--- /dev/null
+++ b/doc/install/database_mysql.md
@@ -0,0 +1,45 @@
+## Note
+
+We do not recommend using MySQL due to various issues. For example, case [(in)sensitivity](https://dev.mysql.com/doc/refman/5.0/en/case-sensitivity.html) and [problems](http://bugs.mysql.com/bug.php?id=65830) that [suggested](http://bugs.mysql.com/bug.php?id=50909) [fixes](http://bugs.mysql.com/bug.php?id=65830) [have](http://bugs.mysql.com/bug.php?id=63164).
+
+## MySQL
+
+    # Install the database packages
+    sudo apt-get install -y mysql-server mysql-client libmysqlclient-dev
+
+    # Pick a database root password (can be anything), type it and press enter
+    # Retype the database root password and press enter
+
+    # Secure your installation.
+    sudo mysql_secure_installation
+
+    # Login to MySQL
+    mysql -u root -p
+
+    # Type the database root password
+
+    # Create a user for GitLab
+    # do not type the 'mysql>', this is part of the prompt
+    # change $password in the command below to a real password you pick
+    mysql> CREATE USER 'git'@'localhost' IDENTIFIED BY '$password';
+
+    # Create the GitLab production database
+    mysql> CREATE DATABASE IF NOT EXISTS `gitlabhq_production` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`;
+
+    # Grant the GitLab user necessary permissions on the table.
+    mysql> GRANT SELECT, LOCK TABLES, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER ON `gitlabhq_production`.* TO 'git'@'localhost';
+
+    # Quit the database session
+    mysql> \q
+
+    # Try connecting to the new database with the new user
+    sudo -u git -H mysql -u git -p -D gitlabhq_production
+
+    # Type the password you replaced $password with earlier
+
+    # You should now see a 'mysql>' prompt
+
+    # Quit the database session
+    mysql> \q
+
+    # You are done installing the database and can go back to the rest of the installation.