diff --git a/phpBB/install.php b/phpBB/install.php
index 81d181bcbb..57df85c44a 100644
--- a/phpBB/install.php
+++ b/phpBB/install.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *                                 install.php
+ *                                install.php
  *                            -------------------
  *   begin                : Tuesday, Sept 11, 2001
  *   copyright            : (C) 2001 The phpBB Group
@@ -751,14 +751,11 @@ else
 					$row = $db->sql_fetchrow($result);
 					$version = $row['mysql_version'];
 
-					if( preg_match("/^(3\.23|4\.)/", $version) )
+					if( preg_match("/^(3\.23)|(4\.)/", $version) )
 					{
 						$sql = "ALTER TABLE " . $table_prefix . "sessions 
 							TYPE=HEAP";
-						if( !$result = $db->sql_query($sql))
-						{
-							$error .= "Could not alter session table to HEAP type :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "<br /><br />";
-						}
+						$db->sql_query($sql))
 					}
 				}
 			}
@@ -778,7 +775,7 @@ else
 			}
 		}
 
-		if( !$reinstall && ! $upgrade_now )
+		if( !$reinstall && !$upgrade_now )
 		{
 			$template->assign_block_vars("switch_common_install", array());
 
diff --git a/phpBB/upgrade.php b/phpBB/upgrade.php
index 99bf9f70cd..b1a0b846cd 100644
--- a/phpBB/upgrade.php
+++ b/phpBB/upgrade.php
@@ -1895,11 +1895,11 @@ if( !empty($next) )
 
 			$version = $row['mysql_version'];
 
-			if( preg_match("/^(3\.23|4\.)/", $version) )
+			if( preg_match("/^(3\.23)|(4\.)/", $version) )
 			{
 				$sql = "ALTER TABLE " . $table_prefix . "sessions 
 					TYPE=HEAP";
-				query($sql, "Couldn't alter sessions table type to HEAP");
+				$db->sql_query($sql);
 			}
 
 			echo "Done<br />\n";