manual merge
libmysqld/lib_sql.cc: Auto merged sql/protocol.cc: Auto merged sql/protocol.h: Auto merged sql/set_var.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_prepare.cc: merge
This commit is contained in:
unknown
commit
dfd93a8f96
@ -822,7 +822,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
|
||||
@ -830,12 +830,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;
|
||||
|
||||
@ -964,7 +964,7 @@ bool Protocol::write()
|
||||
return false;
|
||||
}
|
||||
|
||||
bool Protocol_prep::write()
|
||||
bool Protocol_binary::write()
|
||||
{
|
||||
MYSQL_ROWS *cur;
|
||||
MYSQL_DATA *data= thd->cur_data;
|
||||
@ -1031,7 +1031,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;
|
||||
@ -1056,7 +1056,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;
|
||||
|
||||
@ -35,7 +35,7 @@ static void write_eof_packet(THD *thd, NET *net);
|
||||
#ifndef EMBEDDED_LIBRARY
|
||||
bool Protocol::net_store_data(const char *from, uint length)
|
||||
#else
|
||||
bool Protocol_prep::net_store_data(const char *from, uint length)
|
||||
bool Protocol_binary::net_store_data(const char *from, uint length)
|
||||
#endif
|
||||
{
|
||||
ulong packet_length=packet->length();
|
||||
@ -557,7 +557,7 @@ bool Protocol::send_fields(List<Item> *list, uint flags)
|
||||
Item *item;
|
||||
char buff[80];
|
||||
String tmp((char*) buff,sizeof(buff),&my_charset_bin);
|
||||
Protocol_simple prot(thd);
|
||||
Protocol_text prot(thd);
|
||||
String *local_packet= prot.storage_packet();
|
||||
CHARSET_INFO *thd_charset= thd->variables.character_set_results;
|
||||
DBUG_ENTER("send_fields");
|
||||
@ -760,7 +760,7 @@ bool Protocol::store(I_List<i_string>* str_list)
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef EMBEDDED_LIBRARY
|
||||
void Protocol_simple::prepare_for_resend()
|
||||
void Protocol_text::prepare_for_resend()
|
||||
{
|
||||
packet->length(0);
|
||||
#ifndef DBUG_OFF
|
||||
@ -768,7 +768,7 @@ void Protocol_simple::prepare_for_resend()
|
||||
#endif
|
||||
}
|
||||
|
||||
bool Protocol_simple::store_null()
|
||||
bool Protocol_text::store_null()
|
||||
{
|
||||
#ifndef DBUG_OFF
|
||||
field_pos++;
|
||||
@ -801,7 +801,7 @@ bool Protocol::store_string_aux(const char *from, uint length,
|
||||
}
|
||||
|
||||
|
||||
bool Protocol_simple::store(const char *from, uint length,
|
||||
bool Protocol_text::store(const char *from, uint length,
|
||||
CHARSET_INFO *fromcs, CHARSET_INFO *tocs)
|
||||
{
|
||||
#ifndef DBUG_OFF
|
||||
@ -817,7 +817,7 @@ bool Protocol_simple::store(const char *from, uint length,
|
||||
}
|
||||
|
||||
|
||||
bool Protocol_simple::store(const char *from, uint length,
|
||||
bool Protocol_text::store(const char *from, uint length,
|
||||
CHARSET_INFO *fromcs)
|
||||
{
|
||||
CHARSET_INFO *tocs= this->thd->variables.character_set_results;
|
||||
@ -834,7 +834,7 @@ bool Protocol_simple::store(const char *from, uint length,
|
||||
}
|
||||
|
||||
|
||||
bool Protocol_simple::store_tiny(longlong from)
|
||||
bool Protocol_text::store_tiny(longlong from)
|
||||
{
|
||||
#ifndef DBUG_OFF
|
||||
DBUG_ASSERT(field_types == 0 || field_types[field_pos] == MYSQL_TYPE_TINY);
|
||||
@ -846,7 +846,7 @@ bool Protocol_simple::store_tiny(longlong from)
|
||||
}
|
||||
|
||||
|
||||
bool Protocol_simple::store_short(longlong from)
|
||||
bool Protocol_text::store_short(longlong from)
|
||||
{
|
||||
#ifndef DBUG_OFF
|
||||
DBUG_ASSERT(field_types == 0 ||
|
||||
@ -860,7 +860,7 @@ bool Protocol_simple::store_short(longlong from)
|
||||
}
|
||||
|
||||
|
||||
bool Protocol_simple::store_long(longlong from)
|
||||
bool Protocol_text::store_long(longlong from)
|
||||
{
|
||||
#ifndef DBUG_OFF
|
||||
DBUG_ASSERT(field_types == 0 ||
|
||||
@ -874,7 +874,7 @@ bool Protocol_simple::store_long(longlong from)
|
||||
}
|
||||
|
||||
|
||||
bool Protocol_simple::store_longlong(longlong from, bool unsigned_flag)
|
||||
bool Protocol_text::store_longlong(longlong from, bool unsigned_flag)
|
||||
{
|
||||
#ifndef DBUG_OFF
|
||||
DBUG_ASSERT(field_types == 0 ||
|
||||
@ -889,7 +889,7 @@ bool Protocol_simple::store_longlong(longlong from, bool unsigned_flag)
|
||||
}
|
||||
|
||||
|
||||
bool Protocol_simple::store_decimal(const my_decimal *d)
|
||||
bool Protocol_text::store_decimal(const my_decimal *d)
|
||||
{
|
||||
#ifndef DBUG_OFF
|
||||
DBUG_ASSERT(field_types == 0 ||
|
||||
@ -903,7 +903,7 @@ bool Protocol_simple::store_decimal(const my_decimal *d)
|
||||
}
|
||||
|
||||
|
||||
bool Protocol_simple::store(float from, uint32 decimals, String *buffer)
|
||||
bool Protocol_text::store(float from, uint32 decimals, String *buffer)
|
||||
{
|
||||
#ifndef DBUG_OFF
|
||||
DBUG_ASSERT(field_types == 0 ||
|
||||
@ -915,7 +915,7 @@ bool Protocol_simple::store(float from, uint32 decimals, String *buffer)
|
||||
}
|
||||
|
||||
|
||||
bool Protocol_simple::store(double from, uint32 decimals, String *buffer)
|
||||
bool Protocol_text::store(double from, uint32 decimals, String *buffer)
|
||||
{
|
||||
#ifndef DBUG_OFF
|
||||
DBUG_ASSERT(field_types == 0 ||
|
||||
@ -927,7 +927,7 @@ bool Protocol_simple::store(double from, uint32 decimals, String *buffer)
|
||||
}
|
||||
|
||||
|
||||
bool Protocol_simple::store(Field *field)
|
||||
bool Protocol_text::store(Field *field)
|
||||
{
|
||||
if (field->is_null())
|
||||
return store_null();
|
||||
@ -961,7 +961,7 @@ bool Protocol_simple::store(Field *field)
|
||||
*/
|
||||
|
||||
|
||||
bool Protocol_simple::store(TIME *tm)
|
||||
bool Protocol_text::store(TIME *tm)
|
||||
{
|
||||
#ifndef DBUG_OFF
|
||||
DBUG_ASSERT(field_types == 0 ||
|
||||
@ -984,7 +984,7 @@ bool Protocol_simple::store(TIME *tm)
|
||||
}
|
||||
|
||||
|
||||
bool Protocol_simple::store_date(TIME *tm)
|
||||
bool Protocol_text::store_date(TIME *tm)
|
||||
{
|
||||
#ifndef DBUG_OFF
|
||||
DBUG_ASSERT(field_types == 0 ||
|
||||
@ -1003,7 +1003,7 @@ bool Protocol_simple::store_date(TIME *tm)
|
||||
we support 0-6 decimals for time.
|
||||
*/
|
||||
|
||||
bool Protocol_simple::store_time(TIME *tm)
|
||||
bool Protocol_text::store_time(TIME *tm)
|
||||
{
|
||||
#ifndef DBUG_OFF
|
||||
DBUG_ASSERT(field_types == 0 ||
|
||||
@ -1043,7 +1043,7 @@ bool Protocol_simple::store_time(TIME *tm)
|
||||
[..]..[[length]data] data
|
||||
****************************************************************************/
|
||||
|
||||
bool Protocol_prep::prepare_for_send(List<Item> *item_list)
|
||||
bool Protocol_binary::prepare_for_send(List<Item> *item_list)
|
||||
{
|
||||
Protocol::prepare_for_send(item_list);
|
||||
bit_fields= (field_count+9)/8;
|
||||
@ -1054,7 +1054,7 @@ bool Protocol_prep::prepare_for_send(List<Item> *item_list)
|
||||
}
|
||||
|
||||
|
||||
void Protocol_prep::prepare_for_resend()
|
||||
void Protocol_binary::prepare_for_resend()
|
||||
{
|
||||
packet->length(bit_fields+1);
|
||||
bzero((char*) packet->ptr(), 1+bit_fields);
|
||||
@ -1062,21 +1062,21 @@ void Protocol_prep::prepare_for_resend()
|
||||
}
|
||||
|
||||
|
||||
bool Protocol_prep::store(const char *from, uint length, CHARSET_INFO *fromcs)
|
||||
bool Protocol_binary::store(const char *from, uint length, CHARSET_INFO *fromcs)
|
||||
{
|
||||
CHARSET_INFO *tocs= thd->variables.character_set_results;
|
||||
field_pos++;
|
||||
return store_string_aux(from, length, fromcs, tocs);
|
||||
}
|
||||
|
||||
bool Protocol_prep::store(const char *from,uint length,
|
||||
bool Protocol_binary::store(const char *from,uint length,
|
||||
CHARSET_INFO *fromcs, CHARSET_INFO *tocs)
|
||||
{
|
||||
field_pos++;
|
||||
return store_string_aux(from, length, fromcs, tocs);
|
||||
}
|
||||
|
||||
bool Protocol_prep::store_null()
|
||||
bool Protocol_binary::store_null()
|
||||
{
|
||||
uint offset= (field_pos+2)/8+1, bit= (1 << ((field_pos+2) & 7));
|
||||
/* Room for this as it's allocated in prepare_for_send */
|
||||
@ -1087,7 +1087,7 @@ bool Protocol_prep::store_null()
|
||||
}
|
||||
|
||||
|
||||
bool Protocol_prep::store_tiny(longlong from)
|
||||
bool Protocol_binary::store_tiny(longlong from)
|
||||
{
|
||||
char buff[1];
|
||||
field_pos++;
|
||||
@ -1096,7 +1096,7 @@ bool Protocol_prep::store_tiny(longlong from)
|
||||
}
|
||||
|
||||
|
||||
bool Protocol_prep::store_short(longlong from)
|
||||
bool Protocol_binary::store_short(longlong from)
|
||||
{
|
||||
field_pos++;
|
||||
char *to= packet->prep_append(2, PACKET_BUFFER_EXTRA_ALLOC);
|
||||
@ -1107,7 +1107,7 @@ bool Protocol_prep::store_short(longlong from)
|
||||
}
|
||||
|
||||
|
||||
bool Protocol_prep::store_long(longlong from)
|
||||
bool Protocol_binary::store_long(longlong from)
|
||||
{
|
||||
field_pos++;
|
||||
char *to= packet->prep_append(4, PACKET_BUFFER_EXTRA_ALLOC);
|
||||
@ -1118,7 +1118,7 @@ bool Protocol_prep::store_long(longlong from)
|
||||
}
|
||||
|
||||
|
||||
bool Protocol_prep::store_longlong(longlong from, bool unsigned_flag)
|
||||
bool Protocol_binary::store_longlong(longlong from, bool unsigned_flag)
|
||||
{
|
||||
field_pos++;
|
||||
char *to= packet->prep_append(8, PACKET_BUFFER_EXTRA_ALLOC);
|
||||
@ -1128,7 +1128,7 @@ bool Protocol_prep::store_longlong(longlong from, bool unsigned_flag)
|
||||
return 0;
|
||||
}
|
||||
|
||||
bool Protocol_prep::store_decimal(const my_decimal *d)
|
||||
bool Protocol_binary::store_decimal(const my_decimal *d)
|
||||
{
|
||||
#ifndef DBUG_OFF
|
||||
DBUG_ASSERT(field_types == 0 ||
|
||||
@ -1141,7 +1141,7 @@ bool Protocol_prep::store_decimal(const my_decimal *d)
|
||||
return store(str.ptr(), str.length(), str.charset());
|
||||
}
|
||||
|
||||
bool Protocol_prep::store(float from, uint32 decimals, String *buffer)
|
||||
bool Protocol_binary::store(float from, uint32 decimals, String *buffer)
|
||||
{
|
||||
field_pos++;
|
||||
char *to= packet->prep_append(4, PACKET_BUFFER_EXTRA_ALLOC);
|
||||
@ -1152,7 +1152,7 @@ bool Protocol_prep::store(float from, uint32 decimals, String *buffer)
|
||||
}
|
||||
|
||||
|
||||
bool Protocol_prep::store(double from, uint32 decimals, String *buffer)
|
||||
bool Protocol_binary::store(double from, uint32 decimals, String *buffer)
|
||||
{
|
||||
field_pos++;
|
||||
char *to= packet->prep_append(8, PACKET_BUFFER_EXTRA_ALLOC);
|
||||
@ -1163,7 +1163,7 @@ bool Protocol_prep::store(double from, uint32 decimals, String *buffer)
|
||||
}
|
||||
|
||||
|
||||
bool Protocol_prep::store(Field *field)
|
||||
bool Protocol_binary::store(Field *field)
|
||||
{
|
||||
/*
|
||||
We should not increment field_pos here as send_binary() will call another
|
||||
@ -1175,7 +1175,7 @@ bool Protocol_prep::store(Field *field)
|
||||
}
|
||||
|
||||
|
||||
bool Protocol_prep::store(TIME *tm)
|
||||
bool Protocol_binary::store(TIME *tm)
|
||||
{
|
||||
char buff[12],*pos;
|
||||
uint length;
|
||||
@ -1201,15 +1201,15 @@ bool Protocol_prep::store(TIME *tm)
|
||||
return packet->append(buff, length+1, PACKET_BUFFER_EXTRA_ALLOC);
|
||||
}
|
||||
|
||||
bool Protocol_prep::store_date(TIME *tm)
|
||||
bool Protocol_binary::store_date(TIME *tm)
|
||||
{
|
||||
tm->hour= tm->minute= tm->second=0;
|
||||
tm->second_part= 0;
|
||||
return Protocol_prep::store(tm);
|
||||
return Protocol_binary::store(tm);
|
||||
}
|
||||
|
||||
|
||||
bool Protocol_prep::store_time(TIME *tm)
|
||||
bool Protocol_binary::store_time(TIME *tm)
|
||||
{
|
||||
char buff[13], *pos;
|
||||
uint length;
|
||||
|
||||
@ -103,11 +103,11 @@ public:
|
||||
|
||||
/* Class used for the old (MySQL 4.0 protocol) */
|
||||
|
||||
class Protocol_simple :public Protocol
|
||||
class Protocol_text :public Protocol
|
||||
{
|
||||
public:
|
||||
Protocol_simple() {}
|
||||
Protocol_simple(THD *thd_arg) :Protocol(thd_arg) {}
|
||||
Protocol_text() {}
|
||||
Protocol_text(THD *thd_arg) :Protocol(thd_arg) {}
|
||||
virtual void prepare_for_resend();
|
||||
virtual bool store_null();
|
||||
virtual bool store_tiny(longlong from);
|
||||
@ -130,13 +130,13 @@ public:
|
||||
};
|
||||
|
||||
|
||||
class Protocol_prep :public Protocol
|
||||
class Protocol_binary :public Protocol
|
||||
{
|
||||
private:
|
||||
uint bit_fields;
|
||||
public:
|
||||
Protocol_prep() {}
|
||||
Protocol_prep(THD *thd_arg) :Protocol(thd_arg) {}
|
||||
Protocol_binary() {}
|
||||
Protocol_binary(THD *thd_arg) :Protocol(thd_arg) {}
|
||||
virtual bool prepare_for_send(List<Item> *item_list);
|
||||
virtual void prepare_for_resend();
|
||||
#ifdef EMBEDDED_LIBRARY
|
||||
|
||||
@ -2739,8 +2739,8 @@ int set_var_collation_client::update(THD *thd)
|
||||
thd->variables.character_set_results= character_set_results;
|
||||
thd->variables.collation_connection= collation_connection;
|
||||
thd->update_charset();
|
||||
thd->protocol_simple.init(thd);
|
||||
thd->protocol_prep.init(thd);
|
||||
thd->protocol_text.init(thd);
|
||||
thd->protocol_binary.init(thd);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@ -301,9 +301,9 @@ THD::THD()
|
||||
bzero((char*) &user_var_events, sizeof(user_var_events));
|
||||
|
||||
/* Protocol */
|
||||
protocol= &protocol_simple; // Default protocol
|
||||
protocol_simple.init(this);
|
||||
protocol_prep.init(this);
|
||||
protocol= &protocol_text; // Default protocol
|
||||
protocol_text.init(this);
|
||||
protocol_binary.init(this);
|
||||
|
||||
tablespace_op=FALSE;
|
||||
tmp= sql_rnd_with_mutex();
|
||||
|
||||
@ -904,8 +904,8 @@ public:
|
||||
NET net; // client connection descriptor
|
||||
MEM_ROOT warn_root; // For warnings and errors
|
||||
Protocol *protocol; // Current protocol
|
||||
Protocol_simple protocol_simple; // Normal protocol
|
||||
Protocol_prep protocol_prep; // Binary protocol
|
||||
Protocol_text protocol_text; // Normal protocol
|
||||
Protocol_binary protocol_binary; // Binary protocol
|
||||
HASH user_vars; // hash for user variables
|
||||
String packet; // dynamic buffer for network I/O
|
||||
String convert_buffer; // buffer for charset conversions
|
||||
|
||||
@ -93,11 +93,11 @@ When one supplies long data for a placeholder:
|
||||
|
||||
/* A result class used to send cursor rows using the binary protocol. */
|
||||
|
||||
class Select_fetch_protocol_prep: public select_send
|
||||
class Select_fetch_protocol_binary: public select_send
|
||||
{
|
||||
Protocol_prep protocol;
|
||||
Protocol_binary protocol;
|
||||
public:
|
||||
Select_fetch_protocol_prep(THD *thd);
|
||||
Select_fetch_protocol_binary(THD *thd);
|
||||
virtual bool send_fields(List<Item> &list, uint flags);
|
||||
virtual bool send_data(List<Item> &items);
|
||||
virtual bool send_eof();
|
||||
@ -125,7 +125,7 @@ public:
|
||||
};
|
||||
|
||||
THD *thd;
|
||||
Select_fetch_protocol_prep result;
|
||||
Select_fetch_protocol_binary result;
|
||||
Protocol *protocol;
|
||||
Item_param **param_array;
|
||||
uint param_count;
|
||||
@ -247,9 +247,9 @@ static bool send_prep_stmt(Prepared_statement *stmt, uint columns)
|
||||
*/
|
||||
DBUG_RETURN(my_net_write(net, buff, sizeof(buff)) ||
|
||||
(stmt->param_count &&
|
||||
stmt->thd->protocol_simple.send_fields((List<Item> *)
|
||||
&stmt->lex->param_list,
|
||||
Protocol::SEND_EOF)));
|
||||
stmt->thd->protocol_text.send_fields((List<Item> *)
|
||||
&stmt->lex->param_list,
|
||||
Protocol::SEND_EOF)));
|
||||
}
|
||||
#else
|
||||
static bool send_prep_stmt(Prepared_statement *stmt,
|
||||
@ -1882,7 +1882,7 @@ void mysql_stmt_prepare(THD *thd, const char *packet, uint packet_length)
|
||||
/* First of all clear possible warnings from the previous command */
|
||||
mysql_reset_thd_for_next_command(thd);
|
||||
|
||||
if (! (stmt= new Prepared_statement(thd, &thd->protocol_prep)))
|
||||
if (! (stmt= new Prepared_statement(thd, &thd->protocol_binary)))
|
||||
DBUG_VOID_RETURN; /* out of memory: error is set in Sql_alloc */
|
||||
|
||||
if (thd->stmt_map.insert(thd, stmt))
|
||||
@ -2054,8 +2054,8 @@ void mysql_sql_stmt_prepare(THD *thd)
|
||||
const char *query;
|
||||
uint query_len;
|
||||
DBUG_ENTER("mysql_sql_stmt_prepare");
|
||||
DBUG_ASSERT(thd->protocol == &thd->protocol_simple);
|
||||
LINT_INIT(query_len);
|
||||
DBUG_ASSERT(thd->protocol == &thd->protocol_text);
|
||||
|
||||
if ((stmt= (Prepared_statement*) thd->stmt_map.find_by_name(name)))
|
||||
{
|
||||
@ -2068,7 +2068,7 @@ void mysql_sql_stmt_prepare(THD *thd)
|
||||
}
|
||||
|
||||
if (! (query= get_dynamic_sql_string(lex, &query_len)) ||
|
||||
! (stmt= new Prepared_statement(thd, &thd->protocol_simple)))
|
||||
! (stmt= new Prepared_statement(thd, &thd->protocol_text)))
|
||||
{
|
||||
DBUG_VOID_RETURN; /* out of memory */
|
||||
}
|
||||
@ -2621,14 +2621,14 @@ void mysql_stmt_get_longdata(THD *thd, char *packet, ulong packet_length)
|
||||
|
||||
|
||||
/***************************************************************************
|
||||
Select_fetch_protocol_prep
|
||||
Select_fetch_protocol_binary
|
||||
****************************************************************************/
|
||||
|
||||
Select_fetch_protocol_prep::Select_fetch_protocol_prep(THD *thd_arg)
|
||||
Select_fetch_protocol_binary::Select_fetch_protocol_binary(THD *thd_arg)
|
||||
:protocol(thd_arg)
|
||||
{}
|
||||
|
||||
bool Select_fetch_protocol_prep::send_fields(List<Item> &list, uint flags)
|
||||
bool Select_fetch_protocol_binary::send_fields(List<Item> &list, uint flags)
|
||||
{
|
||||
bool rc;
|
||||
Protocol *save_protocol= thd->protocol;
|
||||
@ -2646,7 +2646,7 @@ bool Select_fetch_protocol_prep::send_fields(List<Item> &list, uint flags)
|
||||
return rc;
|
||||
}
|
||||
|
||||
bool Select_fetch_protocol_prep::send_eof()
|
||||
bool Select_fetch_protocol_binary::send_eof()
|
||||
{
|
||||
Protocol *save_protocol= thd->protocol;
|
||||
|
||||
@ -2658,7 +2658,7 @@ bool Select_fetch_protocol_prep::send_eof()
|
||||
|
||||
|
||||
bool
|
||||
Select_fetch_protocol_prep::send_data(List<Item> &fields)
|
||||
Select_fetch_protocol_binary::send_data(List<Item> &fields)
|
||||
{
|
||||
Protocol *save_protocol= thd->protocol;
|
||||
bool rc;
|
||||
@ -3000,7 +3000,7 @@ bool Prepared_statement::execute(String *expanded_query, bool open_cursor)
|
||||
mysql_open_cursor(thd, (uint) ALWAYS_MATERIALIZED_CURSOR,
|
||||
&result, &cursor) :
|
||||
mysql_execute_command(thd));
|
||||
thd->protocol= &thd->protocol_simple; /* use normal protocol */
|
||||
thd->protocol= &thd->protocol_text; /* use normal protocol */
|
||||
|
||||
/* Assert that if an error, no cursor is open */
|
||||
DBUG_ASSERT(! (error && cursor));
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user