Commit r2391: https://sourceforge.net/p/mrbs/code/2391/
------------------------------------------------------------------------
r2391 | cimorrison | 2012-09-03 17:20:02 +0100 (Mon, 03 Sep 2012) | 1 line
Changed paths:
M /mrbs/trunk/web/mysql.inc
M /mrbs/trunk/web/mysqli.inc
Added some error checking to distinguish between GET_LOCK timing out and
returning an error.
------------------------------------------------------------------------
Index: mrbs/trunk/web/mysql.inc
===================================================================
--- mrbs/trunk/web/mysql.inc (revision 2390)
+++ mrbs/trunk/web/mysql.inc (revision 2391)
@@ -203,8 +203,16 @@
sql_mysql_ensure_handle($db_conn);
global $sql_mysql_mutex_shutdown_registered, $sql_mysql_mutex_unlock_name;
- if (!sql_mysql_query1("SELECT GET_LOCK('$name', 20)", $db_conn))
+
+ $r = sql_mysql_query("SELECT GET_LOCK('$name', 20)", $db_conn);
+ if (!$r)
{
+ // Distinguish between a timeout (GET_LOCK returns 0)
+ // and an error (GET_LOCK returns NULL)
+ if (!isset($r))
+ {
+ trigger_error(sql_mysql_error($db_conn), E_USER_WARNING);
+ }
return 0;
}
$sql_mysql_mutex_unlock_name = $name;
Index: mrbs/trunk/web/mysqli.inc
===================================================================
--- mrbs/trunk/web/mysqli.inc (revision 2390)
+++ mrbs/trunk/web/mysqli.inc (revision 2391)
@@ -210,8 +210,16 @@
sql_mysqli_ensure_handle($db_conn);
global $sql_mutex_shutdown_registered, $sql_mutex_unlock_name;
- if (!sql_mysqli_query1("SELECT GET_LOCK('$name', 20)", $db_conn))
+
+ $r = sql_mysqli_query("SELECT GET_LOCK('$name', 20)", $db_conn);
+ if (!$r)
{
+ // Distinguish between a timeout (GET_LOCK returns 0)
+ // and an error (GET_LOCK returns NULL)
+ if (!isset($r))
+ {
+ trigger_error(sql_mysqli_error($db_conn), E_USER_WARNING);
+ }
return 0;
}
$sql_mysqli_mutex_unlock_name = $name;
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
