mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Mechanical class renaming:
Protocol_simple->Protocol_text; Protocol_prep->Protocol_binary and also THD::protocol_simple->THD::protocol_text, THD::protocol_prep->THD::protocol_binary. Reason: the binary protocol is not bound to be used only with prepared statements long term (see WL#3559 "Decouple binary protocol from prepared statements"). Renaming now is pressing because the fix for BUG#735 "Prepared Statements: there is no support for Query Cache" will introduce a new member in class Query_cache_flags telling about the protocol's nature. Other reason: "simple" is less accurate than "text". Future patches for BUG#735 will rely on this cset.
This commit is contained in:
@ -825,7 +825,7 @@ int Protocol::begin_dataset()
|
||||
remove last row of current recordset
|
||||
|
||||
SYNOPSIS
|
||||
Protocol_simple::remove_last_row()
|
||||
Protocol_text::remove_last_row()
|
||||
|
||||
NOTES
|
||||
does the loop from the beginning of the current recordset to
|
||||
@ -833,12 +833,12 @@ int Protocol::begin_dataset()
|
||||
Not supposed to be frequently called.
|
||||
*/
|
||||
|
||||
void Protocol_simple::remove_last_row()
|
||||
void Protocol_text::remove_last_row()
|
||||
{
|
||||
MYSQL_DATA *data= thd->cur_data;
|
||||
MYSQL_ROWS **last_row_hook= &data->data;
|
||||
uint count= data->rows;
|
||||
DBUG_ENTER("Protocol_simple::remove_last_row");
|
||||
DBUG_ENTER("Protocol_text::remove_last_row");
|
||||
while (--count)
|
||||
last_row_hook= &(*last_row_hook)->next;
|
||||
|
||||
@ -967,7 +967,7 @@ bool Protocol::write()
|
||||
return false;
|
||||
}
|
||||
|
||||
bool Protocol_prep::write()
|
||||
bool Protocol_binary::write()
|
||||
{
|
||||
MYSQL_ROWS *cur;
|
||||
MYSQL_DATA *data= thd->cur_data;
|
||||
@ -1034,7 +1034,7 @@ void net_send_error_packet(THD *thd, uint sql_errno, const char *err)
|
||||
}
|
||||
|
||||
|
||||
void Protocol_simple::prepare_for_resend()
|
||||
void Protocol_text::prepare_for_resend()
|
||||
{
|
||||
MYSQL_ROWS *cur;
|
||||
MYSQL_DATA *data= thd->cur_data;
|
||||
@ -1058,7 +1058,7 @@ void Protocol_simple::prepare_for_resend()
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
|
||||
bool Protocol_simple::store_null()
|
||||
bool Protocol_text::store_null()
|
||||
{
|
||||
*(next_field++)= NULL;
|
||||
++next_mysql_field;
|
||||
|
Reference in New Issue
Block a user