2 files changed, 10 insertions, 22 deletions
diff --git a/phpBB/install/install.php b/phpBB/install/install.php
index b9bb36276e..2980c9eef1 100644
--- a/phpBB/install/install.php
+++ b/phpBB/install/install.php
@@ -92,13 +92,20 @@ $available_dbms = array(
 		'DELIM'			=> ';',
 		'COMMENTS'		=> 'remove_remarks'
 	),
-	'mysql4'	=> array(
-		'LABEL'			=> 'MySQL 4.1.x',
+	'mysqli'	=> array(
+		'LABEL'			=> 'MySQL 4.1.x (MySQLi)',
 		'SCHEMA'		=> 'mysql',
 		'MODULE'		=> 'mysqli', 
 		'DELIM'			=> ';',
 		'COMMENTS'		=> 'remove_remarks'
 	),
+	'mysql4'	=> array(
+		'LABEL'			=> 'MySQL 4',
+		'SCHEMA'		=> 'mysql',
+		'MODULE'		=> 'mysql', 
+		'DELIM'			=> ';',
+		'COMMENTS'		=> 'remove_remarks'
+	),
 	'mssql'		=> array(
 		'LABEL'			=> 'MS SQL Server 7/2000',
 		'SCHEMA'		=> 'mssql',
@@ -106,13 +113,6 @@ $available_dbms = array(
 		'DELIM'			=> 'GO',
 		'COMMENTS'		=> 'remove_comments'
 	),
-	'msaccess' => array(
-		'LABEL'			=> 'MS Access [ ODBC ]',
-		'SCHEMA'		=> '',
-		'MODULE'		=> 'odbc', 
-		'DELIM'			=> '',
-		'COMMENTS'		=> ''
-	),
 	'mssql-odbc'=>	array(
 		'LABEL'			=> 'MS SQL Server [ ODBC ]',
 		'SCHEMA'		=> 'mssql',
@@ -1402,6 +1402,7 @@ function connect_check_db($error_connect, &$error, &$dbms, &$table_prefix, &$dbh
 		{
 			case 'mysql':
 			case 'mysql4':
+			case 'mysqli':
 				$sql = "SHOW TABLES";
 				$field = "Tables_in_{$dbname}";
 				break;
@@ -1414,13 +1415,6 @@ function connect_check_db($error_connect, &$error, &$dbms, &$table_prefix, &$dbh
 				$field = "name";
 				break;
 
-			case 'msaccess':
-				$sql = 'SELECT * FROM MSysObjects
-					WHERE Type = 1
-						AND Name Not Like "MSys*"';
-				$field = "Name";
-				break;
-
 			case 'postgres':
 				$sql = "SELECT relname 
 					FROM pg_class 
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 789505768b..a07eda57d7 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -1407,12 +1407,6 @@ ALTER TABLE [phpbb_ranks] WITH NOCHECK ADD
 	CONSTRAINT [DF_ranks__rank_special] DEFAULT (0) FOR [rank_special]
 GO
 
-ALTER TABLE [phpbb_ratings] WITH NOCHECK ADD 
-	CONSTRAINT [DF_rating_post_id] DEFAULT (0) FOR [post_id],
-	CONSTRAINT [DF_rating_user_id] DEFAULT (0) FOR [user_id],
-	CONSTRAINT [DF_rating_rating] DEFAULT (0) FOR [rating]
-GO
-
 ALTER TABLE [phpbb_reports] WITH NOCHECK ADD 
 	CONSTRAINT [DF_report_reason_id] DEFAULT (0) FOR [reason_id],
 	CONSTRAINT [DF_report_post_id] DEFAULT (0) FOR [post_id],