X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdb%2Fconnect_db_mysqli.inc;h=0654c460e1ed2fd7b1a5f1b1a498d6bee7c93ff7;hb=fd11a3b500e79a3e98f7a3860f872cd31ce33113;hp=79e299e4e6ad9dd6e302e1cd0cca5964b6a24e81;hpb=bd8f517d30d1edd3261e26e582ddd9e11c555616;p=fa-stable.git
diff --git a/includes/db/connect_db_mysqli.inc b/includes/db/connect_db_mysqli.inc
index 79e299e4..0654c460 100644
--- a/includes/db/connect_db_mysqli.inc
+++ b/includes/db/connect_db_mysqli.inc
@@ -16,7 +16,7 @@ $db_last_inserted_id = 0;
function set_global_connection($company=-1)
{
- global $db, $path_to_root, $db_connections;
+ global $db, $path_to_root, $db_connections, $SysPrefs;
include ($path_to_root . "/config_db.php");
if ($company == -1)
@@ -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."'");
/////
+ $SysPrefs->refresh();
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('
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)
{
$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);
}
@@ -127,7 +134,7 @@ function db_escape($value = "", $nullify = false)
global $db;
$value = @html_entity_decode($value, ENT_QUOTES, $_SESSION['language']->encoding);
- $value = @htmlspecialchars($value, ENT_QUOTES, $_SESSION['language']->encoding);
+ $value = html_specials_encode($value);
//reset default if second parameter is skipped
$nullify = ($nullify === null) ? (false) : ($nullify);
@@ -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;
}