Index: wp-config-sample.php
===================================================================
--- wp-config-sample.php	(revision 21259)
+++ wp-config-sample.php	(working copy)
@@ -28,7 +28,10 @@
 define('DB_HOST', 'localhost');
 
 /** Database Charset to use in creating database tables. */
-define('DB_CHARSET', 'utf8');
+if ( version_compare(mysql_get_server_info(), '5.5.3', '>=') )
+	define('DB_CHARSET', 'utf8mb4');
+else
+	define('DB_CHARSET', 'utf8');
 
 /** The Database Collate type. Don't change this if in doubt. */
 define('DB_COLLATE', '');
Index: wp-includes/version.php
===================================================================
--- wp-includes/version.php	(revision 21259)
+++ wp-includes/version.php	(working copy)
@@ -11,7 +11,7 @@
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 20596;
+$wp_db_version = 20597;
 
 /**
  * Holds the TinyMCE version