mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Another fix for #2208
previous one had error libmysqld/lib_sql.cc: memdup_mysql deleted sql/sql_class.h: String instead of char* sql/sql_parse.cc: storing of the rest of the query
This commit is contained in:
@ -251,7 +251,7 @@ int emb_next_result(MYSQL *mysql)
|
||||
DBUG_ENTER("emb_next_result");
|
||||
|
||||
if (emb_advanced_command(mysql, COM_QUERY,0,0,
|
||||
thd->query_rest,thd->query_rest_length,1)
|
||||
thd->query_rest.ptr(),thd->query_rest.length(),1)
|
||||
|| emb_mysql_read_query_result(mysql))
|
||||
DBUG_RETURN(1);
|
||||
|
||||
@ -765,11 +765,6 @@ bool Protocol::net_store_data(const char *from, uint length)
|
||||
return false;
|
||||
}
|
||||
|
||||
char *memdup_mysql(struct st_mysql *mysql, const char*data, int length)
|
||||
{
|
||||
return memdup_root(&mysql->field_alloc, data, length);
|
||||
}
|
||||
|
||||
#if 0
|
||||
/* The same as Protocol::net_store_data but does the converstion
|
||||
*/
|
||||
|
Reference in New Issue
Block a user