diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-07-30 15:09:25 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-07-30 15:09:25 +0300 |
| commit | 91181b225c574f65720b9ecf218a4122209a7248 (patch) | |
| tree | 5a9c835e8823f29ee26f8b56a3458607448188a1 /sql-common | |
| parent | d17e9a02c4a08da9ac1b8f4c653f29f067d75a22 (diff) | |
| parent | fceda2dab6f8ea6c042f910cbc1d07d5df0cbc3c (diff) | |
| download | mariadb-git-91181b225c574f65720b9ecf218a4122209a7248.tar.gz | |
Merge 5.5 into 10.0
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 8c093abf7e0..d78e6167809 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1462,6 +1462,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)))) { @@ -2579,6 +2580,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 |