Remove multi-packet additions to response parsing

The additions to the packet parsing code weren't necessary once the
statement output change was reverted.
This commit is contained in:
Markus Mäkelä
2017-04-04 09:55:24 +03:00
parent 5037646846
commit 8fe31f360d
6 changed files with 64 additions and 105 deletions

View File

@ -62,12 +62,10 @@ GWBUF* modutil_create_mysql_err_msg(int packet_number,
* @param reply Buffer to use
* @param n_found Number of previous found packets
* @param more Set to true of more results exist
* @param offset_out Initial offset into the buffer. This offset is set to point
* to the first byte after the last packet in the buffer.
*
* @return Total number of EOF and ERR packets including the ones already found
*/
int modutil_count_signal_packets(GWBUF *reply, int n_found, bool* more, size_t* offset_out);
int modutil_count_signal_packets(GWBUF *reply, int n_found, bool* more);
mxs_pcre2_result_t modutil_mysql_wildcard_match(const char* pattern, const char* string);

View File

@ -432,21 +432,19 @@ bool mxs_mysql_is_ok_packet(GWBUF *buffer);
* @brief Check if a buffer contains a result set
*
* @param buffer Buffer to check
* @param offset Offset into the buffer
*
* @return True if the @c buffer at @c offset contains the start of a result set
* @return True if the @c buffer contains the start of a result set
*/
bool mxs_mysql_is_result_set(GWBUF *buffer, size_t offset);
bool mxs_mysql_is_result_set(GWBUF *buffer);
/**
* @brief Check if the OK packet is followed by another result
*
* @param buffer Buffer to check
* @param offset Offset into the buffer
*
* @return True if more results are expected
*/
bool mxs_mysql_more_results_after_ok(GWBUF *buffer, size_t extra_offset);
bool mxs_mysql_more_results_after_ok(GWBUF *buffer);
/** Get current command for a session */
mysql_server_cmd_t mxs_mysql_current_command(MXS_SESSION* session);