diff options
| author | karen Carias <karen@gitlab.com> | 2015-09-30 13:33:51 -0700 |
|---|---|---|
| committer | karen Carias <karen@gitlab.com> | 2015-09-30 13:33:51 -0700 |
| commit | 126dd008e110dce5dfe7d1d076bc57f33250ee7b (patch) | |
| tree | 4ce96f2fd7e50faff65df7b556153c08d16a888c /doc/install/database_mysql.md | |
| parent | 6a1d695f861e4c5251a2333c673f78705b34891f (diff) | |
| parent | 54452412f765d9e6e6166e105db9adbc7553aec2 (diff) | |
| download | gitlab-ce-126dd008e110dce5dfe7d1d076bc57f33250ee7b.tar.gz | |
solved conflict
Diffstat (limited to 'doc/install/database_mysql.md')
| -rw-r--r-- | doc/install/database_mysql.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/install/database_mysql.md b/doc/install/database_mysql.md index 362c492d0ac..c565e90da2f 100644 --- a/doc/install/database_mysql.md +++ b/doc/install/database_mysql.md @@ -36,7 +36,7 @@ We do not recommend using MySQL due to various issues. For example, case [(in)se mysql> CREATE DATABASE IF NOT EXISTS `gitlabhq_production` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`; # Grant the GitLab user necessary permissions on the database - mysql> GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER, LOCK TABLES ON `gitlabhq_production`.* TO 'git'@'localhost'; + mysql> GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, CREATE TEMPORARY TABLES, DROP, INDEX, ALTER, LOCK TABLES ON `gitlabhq_production`.* TO 'git'@'localhost'; # Quit the database session mysql> \q |