mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
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
This commit is contained in:
parent
16af530e96
commit
f9589e5889
2 changed files with 6 additions and 9 deletions
|
@ -751,14 +751,11 @@ else
|
||||||
$row = $db->sql_fetchrow($result);
|
$row = $db->sql_fetchrow($result);
|
||||||
$version = $row['mysql_version'];
|
$version = $row['mysql_version'];
|
||||||
|
|
||||||
if( preg_match("/^(3\.23|4\.)/", $version) )
|
if( preg_match("/^(3\.23)|(4\.)/", $version) )
|
||||||
{
|
{
|
||||||
$sql = "ALTER TABLE " . $table_prefix . "sessions
|
$sql = "ALTER TABLE " . $table_prefix . "sessions
|
||||||
TYPE=HEAP";
|
TYPE=HEAP";
|
||||||
if( !$result = $db->sql_query($sql))
|
$db->sql_query($sql))
|
||||||
{
|
|
||||||
$error .= "Could not alter session table to HEAP type :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "<br /><br />";
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -778,7 +775,7 @@ else
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if( !$reinstall && ! $upgrade_now )
|
if( !$reinstall && !$upgrade_now )
|
||||||
{
|
{
|
||||||
$template->assign_block_vars("switch_common_install", array());
|
$template->assign_block_vars("switch_common_install", array());
|
||||||
|
|
||||||
|
|
|
@ -1895,11 +1895,11 @@ if( !empty($next) )
|
||||||
|
|
||||||
$version = $row['mysql_version'];
|
$version = $row['mysql_version'];
|
||||||
|
|
||||||
if( preg_match("/^(3\.23|4\.)/", $version) )
|
if( preg_match("/^(3\.23)|(4\.)/", $version) )
|
||||||
{
|
{
|
||||||
$sql = "ALTER TABLE " . $table_prefix . "sessions
|
$sql = "ALTER TABLE " . $table_prefix . "sessions
|
||||||
TYPE=HEAP";
|
TYPE=HEAP";
|
||||||
query($sql, "Couldn't alter sessions table type to HEAP");
|
$db->sql_query($sql);
|
||||||
}
|
}
|
||||||
|
|
||||||
echo "Done<br />\n";
|
echo "Done<br />\n";
|
||||||
|
|
Loading…
Add table
Reference in a new issue