Added mysql query retry after database deadlock detection.

[fa-stable.git] / includes / db / connect_db_mysqli.inc

diff --git a/includes/db/connect_db_mysqli.inc b/includes/db/connect_db_mysqli.inc
index 8900598a674cf172a182848c253323e09ef28086..65b4a339080000f143a5f6a94deb678f8e7ec041 100644 (file)
--- a/includes/db/connect_db_mysqli.inc
+++ b/includes/db/connect_db_mysqli.inc
@@ -37,6 +37,7 @@ function set_global_connection($company=-1)
        ///// We are, however, investigating the existing code to be compatible in the future.
                db_query("SET sql_mode = '".SQL_MODE."'");
        /////
+       refresh_sys_prefs();
        return $db;
 }
 
@@ -59,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);
 
@@ -76,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);
 }
@@ -149,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);
@@ -182,11 +189,10 @@ function db_field_name($result, $n)
 function db_create_db($connection)
 {
        $db = mysqli_connect($connection["host"], $connection["dbuser"], $connection["dbpassword"]);
-       if (strncmp(db_get_version(), "5.6", 3) >= 0) 
-               db_query("SET sql_mode = ''");
+
        if (!mysqli_select_db($db, $connection["dbname"]))
        {
-               $sql = "CREATE DATABASE IF NOT EXISTS " . $connection["dbname"] . "";
+               $sql = "CREATE DATABASE IF NOT EXISTS `" . $connection["dbname"] . "`";
                if (!mysqli_query($db, $sql) || !mysqli_select_db($db, $connection["dbname"]))
                        return 0;
        }