X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdb%2Fconnect_db_mysql.inc;h=622745ce7ab166a8056928d7fd0c55aacc205e19;hb=17b390efcf904072b02ec866b2a427490471a260;hp=301d49ddac1f55c796c7ada8f41c80ed59389c05;hpb=918e4561ac1adc980f79c9c3cdbcf8d250a7fdc0;p=fa-stable.git
diff --git a/includes/db/connect_db_mysql.inc b/includes/db/connect_db_mysql.inc
index 301d49dd..622745ce 100644
--- a/includes/db/connect_db_mysql.inc
+++ b/includes/db/connect_db_mysql.inc
@@ -42,7 +42,7 @@ function set_global_connection($company=-1)
function db_query($sql, $err_msg=null)
{
- global $db, $SysPres, $sql_queries, $Ajax, $db_connections, $db_last_inserted_id;
+ global $db, $SysPrefs, $sql_queries, $Ajax, $db_connections, $db_last_inserted_id;
// set current db prefix
$comp = isset($_SESSION["wa_current_user"]->cur_con) ? $_SESSION["wa_current_user"]->cur_con : 0;
@@ -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('
At file '.xdebug_call_file().':'.xdebug_call_line().':
'.$err_msg, $sql, $exit);
- else
- check_db_error($err_msg, $sql, $exit);
+ $err_msg = '
At file '.xdebug_call_file().':'.xdebug_call_line().':
'.$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);
@@ -183,8 +189,7 @@ function db_create_db($connection)
{
$db = mysql_connect($connection["host"] ,
$connection["dbuser"], $connection["dbpassword"]);
- if (strncmp(db_get_version(), "5.6", 3) >= 0)
- db_query("SET sql_mode = ''");
+
if (!mysql_select_db($connection["dbname"], $db))
{
$sql = "CREATE DATABASE IF NOT EXISTS " . $connection["dbname"] . "";