|
From: Paul S. O. <ps...@us...> - 2002-01-01 22:52:22
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv11777
Modified Files:
install.php upgrade.php
Log Message:
Removed failure on session table type change to HEAP, no biggie if it doesn't work
Index: install.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/install.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** install.php 2001/12/24 16:41:28 1.26
--- install.php 2002/01/01 22:52:18 1.27
***************
*** 1,5 ****
<?php
/***************************************************************************
! * install.php
* -------------------
* begin : Tuesday, Sept 11, 2001
--- 1,5 ----
<?php
/***************************************************************************
! * install.php
* -------------------
* begin : Tuesday, Sept 11, 2001
***************
*** 752,763 ****
$version = $row['mysql_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 />";
! }
}
}
--- 752,760 ----
$version = $row['mysql_version'];
! if( preg_match("/^(3\.23)|(4\.)/", $version) )
{
$sql = "ALTER TABLE " . $table_prefix . "sessions
TYPE=HEAP";
! $db->sql_query($sql))
}
}
***************
*** 779,783 ****
}
! if( !$reinstall && ! $upgrade_now )
{
$template->assign_block_vars("switch_common_install", array());
--- 776,780 ----
}
! if( !$reinstall && !$upgrade_now )
{
$template->assign_block_vars("switch_common_install", array());
Index: upgrade.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/upgrade.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** upgrade.php 2002/01/01 15:46:59 1.15
--- upgrade.php 2002/01/01 22:52:18 1.16
***************
*** 1896,1904 ****
$version = $row['mysql_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");
}
--- 1896,1904 ----
$version = $row['mysql_version'];
! if( preg_match("/^(3\.23)|(4\.)/", $version) )
{
$sql = "ALTER TABLE " . $table_prefix . "sessions
TYPE=HEAP";
! $db->sql_query($sql);
}
|