diff options
Diffstat (limited to 'sql/thr_malloc.cc')
| -rw-r--r-- | sql/thr_malloc.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sql/thr_malloc.cc b/sql/thr_malloc.cc index 1fbab74554f..79a6fd79d4c 100644 --- a/sql/thr_malloc.cc +++ b/sql/thr_malloc.cc @@ -16,7 +16,10 @@ /* Mallocs for used in threads */ -#include "mysql_priv.h" +#include "sql_priv.h" +#include "unireg.h" +#include "thr_malloc.h" +#include "sql_class.h" extern "C" { void sql_alloc_error_handler(void) @@ -42,9 +45,10 @@ extern "C" { returned in the error packet. - SHOW ERROR/SHOW WARNINGS may be empty. */ - thd->main_da.set_error_status(thd, - ER_OUT_OF_RESOURCES, - ER(ER_OUT_OF_RESOURCES)); + thd->stmt_da->set_error_status(thd, + ER_OUT_OF_RESOURCES, + ER(ER_OUT_OF_RESOURCES), + NULL); } } @@ -109,10 +113,6 @@ void* sql_memdup(const void *ptr, size_t len) return pos; } -void sql_element_free(void *ptr __attribute__((unused))) -{} /* purecov: deadcode */ - - char *sql_strmake_with_convert(const char *str, size_t arg_length, CHARSET_INFO *from_cs, |