From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Thu, 19 Feb 2015 19:51:16 +0000 (+0100)
Subject: Added mysql query retry after database deadlock detection.
X-Git-Tag: v2.4.2~19^2~249
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=a721b65478fd2a264b470e1265e69cf829031e7a;p=fa-stable.git

Added mysql query retry after database deadlock detection.
---

diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc
index a689946b..147f4a5f 100644
--- a/includes/db/connect_db.inc
+++ b/includes/db/connect_db.inc
@@ -10,7 +10,7 @@
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 //$path_to_root="..";
-
+define('MAX_DEADLOCK_RETRY', 3);
 
 if (function_exists('mysqli_connect'))
 	include_once("connect_db_mysqli.inc");
diff --git a/includes/db/connect_db_mysql.inc b/includes/db/connect_db_mysql.inc
index 26067214..622745ce 100644
--- a/includes/db/connect_db_mysql.inc
+++ b/includes/db/connect_db_mysql.inc
@@ -57,7 +57,14 @@ function db_query($sql, $err_msg=null)
 
 	db_profile(); // mysql profiling
 
-	$result = mysql_query($sql, $db);
+	$retry = MAX_DEADLOCK_RETRY;
+	do {
+		$result = mysql_query($db, $sql);
+		if (mysql_errno($db) == 1213)	{ // deadlock detected
+			sleep(1); $retry--;
+		} else
+			$retry = 0;
+	} while ($retry);
 
 	db_profile($sql);
 
@@ -75,48 +82,47 @@ function db_query($sql, $err_msg=null)
 	if ($err_msg != null || $SysPrefs->go_debug) {
 		$exit = $err_msg != null;
 		if (function_exists('xdebug_call_file'))
-			check_db_error('<br>At file '.xdebug_call_file().':'.xdebug_call_line().':<br>'.$err_msg, $sql, $exit);
-		else
-			check_db_error($err_msg, $sql, $exit);
+			$err_msg = '<br>At file '.xdebug_call_file().':'.xdebug_call_line().':<br>'.$err_msg;
+		check_db_error($err_msg, $sql, $exit);
 	}
 	return $result;
 }
 
-function db_fetch_row ($result)
+function db_fetch_row($result)
 {
 
 	return mysql_fetch_row($result);
 }
 
-function db_fetch_assoc ($result)
+function db_fetch_assoc($result)
 {
 
 	return mysql_fetch_assoc($result);
 }
 
-function db_fetch ($result)
+function db_fetch($result)
 {
 
 	return mysql_fetch_array($result);
 }
 
-function db_seek (&$result,$record)
+function db_seek(&$result,$record)
 {
 	return mysql_data_seek($result, $record);
 }
 
-function db_free_result ($result)
+function db_free_result($result)
 {
 	if ($result)
 		mysql_free_result($result);
 }
 
-function db_num_rows ($result)
+function db_num_rows($result)
 {
 	return mysql_num_rows($result);
 }
 
-function db_num_fields ($result)
+function db_num_fields($result)
 {
 	return mysql_num_fields($result);
 }
@@ -150,7 +156,7 @@ function db_escape($value = "", $nullify = false)
 	return $value;
 }
 
-function db_error_no ()
+function db_error_no()
 {
 	global $db;
 	return mysql_errno($db);
diff --git a/includes/db/connect_db_mysqli.inc b/includes/db/connect_db_mysqli.inc
index 45439f04..65b4a339 100644
--- a/includes/db/connect_db_mysqli.inc
+++ b/includes/db/connect_db_mysqli.inc
@@ -60,7 +60,14 @@ function db_query($sql, $err_msg=null)
 
 	db_profile(); // mysql profiling
 
-	$result = mysqli_query($db, $sql);
+	$retry = MAX_DEADLOCK_RETRY;
+	do {
+		$result = mysqli_query($db, $sql);
+		if (mysqli_errno($db) == 1213)	{ // deadlock detected
+			sleep(1); $retry--;
+		} else
+			$retry = 0;
+	} while ($retry);
 
 	db_profile($sql);
 
@@ -77,48 +84,47 @@ function db_query($sql, $err_msg=null)
 	if ($err_msg != null || $SysPrefs->go_debug) {
 		$exit = $err_msg != null;
 		if (function_exists('xdebug_call_file'))
-			check_db_error('<br>At file '.xdebug_call_file().':'.xdebug_call_line().':<br>'.$err_msg, $sql, $exit);
-		else
-			check_db_error($err_msg, $sql, $exit);
+			$err_msg = '<br>At file '.xdebug_call_file().':'.xdebug_call_line().':<br>'.$err_msg;
+		check_db_error($err_msg, $sql, $exit);
 	}
 	return $result;
 }
 
-function db_fetch_row ($result)
+function db_fetch_row($result)
 {
 	$ret = mysqli_fetch_row($result);
 	return ($ret === null ? false : $ret);
 }
 
-function db_fetch_assoc ($result)
+function db_fetch_assoc($result)
 {
 	$ret = mysqli_fetch_assoc($result);
 	return ($ret === null ? false : $ret);
 }
 
-function db_fetch ($result)
+function db_fetch($result)
 {
 	$ret = mysqli_fetch_array($result);
 	return ($ret === null ? false : $ret);
 }
 
-function db_seek (&$result,$record)
+function db_seek(&$result,$record)
 {
 	return mysqli_data_seek($result, $record);
 }
 
-function db_free_result ($result)
+function db_free_result($result)
 {
 	if ($result)
 		mysqli_free_result($result);
 }
 
-function db_num_rows ($result)
+function db_num_rows($result)
 {
 	return mysqli_num_rows($result);
 }
 
-function db_num_fields ($result)
+function db_num_fields($result)
 {
 	return mysqli_num_fields($result);
 }
@@ -150,7 +156,7 @@ function db_escape($value = "", $nullify = false)
 	return $value;
 }
 
-function db_error_no ()
+function db_error_no()
 {
 	global $db;
     return mysqli_errno($db);