Commit eb548dc3 authored by Guilhem Bichot's avatar Guilhem Bichot

missing DBUG_RETURN, was causing crashes when run with --default-storage-engine=maria in tests

main.func_misc main.grant_cache_no_prot main.lowercase_table_grant main.mysql_client_test main.query_cache
main.query_cache_notembedded main.query_cache_ps_no_prot

storage/maria/ha_maria.cc:
  missing DBUG_RETURN
parent 8de480a2
...@@ -3138,15 +3138,9 @@ my_bool ha_maria::register_query_cache_table(THD *thd, char *table_name, ...@@ -3138,15 +3138,9 @@ my_bool ha_maria::register_query_cache_table(THD *thd, char *table_name,
actual_data_file_length= file->s->state.state.data_file_length; actual_data_file_length= file->s->state.state.data_file_length;
current_data_file_length= file->state->data_file_length; current_data_file_length= file->state->data_file_length;
if (file->s->non_transactional_concurrent_insert && /* Return whether is ok to try to cache current statement. */
current_data_file_length != actual_data_file_length) DBUG_RETURN(!(file->s->non_transactional_concurrent_insert &&
{ current_data_file_length != actual_data_file_length));
/* Don't cache current statement. */
return FALSE;
}
/* It is ok to try to cache current statement. */
return TRUE;
} }
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment