mirror of
https://github.com/MariaDB/server.git
synced 2025-09-02 09:41:40 +03:00
fixed * without tables in IN bug
fixed sunction-test select in IN bug fixed unions in subselect bug
This commit is contained in:
@@ -1329,7 +1329,6 @@ mysql_execute_command(THD *thd)
|
||||
*/
|
||||
thd->old_total_warn_count= thd->total_warn_count;
|
||||
|
||||
thd->net.report_error= 0;
|
||||
if (thd->slave_thread)
|
||||
{
|
||||
/*
|
||||
@@ -2957,6 +2956,8 @@ mysql_parse(THD *thd, char *inBuf, uint length)
|
||||
|
||||
mysql_init_query(thd);
|
||||
thd->query_length = length;
|
||||
thd->net.report_error= 0;
|
||||
|
||||
if (query_cache_send_result_to_client(thd, inBuf, length) <= 0)
|
||||
{
|
||||
LEX *lex=lex_start(thd, (uchar*) inBuf, length);
|
||||
@@ -2969,8 +2970,13 @@ mysql_parse(THD *thd, char *inBuf, uint length)
|
||||
}
|
||||
else
|
||||
{
|
||||
mysql_execute_command(thd);
|
||||
query_cache_end_of_result(&thd->net);
|
||||
if (thd->net.report_error)
|
||||
send_error(thd, 0, NullS);
|
||||
else
|
||||
{
|
||||
mysql_execute_command(thd);
|
||||
query_cache_end_of_result(&thd->net);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
|
Reference in New Issue
Block a user