mirror of
https://github.com/MariaDB/server.git
synced 2025-08-05 13:16:09 +03:00
MDEV-33680 Server hangs or assertion fails upon SELECT with limited max_tmp_space_usage
The bug was that Aggregator_distinct::add() did not properly handle write errors. (Old bug exposed by the new code).
This commit is contained in:
@@ -307,7 +307,7 @@ my_bool Expression_cache_tmptable::put_value(Item *value)
|
||||
cache_table_param.start_recinfo,
|
||||
&cache_table_param.recinfo,
|
||||
error, 1, NULL))
|
||||
goto err;
|
||||
goto err2;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -318,6 +318,8 @@ my_bool Expression_cache_tmptable::put_value(Item *value)
|
||||
DBUG_RETURN(FALSE);
|
||||
|
||||
err:
|
||||
cache_table->file->print_error(error, MYF(0));
|
||||
err2:
|
||||
disable_cache();
|
||||
DBUG_RETURN(TRUE);
|
||||
}
|
||||
|
Reference in New Issue
Block a user