Commit 3e9fe897 authored by Tim Schoondergang's avatar Tim Schoondergang
Browse files

Merge branch '32-function-ping-will-terminate-the-mysqlireportingexceptionon' into 'master'

Resolve "function ping will terminate the mysqliReportingExceptionOn"

Closes #32

See merge request !57
parents 0a056294 800fe23c
......@@ -297,8 +297,6 @@ class DB
return false;
}
mysqli_report(self::$mysqliReportingExceptionOn);
$returnValue = true;
try {
$result = mysqli_query($mlink, 'SELECT 1;');
......@@ -315,7 +313,6 @@ class DB
} catch (\Throwable $e) {
$returnValue = false;
}
mysqli_report(self::$mysqliReportingExceptionOff);
return $returnValue;
}
......@@ -352,7 +349,7 @@ class DB
}
} catch (\Exception $e) {
$errorno = mysqli_errno($mlink);
$error = mysqli_error(self::$mlink);
$error = mysqli_error($mlink);
switch ($errorno) {
case 1213:
if ($count < self::$max_deadlock_count) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment