com php-src: Make "MySQL server has gone away" errors more consistent: ext/mysqli/tests/mysqli_change_user_new.phpt ext/mysq
li/tests/mysqli_mysqlnd_read_timeout.phpt ext/mysqli/ tests/mysqli_pconn_max_links.phpt ext/mysqlnd/mysqlnd _result.c
ext/mysqlnd/mysqlnd_wireprotocol.c
| From: | Nikita Popov | Date: | Mon, 03 Jun 2019 12:27:47 +0000 |
| Subject: | com php-src: Make "MySQL server has gone away" errors more consistent: ext/mysqli/tests/mysqli_change_user_new.phpt ext/mysq li/tests/mysqli_mysqlnd_read_timeout.phpt ext/mysqli/ tests/mysqli_pconn_max_links.phpt ext/mysqlnd/mysqlnd _result.c ext/mysqlnd/mysqlnd_wireprotocol.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-106529@lists.php.net to get a copy of this message | ||
Commit: 2856afc70e50b85424b2bd2d6653020679160a0b
Author: Nikita Popov <nikita.ppv@gmail.com> Mon, 3 Jun 2019 12:47:48 +0200
Parents: cf9fd3735a5864595b507c115dcf7ec8a0881ee7
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2856afc70e50b85424b2bd2d6653020679160a0b
Log:
Make "MySQL server has gone away" errors more consistent
Don't generate explicit warnings for these in two places, use usual
error handling mechanism. Additionally suppress a number of warnings
if the server has gone away.
Changed paths:
M ext/mysqli/tests/mysqli_change_user_new.phpt
M ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt
M ext/mysqli/tests/mysqli_pconn_max_links.phpt
M ext/mysqlnd/mysqlnd_result.c
M ext/mysqlnd/mysqlnd_wireprotocol.c
Diff:
diff --git a/ext/mysqli/tests/mysqli_change_user_new.phpt
b/ext/mysqli/tests/mysqli_change_user_new.phpt
index ec6b3e3..e9ef937 100644
--- a/ext/mysqli/tests/mysqli_change_user_new.phpt
+++ b/ext/mysqli/tests/mysqli_change_user_new.phpt
@@ -35,9 +35,6 @@ if (mysqli_get_server_version($link) < 50600)
print "done!";
?>
---EXPECTF--
-Warning: mysqli_query(): MySQL server has gone away in %s on line %d
-
-Warning: mysqli_query(): Error reading result set's header in %s on line %d
+--EXPECT--
[003] [2006] MySQL server has gone away
done!
diff --git a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt
b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt
index 7dbdc13..4f65f77 100644
--- a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt
+++ b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt
@@ -28,9 +28,6 @@ mysqlnd.net_read_timeout=1
print "done!";
?>
---EXPECTF--
-Warning: mysqli_query(): MySQL server has gone away in %s on line %d
-
-Warning: mysqli_query(): Error reading result set's header in %s on line %d
-[002] [%d] %s
+--EXPECT--
+[002] [2006] MySQL server has gone away
done!
diff --git a/ext/mysqli/tests/mysqli_pconn_max_links.phpt
b/ext/mysqli/tests/mysqli_pconn_max_links.phpt
index 4b610c3..221be06 100644
--- a/ext/mysqli/tests/mysqli_pconn_max_links.phpt
+++ b/ext/mysqli/tests/mysqli_pconn_max_links.phpt
@@ -234,10 +234,6 @@ Before second pconnect:array(3) {
["cached_plinks"]=>
int(0)
}
-
-Warning: main(): MySQL server has gone away in %s on line %d
-
-Warning: main(): Error reading result set's header in %s line %d
After second pconnect:array(3) {
["total"]=>
int(1)
diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c
index 3f3630d..5c6eedd 100644
--- a/ext/mysqlnd/mysqlnd_result.c
+++ b/ext/mysqlnd/mysqlnd_result.c
@@ -391,7 +391,9 @@ mysqlnd_query_read_result_set_header(MYSQLND_CONN_DATA * conn, MYSQLND_STMT * s)
UPSERT_STATUS_SET_AFFECTED_ROWS_TO_ERROR(conn->upsert_status);
if (FAIL == (ret = PACKET_READ(conn, &rset_header))) {
- php_error_docref(NULL, E_WARNING, "Error reading result set's header");
+ if (conn->error_info->error_no != CR_SERVER_GONE_ERROR) {
+ php_error_docref(NULL, E_WARNING, "Error reading result set's header");
+ }
break;
}
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c
index a85629d..b56a92c 100644
--- a/ext/mysqlnd/mysqlnd_wireprotocol.c
+++ b/ext/mysqlnd/mysqlnd_wireprotocol.c
@@ -296,7 +296,6 @@ mysqlnd_read_packet_header_and_body(MYSQLND_PACKET_HEADER * packet_header,
if (FAIL == mysqlnd_read_header(pfc, vio, packet_header, stats, error_info)) {
SET_CONNECTION_STATE(connection_state, CONN_QUIT_SENT);
SET_CLIENT_ERROR(error_info, CR_SERVER_GONE_ERROR, UNKNOWN_SQLSTATE, mysqlnd_server_gone);
- php_error_docref(NULL, E_WARNING, "%s", mysqlnd_server_gone);
DBG_ERR_FMT("Can't read %s's header", packet_type_as_text);
DBG_RETURN(FAIL);
}
@@ -308,7 +307,6 @@ mysqlnd_read_packet_header_and_body(MYSQLND_PACKET_HEADER * packet_header,
if (FAIL == pfc->data->m.receive(pfc, vio, buf, packet_header->size, stats, error_info))
{
SET_CONNECTION_STATE(connection_state, CONN_QUIT_SENT);
SET_CLIENT_ERROR(error_info, CR_SERVER_GONE_ERROR, UNKNOWN_SQLSTATE, mysqlnd_server_gone);
- php_error_docref(NULL, E_WARNING, "%s", mysqlnd_server_gone);
DBG_ERR_FMT("Empty '%s' packet body", packet_type_as_text);
DBG_RETURN(FAIL);
}
@@ -2532,7 +2530,7 @@ MYSQLND_METHOD(mysqlnd_protocol, send_command)(
MYSQLND_INC_CONN_STATISTIC(stats, STAT_COM_QUIT + command - 1 /* because of COM_SLEEP */ );
if (! PACKET_WRITE(payload_decoder_factory->conn, &cmd_packet)) {
- if (!silent) {
+ if (!silent && error_info->error_no != CR_SERVER_GONE_ERROR) {
DBG_ERR_FMT("Error while sending %s packet", mysqlnd_command_to_text[command]);
php_error(E_WARNING, "Error while sending %s packet. PID=%d",
mysqlnd_command_to_text[command], getpid());
}