Merge from 1.5.2.2

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10519 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-04-02 09:30:09 +00:00
parent 9bf08cf3df
commit 361cd64c16
86 changed files with 804 additions and 156 deletions

View file

@ -82,6 +82,9 @@
$cubrid_version = $cubrid_version_elem[0] . '.' . $cubrid_version_elem[1] . '.' . $cubrid_version_elem[2];
define('__CUBRID_VERSION__', $cubrid_version);
}
if(__CUBRID_VERSION__ >= '8.4.0')
cubrid_set_autocommit($result, CUBRID_AUTOCOMMIT_TRUE);
return $result;
}
@ -127,7 +130,12 @@
**/
function _begin()
{
return true;
if(__CUBRID_VERSION__ >= '8.4.0')
{
$connection = $this->_getConnection('master');
cubrid_set_autocommit($connection, CUBRID_AUTOCOMMIT_FALSE);
}
return true;
}
/**
@ -135,9 +143,9 @@
**/
function _rollback()
{
$connection = $this->_getConnection('master');
$connection = $this->_getConnection('master');
@cubrid_rollback ($connection);
return true;
return true;
}
/**
@ -145,9 +153,9 @@
**/
function _commit()
{
$connection = $this->_getConnection('master');
$connection = $this->_getConnection('master');
@cubrid_commit($connection);
return true;
return true;
}
/**