diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-01-01 22:52:18 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-01-01 22:52:18 +0000 |
| commit | f9589e5889e21986e40e94ff011f1c2fa7cda6f6 (patch) | |
| tree | 4e1c47ea3b0a98384f7e3cf59d88a2e1c4aa0eca | |
| parent | 16af530e96f7ba2d1c4ccf95f69cdefe7800d9a2 (diff) | |
| download | forums-f9589e5889e21986e40e94ff011f1c2fa7cda6f6.tar forums-f9589e5889e21986e40e94ff011f1c2fa7cda6f6.tar.gz forums-f9589e5889e21986e40e94ff011f1c2fa7cda6f6.tar.bz2 forums-f9589e5889e21986e40e94ff011f1c2fa7cda6f6.tar.xz forums-f9589e5889e21986e40e94ff011f1c2fa7cda6f6.zip | |
Removed failure on session table type change to HEAP, no biggie if it doesn't work
git-svn-id: file:///svn/phpbb/trunk@1771 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/install.php | 11 | ||||
| -rw-r--r-- | phpBB/upgrade.php | 4 |
2 files changed, 6 insertions, 9 deletions
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"; |