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;
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);
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);
}
function db_escape($value = "", $nullify = false)
{
$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);
return $value;
}
-function db_error_no ()
+function db_error_no()
{
global $db;
return mysql_errno($db);
{
$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"] . "";