Fix for mysql_get_server_info() - database connect failed.

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9372 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ucorina 2011-09-27 10:04:32 +00:00
parent 12ca869ccd
commit a4ab618883
2 changed files with 3 additions and 3 deletions

View file

@ -739,7 +739,7 @@
&& $db_info->master_db["db_password"] == $db_info->slave_db[0]["db_password"]
&& $db_info->master_db["db_database"] == $db_info->slave_db[0]["db_database"]
)
$this->slave_db = &$this->master_db;
$this->slave_db[0] = &$this->master_db;
else
$this->slave_db = $db_info->slave_db;
$this->prefix = $db_info->master_db["db_table_prefix"];

View file

@ -69,7 +69,7 @@
return;
}
// Error appears if the version is lower than 4.1
if(mysql_get_server_info()<"4.1") {
if(mysql_get_server_info($result)<"4.1") {
$this->setError(-1, "XE cannot be installed under the version of mysql 4.1. Current mysql version is ".mysql_get_server_info());
return;
}
@ -79,7 +79,7 @@
$this->setError(mysql_errno(), mysql_error());
return;
}
return $result;
}