4 files changed, 16 insertions, 1079 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 82a491fc08..d0dbada4b4 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -142,7 +142,7 @@ $inline_update = (request_var('type', 0)) ? true : false;
 
 // Database column types mapping
 $dbms_type_map = array(
-	'mysql_41'	=> array(
+	'mysql'		=> array(
 		'INT:'		=> 'int(%d)',
 		'BINT'		=> 'bigint(20)',
 		'UINT'		=> 'mediumint(8) UNSIGNED',
@@ -169,33 +169,6 @@ $dbms_type_map = array(
 		'VARBINARY'	=> 'varbinary(255)',
 	),
 
-	'mysql_40'	=> array(
-		'INT:'		=> 'int(%d)',
-		'BINT'		=> 'bigint(20)',
-		'UINT'		=> 'mediumint(8) UNSIGNED',
-		'UINT:'		=> 'int(%d) UNSIGNED',
-		'TINT:'		=> 'tinyint(%d)',
-		'USINT'		=> 'smallint(4) UNSIGNED',
-		'BOOL'		=> 'tinyint(1) UNSIGNED',
-		'VCHAR'		=> 'varbinary(255)',
-		'VCHAR:'	=> 'varbinary(%d)',
-		'CHAR:'		=> 'binary(%d)',
-		'XSTEXT'	=> 'blob',
-		'XSTEXT_UNI'=> 'blob',
-		'STEXT'		=> 'blob',
-		'STEXT_UNI'	=> 'blob',
-		'TEXT'		=> 'blob',
-		'TEXT_UNI'	=> 'blob',
-		'MTEXT'		=> 'mediumblob',
-		'MTEXT_UNI'	=> 'mediumblob',
-		'TIMESTAMP'	=> 'int(11) UNSIGNED',
-		'DECIMAL'	=> 'decimal(5,2)',
-		'VCHAR_UNI'	=> 'blob',
-		'VCHAR_UNI:'=> array('varbinary(%d)', 'limit' => array('mult', 3, 255, 'blob')),
-		'VCHAR_CI'	=> 'blob',
-		'VARBINARY'	=> 'varbinary(255)',
-	),
-
 	'firebird'	=> array(
 		'INT:'		=> 'INTEGER',
 		'BINT'		=> 'DOUBLE PRECISION',
@@ -342,26 +315,11 @@ $database_update_info = array(
 // Determine mapping database type
 switch ($db->sql_layer)
 {
-	case 'mysql':
-		$map_dbms = 'mysql_40';
-	break;
-
-	case 'mysql4':
-		if (version_compare($db->mysql_version, '4.1.3', '>='))
-		{
-			$map_dbms = 'mysql_41';
-		}
-		else
-		{
-			$map_dbms = 'mysql_40';
-		}
-	break;
 
 	case 'mysqli':
-		$map_dbms = 'mysql_41';
+		$map_dbms = 'mysql';
 	break;
 
-	case 'mssql':
 	case 'mssql_odbc':
 		$map_dbms = 'mssql';
 	break;
@@ -643,7 +601,6 @@ switch ($db->sql_layer)
 {
 	case 'mysql':
 	case 'mysqli':
-	case 'mysql4':
 		$sql = 'OPTIMIZE TABLE ' . $table_prefix . 'auth_access, ' . $table_prefix . 'banlist, ' . $table_prefix . 'categories, ' . $table_prefix . 'config, ' . $table_prefix . 'disallow, ' . $table_prefix . 'forum_prune, ' . $table_prefix . 'forums, ' . $table_prefix . 'groups, ' . $table_prefix . 'posts, ' . $table_prefix . 'posts_text, ' . $table_prefix . 'privmsgs, ' . $table_prefix . 'privmsgs_text, ' . $table_prefix . 'ranks, ' . $table_prefix . 'search_results, ' . $table_prefix . 'search_wordlist, ' . $table_prefix . 'search_wordmatch, ' . $table_prefix . 'sessions_keys' . $table_prefix . 'smilies, ' . $table_prefix . 'themes, ' . $table_prefix . 'themes_name, ' . $table_prefix . 'topics, ' . $table_prefix . 'topics_watch, ' . $table_prefix . 'user_group, ' . $table_prefix . 'users, ' . $table_prefix . 'vote_desc, ' . $table_prefix . 'vote_results, ' . $table_prefix . 'vote_voters, ' . $table_prefix . 'words';
 		_sql($sql, $errored, $error_ary);
 	break;
@@ -792,8 +749,7 @@ function column_exists($dbms, $table, $column_name)
 
 	switch ($dbms)
 	{
-		case 'mysql_40':
-		case 'mysql_41':
+		case 'mysql':
 			$sql = "SHOW COLUMNS
 				FROM $table";
 			$result = $db->sql_query($sql);
@@ -1037,8 +993,7 @@ function prepare_column_data($dbms, $column_data, $table_name, $column_name)
 			$return_array['column_type_sql_default'] = $sql_default;
 		break;
 
-		case 'mysql_40':
-		case 'mysql_41':
+		case 'mysql':
 			$sql .= " {$column_type} ";
 
 			// For hexadecimal values do not use single quotes
@@ -1054,7 +1009,7 @@ function prepare_column_data($dbms, $column_data, $table_name, $column_name)
 				{
 					$sql .= ' auto_increment';
 				}
-				else if ($dbms === 'mysql_41' && $column_data[2] == 'true_sort')
+				else if ($column_data[2] == 'true_sort')
 				{
 					$sql .= ' COLLATE utf8_unicode_ci';
 				}
@@ -1144,8 +1099,7 @@ function sql_column_add($dbms, $table_name, $column_name, $column_data)
 			_sql($sql, $errored, $error_ary);
 		break;
 
-		case 'mysql_40':
-		case 'mysql_41':
+		case 'mysql':
 			$sql = 'ALTER TABLE `' . $table_name . '` ADD COLUMN `' . $column_name . '` ' . $column_data['column_type_sql'];
 			_sql($sql, $errored, $error_ary);
 		break;
@@ -1241,8 +1195,7 @@ function sql_column_remove($dbms, $table_name, $column_name)
 			_sql($sql, $errored, $error_ary);
 		break;
 
-		case 'mysql_40':
-		case 'mysql_41':
+		case 'mysql':
 			$sql = 'ALTER TABLE `' . $table_name . '` DROP COLUMN `' . $column_name . '`';
 			_sql($sql, $errored, $error_ary);
 		break;
@@ -1331,8 +1284,7 @@ function sql_index_drop($dbms, $index_name, $table_name)
 			_sql($sql, $errored, $error_ary);
 		break;
 
-		case 'mysql_40':
-		case 'mysql_41':
+		case 'mysql':
 			$sql = 'DROP INDEX ' . $index_name . ' ON ' . $table_name;
 			_sql($sql, $errored, $error_ary);
 		break;
@@ -1368,8 +1320,7 @@ function sql_create_primary_key($dbms, $table_name, $column)
 			_sql($sql, $errored, $error_ary);
 		break;
 
-		case 'mysql_40':
-		case 'mysql_41':
+		case 'mysql':
 			$sql = 'ALTER TABLE ' . $table_name . ' ADD PRIMARY KEY (' . implode(', ', $column) . ')';
 			_sql($sql, $errored, $error_ary);
 		break;
@@ -1445,8 +1396,7 @@ function sql_create_unique_index($dbms, $index_name, $table_name, $column)
 			_sql($sql, $errored, $error_ary);
 		break;
 
-		case 'mysql_40':
-		case 'mysql_41':
+		case 'mysql':
 			$sql = 'CREATE UNIQUE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
 			_sql($sql, $errored, $error_ary);
 		break;
@@ -1473,8 +1423,7 @@ function sql_create_index($dbms, $index_name, $table_name, $column)
 			_sql($sql, $errored, $error_ary);
 		break;
 
-		case 'mysql_40':
-		case 'mysql_41':
+		case 'mysql':
 			$sql = 'CREATE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
 			_sql($sql, $errored, $error_ary);
 		break;
@@ -1534,8 +1483,7 @@ function sql_list_index($dbms, $table_name)
 				$col = 'index_name';
 			break;
 
-			case 'mysql_40':
-			case 'mysql_41':
+			case 'mysql':
 				$sql = 'SHOW KEYS
 					FROM ' . $table_name;
 				$col = 'Key_name';
@@ -1557,7 +1505,7 @@ function sql_list_index($dbms, $table_name)
 		$result = $db->sql_query($sql);
 		while ($row = $db->sql_fetchrow($result))
 		{
-			if (($dbms == 'mysql_40' || $dbms == 'mysql_41') && !$row['Non_unique'])
+			if ($dbms == 'mysql' && !$row['Non_unique'])
 			{
 				continue;
 			}
@@ -1628,8 +1576,7 @@ function sql_list_fake($dbms, $table_name)
 				$col = 'index_name';
 			break;
 
-			case 'mysql_40':
-			case 'mysql_41':
+			case 'mysql':
 				$sql = 'SHOW KEYS
 					FROM ' . $table_name;
 				$col = 'Key_name';
@@ -1651,7 +1598,7 @@ function sql_list_fake($dbms, $table_name)
 		$result = $db->sql_query($sql);
 		while ($row = $db->sql_fetchrow($result))
 		{
-			if (($dbms == 'mysql_40' || $dbms == 'mysql_41') && !$row['Non_unique'])
+			if ($dbms == 'mysql' && !$row['Non_unique'])
 			{
 				continue;
 			}
@@ -1687,8 +1634,7 @@ function sql_column_change($dbms, $table_name, $column_name, $column_data)
 			_sql($sql, $errored, $error_ary);
 		break;
 
-		case 'mysql_40':
-		case 'mysql_41':
+		case 'mysql':
 			$sql = 'ALTER TABLE `' . $table_name . '` CHANGE `' . $column_name . '` `' . $column_name . '` ' . $column_data['column_type_sql'];
 			_sql($sql, $errored, $error_ary);
 		break;
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 1546ed0886..9e95538313 100755
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1158,19 +1158,6 @@ class install_install extends module
 		// NOTE: trigger_error does not work here.
 		$db->sql_return_on_error(true);
 
-		// If mysql is chosen, we need to adjust the schema filename slightly to reflect the correct version. ;)
-		if ($data['dbms'] == 'mysql')
-		{
-			if (version_compare($db->mysql_version, '4.1.3', '>='))
-			{
-				$available_dbms[$data['dbms']]['SCHEMA'] .= '_41';
-			}
-			else
-			{
-				$available_dbms[$data['dbms']]['SCHEMA'] .= '_40';
-			}
-		}
-
 		// Ok we have the db info go ahead and read in the relevant schema
 		// and work on building the table
 		$dbms_schema = 'schemas/' . $available_dbms[$data['dbms']]['SCHEMA'] . '_schema.sql';
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
deleted file mode 100644
index 0f20b1030a..0000000000
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ /dev/null
@@ -1,996 +0,0 @@
-#
-# $Id$
-#
-
-# Table: 'phpbb_attachments'
-CREATE TABLE phpbb_attachments (
-	attach_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	post_msg_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	in_message tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	poster_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	is_orphan tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	physical_filename varbinary(255) DEFAULT '' NOT NULL,
-	real_filename varbinary(255) DEFAULT '' NOT NULL,
-	download_count mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	attach_comment blob NOT NULL,
-	extension varbinary(100) DEFAULT '' NOT NULL,
-	mimetype varbinary(100) DEFAULT '' NOT NULL,
-	filesize int(20) UNSIGNED DEFAULT '0' NOT NULL,
-	filetime int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	thumbnail tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	PRIMARY KEY (attach_id),
-	KEY filetime (filetime),
-	KEY post_msg_id (post_msg_id),
-	KEY topic_id (topic_id),
-	KEY poster_id (poster_id),
-	KEY is_orphan (is_orphan)
-);
-
-
-# Table: 'phpbb_acl_groups'
-CREATE TABLE phpbb_acl_groups (
-	group_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	auth_option_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	auth_role_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	auth_setting tinyint(2) DEFAULT '0' NOT NULL,
-	KEY group_id (group_id),
-	KEY auth_opt_id (auth_option_id),
-	KEY auth_role_id (auth_role_id)
-);
-
-
-# Table: 'phpbb_acl_options'
-CREATE TABLE phpbb_acl_options (
-	auth_option_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	auth_option varbinary(50) DEFAULT '' NOT NULL,
-	is_global tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	is_local tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	founder_only tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	PRIMARY KEY (auth_option_id),
-	KEY auth_option (auth_option)
-);
-
-
-# Table: 'phpbb_acl_roles'
-CREATE TABLE phpbb_acl_roles (
-	role_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	role_name blob NOT NULL,
-	role_description blob NOT NULL,
-	role_type varbinary(10) DEFAULT '' NOT NULL,
-	role_order smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
-	PRIMARY KEY (role_id),
-	KEY role_type (role_type),
-	KEY role_order (role_order)
-);
-
-
-# Table: 'phpbb_acl_roles_data'
-CREATE TABLE phpbb_acl_roles_data (
-	role_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	auth_option_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	auth_setting tinyint(2) DEFAULT '0' NOT NULL,
-	PRIMARY KEY (role_id, auth_option_id),
-	KEY ath_op_id (auth_option_id)
-);
-
-
-# Table: 'phpbb_acl_users'
-CREATE TABLE phpbb_acl_users (
-	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	auth_option_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	auth_role_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	auth_setting tinyint(2) DEFAULT '0' NOT NULL,
-	KEY user_id (user_id),
-	KEY auth_option_id (auth_option_id),
-	KEY auth_role_id (auth_role_id)
-);
-
-
-# Table: 'phpbb_banlist'
-CREATE TABLE phpbb_banlist (
-	ban_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	ban_userid mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	ban_ip varbinary(40) DEFAULT '' NOT NULL,
-	ban_email blob NOT NULL,
-	ban_start int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	ban_end int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	ban_exclude tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	ban_reason blob NOT NULL,
-	ban_give_reason blob NOT NULL,
-	PRIMARY KEY (ban_id),
-	KEY ban_end (ban_end),
-	KEY ban_user (ban_userid, ban_exclude),
-	KEY ban_email (ban_email(255), ban_exclude),
-	KEY ban_ip (ban_ip, ban_exclude)
-);
-
-
-# Table: 'phpbb_bbcodes'
-CREATE TABLE phpbb_bbcodes (
-	bbcode_id tinyint(3) DEFAULT '0' NOT NULL,
-	bbcode_tag varbinary(16) DEFAULT '' NOT NULL,
-	bbcode_helpline blob NOT NULL,
-	display_on_posting tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	bbcode_match blob NOT NULL,
-	bbcode_tpl mediumblob NOT NULL,
-	first_pass_match mediumblob NOT NULL,
-	first_pass_replace mediumblob NOT NULL,
-	second_pass_match mediumblob NOT NULL,
-	second_pass_replace mediumblob NOT NULL,
-	PRIMARY KEY (bbcode_id),
-	KEY display_on_post (display_on_posting)
-);
-
-
-# Table: 'phpbb_bookmarks'
-CREATE TABLE phpbb_bookmarks (
-	topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	PRIMARY KEY (topic_id, user_id)
-);
-
-
-# Table: 'phpbb_bots'
-CREATE TABLE phpbb_bots (
-	bot_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	bot_active tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	bot_name blob NOT NULL,
-	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	bot_agent varbinary(255) DEFAULT '' NOT NULL,
-	bot_ip varbinary(255) DEFAULT '' NOT NULL,
-	PRIMARY KEY (bot_id),
-	KEY bot_active (bot_active)
-);
-
-
-# Table: 'phpbb_config'
-CREATE TABLE phpbb_config (
-	config_name varbinary(255) DEFAULT '' NOT NULL,
-	config_value blob NOT NULL,
-	is_dynamic tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	PRIMARY KEY (config_name),
-	KEY is_dynamic (is_dynamic)
-);
-
-
-# Table: 'phpbb_confirm'
-CREATE TABLE phpbb_confirm (
-	confirm_id binary(32) DEFAULT '' NOT NULL,
-	session_id binary(32) DEFAULT '' NOT NULL,
-	confirm_type tinyint(3) DEFAULT '0' NOT NULL,
-	code varbinary(8) DEFAULT '' NOT NULL,
-	seed int(10) UNSIGNED DEFAULT '0' NOT NULL,
-	PRIMARY KEY (session_id, confirm_id),
-	KEY confirm_type (confirm_type)
-);
-
-
-# Table: 'phpbb_disallow'
-CREATE TABLE phpbb_disallow (
-	disallow_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	disallow_username blob NOT NULL,
-	PRIMARY KEY (disallow_id)
-);
-
-
-# Table: 'phpbb_drafts'
-CREATE TABLE phpbb_drafts (
-	draft_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	save_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	draft_subject blob NOT NULL,
-	draft_message mediumblob NOT NULL,
-	PRIMARY KEY (draft_id),
-	KEY save_time (save_time)
-);
-
-
-# Table: 'phpbb_extensions'
-CREATE TABLE phpbb_extensions (
-	extension_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	group_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	extension varbinary(100) DEFAULT '' NOT NULL,
-	PRIMARY KEY (extension_id)
-);
-
-
-# Table: 'phpbb_extension_groups'
-CREATE TABLE phpbb_extension_groups (
-	group_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	group_name blob NOT NULL,
-	cat_id tinyint(2) DEFAULT '0' NOT NULL,
-	allow_group tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	download_mode tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	upload_icon varbinary(255) DEFAULT '' NOT NULL,
-	max_filesize int(20) UNSIGNED DEFAULT '0' NOT NULL,
-	allowed_forums blob NOT NULL,
-	allow_in_pm tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	PRIMARY KEY (group_id)
-);
-
-
-# Table: 'phpbb_forums'
-CREATE TABLE phpbb_forums (
-	forum_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	parent_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	left_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	right_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	forum_parents mediumblob NOT NULL,
-	forum_name blob NOT NULL,
-	forum_desc blob NOT NULL,
-	forum_desc_bitfield varbinary(255) DEFAULT '' NOT NULL,
-	forum_desc_options int(11) UNSIGNED DEFAULT '7' NOT NULL,
-	forum_desc_uid varbinary(8) DEFAULT '' NOT NULL,
-	forum_link blob NOT NULL,
-	forum_password varbinary(120) DEFAULT '' NOT NULL,
-	forum_style smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
-	forum_image varbinary(255) DEFAULT '' NOT NULL,
-	forum_rules blob NOT NULL,
-	forum_rules_link blob NOT NULL,
-	forum_rules_bitfield varbinary(255) DEFAULT '' NOT NULL,
-	forum_rules_options int(11) UNSIGNED DEFAULT '7' NOT NULL,
-	forum_rules_uid varbinary(8) DEFAULT '' NOT NULL,
-	forum_topics_per_page tinyint(4) DEFAULT '0' NOT NULL,
-	forum_type tinyint(4) DEFAULT '0' NOT NULL,
-	forum_status tinyint(4) DEFAULT '0' NOT NULL,
-	forum_posts mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	forum_topics mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	forum_topics_real mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	forum_last_post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	forum_last_poster_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	forum_last_post_subject blob NOT NULL,
-	forum_last_post_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	forum_last_poster_name blob NOT NULL,
-	forum_last_poster_colour varbinary(6) DEFAULT '' NOT NULL,
-	forum_flags tinyint(4) DEFAULT '32' NOT NULL,
-	display_on_index tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	enable_indexing tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	enable_icons tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	enable_prune tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	prune_next int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	prune_days mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	prune_viewed mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	prune_freq mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	PRIMARY KEY (forum_id),
-	KEY left_right_id (left_id, right_id),
-	KEY forum_lastpost_id (forum_last_post_id)
-);
-
-
-# Table: 'phpbb_forums_access'
-CREATE TABLE phpbb_forums_access (
-	forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	session_id binary(32) DEFAULT '' NOT NULL,
-	PRIMARY KEY (forum_id, user_id, session_id)
-);
-
-
-# Table: 'phpbb_forums_track'
-CREATE TABLE phpbb_forums_track (
-	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	mark_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	PRIMARY KEY (user_id, forum_id)
-);
-
-
-# Table: 'phpbb_forums_watch'
-CREATE TABLE phpbb_forums_watch (
-	forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	notify_status tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	KEY forum_id (forum_id),
-	KEY user_id (user_id),
-	KEY notify_stat (notify_status)
-);
-
-
-# Table: 'phpbb_groups'
-CREATE TABLE phpbb_groups (
-	group_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	group_type tinyint(4) DEFAULT '1' NOT NULL,
-	group_founder_manage tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	group_name blob NOT NULL,
-	group_desc blob NOT NULL,
-	group_desc_bitfield varbinary(255) DEFAULT '' NOT NULL,
-	group_desc_options int(11) UNSIGNED DEFAULT '7' NOT NULL,
-	group_desc_uid varbinary(8) DEFAULT '' NOT NULL,
-	group_display tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	group_avatar varbinary(255) DEFAULT '' NOT NULL,
-	group_avatar_type tinyint(2) DEFAULT '0' NOT NULL,
-	group_avatar_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
-	group_avatar_height smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
-	group_rank mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	group_colour varbinary(6) DEFAULT '' NOT NULL,
-	group_sig_chars mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	group_receive_pm tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	group_message_limit mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	group_legend tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	PRIMARY KEY (group_id),
-	KEY group_legend (group_legend)
-);
-
-
-# Table: 'phpbb_icons'
-CREATE TABLE phpbb_icons (
-	icons_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	icons_url varbinary(255) DEFAULT '' NOT NULL,
-	icons_width tinyint(4) DEFAULT '0' NOT NULL,
-	icons_height tinyint(4) DEFAULT '0' NOT NULL,
-	icons_order mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	display_on_posting tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	PRIMARY KEY (icons_id),
-	KEY display_on_posting (display_on_posting)
-);
-
-
-# Table: 'phpbb_lang'
-CREATE TABLE phpbb_lang (
-	lang_id tinyint(4) NOT NULL auto_increment,
-	lang_iso varbinary(30) DEFAULT '' NOT NULL,
-	lang_dir varbinary(30) DEFAULT '' NOT NULL,
-	lang_english_name blob NOT NULL,
-	lang_local_name blob NOT NULL,
-	lang_author blob NOT NULL,
-	PRIMARY KEY (lang_id),
-	KEY lang_iso (lang_iso)
-);
-
-
-# Table: 'phpbb_log'
-CREATE TABLE phpbb_log (
-	log_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	log_type tinyint(4) DEFAULT '0' NOT NULL,
-	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	reportee_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	log_ip varbinary(40) DEFAULT '' NOT NULL,
-	log_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	log_operation blob NOT NULL,
-	log_data mediumblob NOT NULL,
-	PRIMARY KEY (log_id),
-	KEY log_type (log_type),
-	KEY forum_id (forum_id),
-	KEY topic_id (topic_id),
-	KEY reportee_id (reportee_id),
-	KEY user_id (user_id)
-);
-
-
-# Table: 'phpbb_moderator_cache'
-CREATE TABLE phpbb_moderator_cache (
-	forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	username blob NOT NULL,
-	group_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	group_name blob NOT NULL,
-	display_on_index tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	KEY disp_idx (display_on_index),
-	KEY forum_id (forum_id)
-);
-
-
-# Table: 'phpbb_modules'
-CREATE TABLE phpbb_modules (
-	module_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	module_enabled tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	module_display tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	module_basename varbinary(255) DEFAULT '' NOT NULL,
-	module_class varbinary(10) DEFAULT '' NOT NULL,
-	parent_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	left_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	right_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	module_langname varbinary(255) DEFAULT '' NOT NULL,
-	module_mode varbinary(255) DEFAULT '' NOT NULL,
-	module_auth varbinary(255) DEFAULT '' NOT NULL,
-	PRIMARY KEY (module_id),
-	KEY left_right_id (left_id, right_id),
-	KEY module_enabled (module_enabled),
-	KEY class_left_id (module_class, left_id)
-);
-
-
-# Table: 'phpbb_poll_options'
-CREATE TABLE phpbb_poll_options (
-	poll_option_id tinyint(4) DEFAULT '0' NOT NULL,
-	topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	poll_option_text blob NOT NULL,
-	poll_option_total mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	KEY poll_opt_id (poll_option_id),
-	KEY topic_id (topic_id)
-);
-
-
-# Table: 'phpbb_poll_votes'
-CREATE TABLE phpbb_poll_votes (
-	topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	poll_option_id tinyint(4) DEFAULT '0' NOT NULL,
-	vote_user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	vote_user_ip varbinary(40) DEFAULT '' NOT NULL,
-	KEY topic_id (topic_id),
-	KEY vote_user_id (vote_user_id),
-	KEY vote_user_ip (vote_user_ip)
-);
-
-
-# Table: 'phpbb_posts'
-CREATE TABLE phpbb_posts (
-	post_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	poster_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	icon_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	poster_ip varbinary(40) DEFAULT '' NOT NULL,
-	post_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	post_approved tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	post_reported tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	enable_bbcode tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	enable_smilies tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	enable_magic_url tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	enable_sig tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	post_username blob NOT NULL,
-	post_subject blob NOT NULL,
-	post_text mediumblob NOT NULL,
-	post_checksum varbinary(32) DEFAULT '' NOT NULL,
-	post_attachment tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	bbcode_bitfield varbinary(255) DEFAULT '' NOT NULL,
-	bbcode_uid varbinary(8) DEFAULT '' NOT NULL,
-	post_postcount tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	post_edit_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	post_edit_reason blob NOT NULL,
-	post_edit_user mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	post_edit_count smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
-	post_edit_locked tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	PRIMARY KEY (post_id),
-	KEY forum_id (forum_id),
-	KEY topic_id (topic_id),
-	KEY poster_ip (poster_ip),
-	KEY poster_id (poster_id),
-	KEY post_approved (post_approved),
-	KEY tid_post_time (topic_id, post_time)
-);
-
-
-# Table: 'phpbb_privmsgs'
-CREATE TABLE phpbb_privmsgs (
-	msg_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	root_level mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	author_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	icon_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	author_ip varbinary(40) DEFAULT '' NOT NULL,
-	message_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	enable_bbcode tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	enable_smilies tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	enable_magic_url tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	enable_sig tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	message_subject blob NOT NULL,
-	message_text mediumblob NOT NULL,
-	message_edit_reason blob NOT NULL,
-	message_edit_user mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	message_attachment tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	bbcode_bitfield varbinary(255) DEFAULT '' NOT NULL,
-	bbcode_uid varbinary(8) DEFAULT '' NOT NULL,
-	message_edit_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	message_edit_count smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
-	to_address blob NOT NULL,
-	bcc_address blob NOT NULL,
-	PRIMARY KEY (msg_id),
-	KEY author_ip (author_ip),
-	KEY message_time (message_time),
-	KEY author_id (author_id),
-	KEY root_level (root_level)
-);
-
-
-# Table: 'phpbb_privmsgs_folder'
-CREATE TABLE phpbb_privmsgs_folder (
-	folder_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	folder_name blob NOT NULL,
-	pm_count mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	PRIMARY KEY (folder_id),
-	KEY user_id (user_id)
-);
-
-
-# Table: 'phpbb_privmsgs_rules'
-CREATE TABLE phpbb_privmsgs_rules (
-	rule_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	rule_check mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	rule_connection mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	rule_string blob NOT NULL,
-	rule_user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	rule_group_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	rule_action mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	rule_folder_id int(11) DEFAULT '0' NOT NULL,
-	PRIMARY KEY (rule_id),
-	KEY user_id (user_id)
-);
-
-
-# Table: 'phpbb_privmsgs_to'
-CREATE TABLE phpbb_privmsgs_to (
-	msg_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	author_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	pm_deleted tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	pm_new tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	pm_unread tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	pm_replied tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	pm_marked tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	pm_forwarded tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	folder_id int(11) DEFAULT '0' NOT NULL,
-	KEY msg_id (msg_id),
-	KEY author_id (author_id),
-	KEY usr_flder_id (user_id, folder_id)
-);
-
-
-# Table: 'phpbb_profile_fields'
-CREATE TABLE phpbb_profile_fields (
-	field_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	field_name blob NOT NULL,
-	field_type tinyint(4) DEFAULT '0' NOT NULL,
-	field_ident varbinary(20) DEFAULT '' NOT NULL,
-	field_length varbinary(20) DEFAULT '' NOT NULL,
-	field_minlen varbinary(255) DEFAULT '' NOT NULL,
-	field_maxlen varbinary(255) DEFAULT '' NOT NULL,
-	field_novalue blob NOT NULL,
-	field_default_value blob NOT NULL,
-	field_validation varbinary(60) DEFAULT '' NOT NULL,
-	field_required tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	field_show_on_reg tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	field_hide tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	field_no_view tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	field_active tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	field_order mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	PRIMARY KEY (field_id),
-	KEY fld_type (field_type),
-	KEY fld_ordr (field_order)
-);
-
-
-# Table: 'phpbb_profile_fields_data'
-CREATE TABLE phpbb_profile_fields_data (
-	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	PRIMARY KEY (user_id)
-);
-
-
-# Table: 'phpbb_profile_fields_lang'
-CREATE TABLE phpbb_profile_fields_lang (
-	field_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	lang_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	option_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	field_type tinyint(4) DEFAULT '0' NOT NULL,
-	lang_value blob NOT NULL,
-	PRIMARY KEY (field_id, lang_id, option_id)
-);
-
-
-# Table: 'phpbb_profile_lang'
-CREATE TABLE phpbb_profile_lang (
-	field_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	lang_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	lang_name blob NOT NULL,
-	lang_explain blob NOT NULL,
-	lang_default_value blob NOT NULL,
-	PRIMARY KEY (field_id, lang_id)
-);
-
-
-# Table: 'phpbb_ranks'
-CREATE TABLE phpbb_ranks (
-	rank_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	rank_title blob NOT NULL,
-	rank_min mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	rank_special tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	rank_image varbinary(255) DEFAULT '' NOT NULL,
-	PRIMARY KEY (rank_id)
-);
-
-
-# Table: 'phpbb_reports'
-CREATE TABLE phpbb_reports (
-	report_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	reason_id smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
-	post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	user_notify tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	report_closed tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	report_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	report_text mediumblob NOT NULL,
-	PRIMARY KEY (report_id)
-);
-
-
-# Table: 'phpbb_reports_reasons'
-CREATE TABLE phpbb_reports_reasons (
-	reason_id smallint(4) UNSIGNED NOT NULL auto_increment,
-	reason_title blob NOT NULL,
-	reason_description mediumblob NOT NULL,
-	reason_order smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
-	PRIMARY KEY (reason_id)
-);
-
-
-# Table: 'phpbb_search_results'
-CREATE TABLE phpbb_search_results (
-	search_key varbinary(32) DEFAULT '' NOT NULL,
-	search_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	search_keywords mediumblob NOT NULL,
-	search_authors mediumblob NOT NULL,
-	PRIMARY KEY (search_key)
-);
-
-
-# Table: 'phpbb_search_wordlist'
-CREATE TABLE phpbb_search_wordlist (
-	word_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	word_text blob NOT NULL,
-	word_common tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	word_count mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	PRIMARY KEY (word_id),
-	UNIQUE wrd_txt (word_text(255)),
-	KEY wrd_cnt (word_count)
-);
-
-
-# Table: 'phpbb_search_wordmatch'
-CREATE TABLE phpbb_search_wordmatch (
-	post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	word_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	title_match tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	UNIQUE unq_mtch (word_id, post_id, title_match),
-	KEY word_id (word_id),
-	KEY post_id (post_id)
-);
-
-
-# Table: 'phpbb_sessions'
-CREATE TABLE phpbb_sessions (
-	session_id binary(32) DEFAULT '' NOT NULL,
-	session_user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	session_last_visit int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	session_start int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	session_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	session_ip varbinary(40) DEFAULT '' NOT NULL,
-	session_browser varbinary(150) DEFAULT '' NOT NULL,
-	session_forwarded_for varbinary(255) DEFAULT '' NOT NULL,
-	session_page blob NOT NULL,
-	session_viewonline tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	session_autologin tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	session_admin tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	PRIMARY KEY (session_id),
-	KEY session_time (session_time),
-	KEY session_user_id (session_user_id)
-);
-
-
-# Table: 'phpbb_sessions_keys'
-CREATE TABLE phpbb_sessions_keys (
-	key_id binary(32) DEFAULT '' NOT NULL,
-	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	last_ip varbinary(40) DEFAULT '' NOT NULL,
-	last_login int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	PRIMARY KEY (key_id, user_id),
-	KEY last_login (last_login)
-);
-
-
-# Table: 'phpbb_sitelist'
-CREATE TABLE phpbb_sitelist (
-	site_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	site_ip varbinary(40) DEFAULT '' NOT NULL,
-	site_hostname varbinary(255) DEFAULT '' NOT NULL,
-	ip_exclude tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	PRIMARY KEY (site_id)
-);
-
-
-# Table: 'phpbb_smilies'
-CREATE TABLE phpbb_smilies (
-	smiley_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	code varbinary(150) DEFAULT '' NOT NULL,
-	emotion varbinary(150) DEFAULT '' NOT NULL,
-	smiley_url varbinary(50) DEFAULT '' NOT NULL,
-	smiley_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
-	smiley_height smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
-	smiley_order mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	display_on_posting tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	PRIMARY KEY (smiley_id),
-	KEY display_on_post (display_on_posting)
-);
-
-
-# Table: 'phpbb_styles'
-CREATE TABLE phpbb_styles (
-	style_id smallint(4) UNSIGNED NOT NULL auto_increment,
-	style_name blob NOT NULL,
-	style_copyright blob NOT NULL,
-	style_active tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	template_id smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
-	theme_id smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
-	imageset_id smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
-	PRIMARY KEY (style_id),
-	UNIQUE style_name (style_name(255)),
-	KEY template_id (template_id),
-	KEY theme_id (theme_id),
-	KEY imageset_id (imageset_id)
-);
-
-
-# Table: 'phpbb_styles_template'
-CREATE TABLE phpbb_styles_template (
-	template_id smallint(4) UNSIGNED NOT NULL auto_increment,
-	template_name blob NOT NULL,
-	template_copyright blob NOT NULL,
-	template_path varbinary(100) DEFAULT '' NOT NULL,
-	bbcode_bitfield varbinary(255) DEFAULT 'kNg=' NOT NULL,
-	template_storedb tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	PRIMARY KEY (template_id),
-	UNIQUE tmplte_nm (template_name(255))
-);
-
-
-# Table: 'phpbb_styles_template_data'
-CREATE TABLE phpbb_styles_template_data (
-	template_id smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
-	template_filename varbinary(100) DEFAULT '' NOT NULL,
-	template_included blob NOT NULL,
-	template_mtime int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	template_data mediumblob NOT NULL,
-	KEY tid (template_id),
-	KEY tfn (template_filename)
-);
-
-
-# Table: 'phpbb_styles_theme'
-CREATE TABLE phpbb_styles_theme (
-	theme_id smallint(4) UNSIGNED NOT NULL auto_increment,
-	theme_name blob NOT NULL,
-	theme_copyright blob NOT NULL,
-	theme_path varbinary(100) DEFAULT '' NOT NULL,
-	theme_storedb tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	theme_mtime int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	theme_data mediumblob NOT NULL,
-	PRIMARY KEY (theme_id),
-	UNIQUE theme_name (theme_name(255))
-);
-
-
-# Table: 'phpbb_styles_imageset'
-CREATE TABLE phpbb_styles_imageset (
-	imageset_id smallint(4) UNSIGNED NOT NULL auto_increment,
-	imageset_name blob NOT NULL,
-	imageset_copyright blob NOT NULL,
-	imageset_path varbinary(100) DEFAULT '' NOT NULL,
-	PRIMARY KEY (imageset_id),
-	UNIQUE imgset_nm (imageset_name(255))
-);
-
-
-# Table: 'phpbb_styles_imageset_data'
-CREATE TABLE phpbb_styles_imageset_data (
-	image_id smallint(4) UNSIGNED NOT NULL auto_increment,
-	image_name varbinary(200) DEFAULT '' NOT NULL,
-	image_filename varbinary(200) DEFAULT '' NOT NULL,
-	image_lang varbinary(30) DEFAULT '' NOT NULL,
-	image_height smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
-	image_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
-	imageset_id smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
-	PRIMARY KEY (image_id),
-	KEY i_d (imageset_id)
-);
-
-
-# Table: 'phpbb_topics'
-CREATE TABLE phpbb_topics (
-	topic_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	icon_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	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 blob NOT NULL,
-	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,
-	topic_views mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	topic_replies mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	topic_replies_real mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	topic_status tinyint(3) DEFAULT '0' NOT NULL,
-	topic_type tinyint(3) DEFAULT '0' NOT NULL,
-	topic_first_post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	topic_first_poster_name blob NOT NULL,
-	topic_first_poster_colour varbinary(6) DEFAULT '' NOT NULL,
-	topic_last_post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	topic_last_poster_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	topic_last_poster_name blob NOT NULL,
-	topic_last_poster_colour varbinary(6) DEFAULT '' NOT NULL,
-	topic_last_post_subject blob NOT NULL,
-	topic_last_post_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	topic_last_view_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	topic_moved_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	topic_bumped tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	topic_bumper mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	poll_title blob NOT NULL,
-	poll_start int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	poll_length int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	poll_max_options tinyint(4) DEFAULT '1' NOT NULL,
-	poll_last_vote int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	poll_vote_change tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	PRIMARY KEY (topic_id),
-	KEY forum_id (forum_id),
-	KEY forum_id_type (forum_id, topic_type),
-	KEY last_post_time (topic_last_post_time),
-	KEY topic_approved (topic_approved),
-	KEY forum_appr_last (forum_id, topic_approved, topic_last_post_id),
-	KEY fid_time_moved (forum_id, topic_last_post_time, topic_moved_id)
-);
-
-
-# Table: 'phpbb_topics_track'
-CREATE TABLE phpbb_topics_track (
-	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	mark_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	PRIMARY KEY (user_id, topic_id),
-	KEY forum_id (forum_id)
-);
-
-
-# Table: 'phpbb_topics_posted'
-CREATE TABLE phpbb_topics_posted (
-	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	topic_posted tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	PRIMARY KEY (user_id, topic_id)
-);
-
-
-# Table: 'phpbb_topics_watch'
-CREATE TABLE phpbb_topics_watch (
-	topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	notify_status tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	KEY topic_id (topic_id),
-	KEY user_id (user_id),
-	KEY notify_stat (notify_status)
-);
-
-
-# Table: 'phpbb_user_group'
-CREATE TABLE phpbb_user_group (
-	group_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	group_leader tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	user_pending tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	KEY group_id (group_id),
-	KEY user_id (user_id),
-	KEY group_leader (group_leader)
-);
-
-
-# Table: 'phpbb_users'
-CREATE TABLE phpbb_users (
-	user_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	user_type tinyint(2) DEFAULT '0' NOT NULL,
-	group_id mediumint(8) UNSIGNED DEFAULT '3' NOT NULL,
-	user_permissions mediumblob NOT NULL,
-	user_perm_from mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	user_ip varbinary(40) DEFAULT '' NOT NULL,
-	user_regdate int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	username blob NOT NULL,
-	username_clean blob NOT NULL,
-	user_password varbinary(120) DEFAULT '' NOT NULL,
-	user_passchg int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	user_pass_convert tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	user_email blob NOT NULL,
-	user_email_hash bigint(20) DEFAULT '0' NOT NULL,
-	user_birthday varbinary(10) DEFAULT '' NOT NULL,
-	user_lastvisit int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	user_lastmark int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	user_lastpost_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	user_lastpage blob NOT NULL,
-	user_last_confirm_key varbinary(10) DEFAULT '' NOT NULL,
-	user_last_search int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	user_warnings tinyint(4) DEFAULT '0' NOT NULL,
-	user_last_warning int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	user_login_attempts tinyint(4) DEFAULT '0' NOT NULL,
-	user_inactive_reason tinyint(2) DEFAULT '0' NOT NULL,
-	user_inactive_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	user_posts mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	user_lang varbinary(30) DEFAULT '' NOT NULL,
-	user_timezone decimal(5,2) DEFAULT '0' NOT NULL,
-	user_dst tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	user_dateformat varbinary(90) DEFAULT 'd M Y H:i' NOT NULL,
-	user_style smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
-	user_rank mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	user_colour varbinary(6) DEFAULT '' NOT NULL,
-	user_new_privmsg int(4) DEFAULT '0' NOT NULL,
-	user_unread_privmsg int(4) DEFAULT '0' NOT NULL,
-	user_last_privmsg int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	user_message_rules tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	user_full_folder int(11) DEFAULT '-3' NOT NULL,
-	user_emailtime int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	user_topic_show_days smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
-	user_topic_sortby_type varbinary(1) DEFAULT 't' NOT NULL,
-	user_topic_sortby_dir varbinary(1) DEFAULT 'd' NOT NULL,
-	user_post_show_days smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
-	user_post_sortby_type varbinary(1) DEFAULT 't' NOT NULL,
-	user_post_sortby_dir varbinary(1) DEFAULT 'a' NOT NULL,
-	user_notify tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	user_notify_pm tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	user_notify_type tinyint(4) DEFAULT '0' NOT NULL,
-	user_allow_pm tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	user_allow_viewonline tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	user_allow_viewemail tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	user_allow_massemail tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	user_options int(11) UNSIGNED DEFAULT '895' NOT NULL,
-	user_avatar varbinary(255) DEFAULT '' NOT NULL,
-	user_avatar_type tinyint(2) DEFAULT '0' NOT NULL,
-	user_avatar_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
-	user_avatar_height smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
-	user_sig mediumblob NOT NULL,
-	user_sig_bbcode_uid varbinary(8) DEFAULT '' NOT NULL,
-	user_sig_bbcode_bitfield varbinary(255) DEFAULT '' NOT NULL,
-	user_from blob NOT NULL,
-	user_icq varbinary(15) DEFAULT '' NOT NULL,
-	user_aim blob NOT NULL,
-	user_yim blob NOT NULL,
-	user_msnm blob NOT NULL,
-	user_jabber blob NOT NULL,
-	user_website blob NOT NULL,
-	user_occ blob NOT NULL,
-	user_interests blob NOT NULL,
-	user_actkey varbinary(32) DEFAULT '' NOT NULL,
-	user_newpasswd varbinary(120) DEFAULT '' NOT NULL,
-	user_form_salt varbinary(96) DEFAULT '' NOT NULL,
-	PRIMARY KEY (user_id),
-	KEY user_birthday (user_birthday),
-	KEY user_email_hash (user_email_hash),
-	KEY user_type (user_type),
-	UNIQUE username_clean (username_clean(255))
-);
-
-
-# Table: 'phpbb_warnings'
-CREATE TABLE phpbb_warnings (
-	warning_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	log_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	warning_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	PRIMARY KEY (warning_id)
-);
-
-
-# Table: 'phpbb_words'
-CREATE TABLE phpbb_words (
-	word_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	word blob NOT NULL,
-	replacement blob NOT NULL,
-	PRIMARY KEY (word_id)
-);
-
-
-# Table: 'phpbb_zebra'
-CREATE TABLE phpbb_zebra (
-	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	zebra_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	friend tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	foe tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	PRIMARY KEY (user_id, zebra_id)
-);
-
-
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_schema.sql
index 2d91b0259e..2d91b0259e 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_schema.sql