Update default database config for MySQL to support 4 byte characters (emoji) (#31921).

Patch by Marius BALTEANU and Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@18454 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/config/database.yml.example b/config/database.yml.example
index 57bc516050d614098a10efeae0d5c4300133dcd5..727b4d89be9e8aa6916e7f4595db3366563882ba 100644 (file)
--- a/config/database.yml.example
+++ b/config/database.yml.example
@@ -1,4 +1,4 @@
-# Default setup is given for MySQL with ruby1.9.
+# Default setup is given for MySQL 5.7.7 or later.
 # Examples for PostgreSQL, SQLite3 and SQL Server can be found at the end.
 # Line indentation must be 2 spaces (no tabs).
 
@@ -8,7 +8,8 @@ production:
   host: localhost
   username: root
   password: ""
-  encoding: utf8
+  # Use "utf8" instead of "utfmb4" for MySQL prior to 5.7.7
+  encoding: utf8mb4
 
 development:
   adapter: mysql2
@@ -16,7 +17,8 @@ development:
   host: localhost
   username: root
   password: ""
-  encoding: utf8
+  # Use "utf8" instead of "utfmb4" for MySQL prior to 5.7.7
+  encoding: utf8mb4
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
@@ -27,7 +29,8 @@ test:
   host: localhost
   username: root
   password: ""
-  encoding: utf8
+  # Use "utf8" instead of "utfmb4" for MySQL prior to 5.7.7
+  encoding: utf8mb4
 
 # PostgreSQL configuration example
 #production: