diff --git a/includes/dbFacile.mysql.php b/includes/dbFacile.mysql.php index 9fd82c6983..bac21b0088 100644 --- a/includes/dbFacile.mysql.php +++ b/includes/dbFacile.mysql.php @@ -60,12 +60,12 @@ function dbQuery($sql, $parameters=array()) { /* - * Aquire a lock on a string + * Check a lock on a string * */ -function dbGetLock($data, $timeout = 0) { - $sql = 'SELECT GET_LOCK(\'' . $data . '\',' . $timeout . ')'; - $result = dbFetchCell($sql); - return $result; +function dbCheckLock($data, $timeout = 0) { + $sql = 'SELECT IS_FREE_LOCK(\'' . $data . '\')'; + $result = dbFetchCell($sql); + return $result; } @@ -76,8 +76,9 @@ function dbReleaseLock($data, $timeout = 0) { $sql = 'SELECT RELEASE_LOCK(\'' . $data . '\')'; $result = dbFetchCell($sql); return $result; - +} + /* * Passed an array and a table name, it attempts to insert the data into the table. * Check for boolean false to determine whether insert failed diff --git a/includes/dbFacile.mysqli.php b/includes/dbFacile.mysqli.php index 36b2208cb9..158a1dae5d 100644 --- a/includes/dbFacile.mysqli.php +++ b/includes/dbFacile.mysqli.php @@ -60,12 +60,12 @@ function dbQuery($sql, $parameters=array()) { /* - * Aquire a lock on a string + * Check a lock on a string * */ -function dbGetLock($data, $timeout = 0) { - $sql = 'SELECT GET_LOCK(\'' . $data . '\',' . $timeout . ')'; - $result = dbFetchCell($sql); - return $result; +function dbCheckLock($data, $timeout = 0) { + $sql = 'SELECT IS_FREE_LOCK(\'' . $data . '\')'; + $result = dbFetchCell($sql); + return $result; } @@ -76,6 +76,7 @@ function dbReleaseLock($data, $timeout = 0) { $sql = 'SELECT RELEASE_LOCK(\'' . $data . '\')'; $result = dbFetchCell($sql); return $result; +} /*