Added mysql query retry after database deadlock detection.

diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc
index a689946b8637a96e1218fec77133c3677bb510e2..147f4a5f7972ae3d7d48ae2247f54955f6a89fa9 100644 (file)
--- 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 2606721443d7db758930482dcde01d80d403efb3..622745ce7ab166a8056928d7fd0c55aacc205e19 100644 (file)
--- 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 45439f047cec8d71a0626bd13dbc17ab931e4658..65b4a339080000f143a5f6a94deb678f8e7ec041 100644 (file)
--- 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);