diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-07-31 11:58:29 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-07-31 11:58:29 +0200 |
| commit | 865e807125d1d3fb2d784ea33f1154ba999466ec (patch) | |
| tree | ea354d6e52e97f599bb5d3809295daae8c9fceeb /sql-common | |
| parent | 14306bcbec0b6a999985008f3d33602c08058006 (diff) | |
| parent | 4c21c367b332e4ebfff0b0c1f6f5140d5845588e (diff) | |
| download | mariadb-git-865e807125d1d3fb2d784ea33f1154ba999466ec.tar.gz | |
Merge branch '10.0' into 10.1
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 b1c2d9cf4e2..cf2d328cb22 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1463,6 +1463,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)))) { @@ -2582,6 +2583,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 |