diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-07-29 13:10:29 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-07-29 13:10:29 +0200 |
| commit | fceda2dab6f8ea6c042f910cbc1d07d5df0cbc3c (patch) | |
| tree | ea236e66130aad86ad9e87b83a261291a8119fad /sql-common | |
| parent | bd0b368119b48ffbb1e5ab3cd2887270c5c6840e (diff) | |
| parent | e48d775c6f066add457fa8cfb2ebc4d5ff0c7613 (diff) | |
| download | mariadb-git-fceda2dab6f8ea6c042f910cbc1d07d5df0cbc3c.tar.gz | |
Merge remote-tracking branch 'mysql/5.5' into 5.5
We do not accept:
1. We did not have this problem (fixed earlier and better)
d982e717aba67227ec40761a21a4211db91aa0e2 Bug#27510150: MYSQLDUMP FAILS FOR SPECIFIC --WHERE CLAUSES
2. We do not have such options (an DBUG_ASSERT put just in case)
bbc2e37fe4e0ca3a7cfa1437a763dc43829e98e2 Bug#27759871: BACKRONYM ISSUE IS STILL IN MYSQL 5.7
3. Serg fixed it in other way in this release:
e48d775c6f066add457fa8cfb2ebc4d5ff0c7613 Bug#27980823: HEAP OVERFLOW VULNERABILITIES IN MYSQL CLIENT LIBRARY
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index ec992f80e8d..952b6a199ee 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1598,6 +1598,7 @@ MYSQL_DATA *cli_read_rows(MYSQL *mysql,MYSQL_FIELD *mysql_fields, if ((pkt_len= cli_safe_read(mysql)) == packet_error) DBUG_RETURN(0); + if (pkt_len == 0) DBUG_RETURN(0); if (!(result=(MYSQL_DATA*) my_malloc(sizeof(MYSQL_DATA), MYF(MY_WME | MY_ZEROFILL)))) { @@ -2602,6 +2603,9 @@ static int send_client_reply_packet(MCPVIO_EXT *mpvio, enum enum_ssl_init_error ssl_init_error; const char *cert_error; unsigned long ssl_error; +#ifdef EMBEDDED_LIBRARY + DBUG_ASSERT(0); // embedded should not do SSL connect +#endif /* Send mysql->client_flag, max_packet_size - unencrypted otherwise |