3 files changed, 17 insertions, 4 deletions
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 52e1af0e3a..487bd792d0 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -379,9 +379,16 @@ foreach ($supported_dbms as $dbms)
 					}
 					$line .= 'NOT NULL';
 
-					if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
+					if (isset($column_data[2]))
 					{
-						$line .= ' auto_increment';
+						if ($column_data[2] == 'auto_increment')
+						{
+							$line .= ' auto_increment';
+						}
+						else if ($dbms === 'mysql_41' && $column_data[2] == 'true_sort')
+						{
+							$line .= ' COLLATE utf8_general_ci';
+						}
 					}
 
 					$line .= ",\n";
@@ -1744,7 +1751,7 @@ function get_schema_struct()
 			'topic_attachment'			=> array('BOOL', 0),
 			'topic_approved'			=> array('BOOL', 1),
 			'topic_reported'			=> array('BOOL', 0),
-			'topic_title'				=> array('XSTEXT_UNI', ''),
+			'topic_title'				=> array('XSTEXT_UNI', '', 'true_sort'),
 			'topic_poster'				=> array('UINT', 0),
 			'topic_time'				=> array('TIMESTAMP', 0),
 			'topic_time_limit'			=> array('TIMESTAMP', 0),
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index acf2dc64ae..cfecb3d729 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -740,6 +740,12 @@ if (version_compare($current_version, '3.0.b4', '<='))
 
 if (version_compare($current_version, '3.0.b6', '<='))
 {
+	// sorting thang
+	if ($map_dbms === 'mysql_41')
+	{
+		sql_column_change($dbms, TOPICS_TABLE, 'topic_title', 'varchar(100) DEFAULT \'\' NOT NULL COLLATE utf8_general_ci');
+	}
+
 	if ($config['fulltext_native_common_thres'] == 20)
 	{
 		set_config('fulltext_native_common_thres', '5');
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index a2785867be..4f56e3c998 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -884,7 +884,7 @@ CREATE TABLE phpbb_topics (
 	topic_attachment tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	topic_approved tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	topic_reported tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	topic_title varchar(100) DEFAULT '' NOT NULL,
+	topic_title varchar(100) DEFAULT '' NOT NULL COLLATE utf8_general_ci,
 	topic_poster mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	topic_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
 	topic_time_limit int(11) UNSIGNED DEFAULT '0' NOT NULL,