mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
Fixed wrong arguments to printf and related functions
Other things, mainly to get create_mysqld_error_find_printf_error tool to work: - Added protection to not include mysqld_error.h twice - Include "unireg.h" instead of "mysqld_error.h" in server - Added protection if ER_XX messages are already defined - Removed wrong calls to my_error(ER_OUTOFMEMORY) as my_malloc() and my_alloc will do this automatically - Added missing %s to ER_DUP_QUERY_NAME - Removed old and wrong calls to my_strerror() when using MY_ERROR_ON_RENAME (wrong merge) - Fixed deadlock error message from Galera. Before the extra information given to ER_LOCK_DEADLOCK was missing because ER_LOCK_DEADLOCK doesn't provide any extra information. I kept #ifdef mysqld_error_find_printf_error_used in sql_acl.h to make it easy to do this kind of check again in the future
This commit is contained in:
@ -2287,10 +2287,8 @@ static int mysql_test_handler_read(Prepared_statement *stmt,
|
||||
if (!stmt->is_sql_prepare())
|
||||
{
|
||||
if (!lex->result && !(lex->result= new (stmt->mem_root) select_send(thd)))
|
||||
{
|
||||
my_error(ER_OUTOFMEMORY, MYF(0), sizeof(select_send));
|
||||
DBUG_RETURN(1);
|
||||
}
|
||||
|
||||
if (send_prep_stmt(stmt, ha_table->fields.elements) ||
|
||||
lex->result->send_result_set_metadata(ha_table->fields, Protocol::SEND_EOF) ||
|
||||
thd->protocol->flush())
|
||||
|
Reference in New Issue
Block a user