From 5e0b13d1734942d860416ed1b51f7dd75760e020 Mon Sep 17 00:00:00 2001 From: Monty Date: Thu, 4 Jan 2018 16:21:18 +0200 Subject: 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 --- sql/sql_prepare.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'sql/sql_prepare.cc') diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index ae6f0e8f63d..be78a76152e 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -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()) -- cgit v1.2.1