From c9061d11022d8fc7274510b04d48bf3f164ebf96 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 29 May 2018 23:54:25 +0200 Subject: mysys: rename ME_xxx flags to match plugin api --- sql/sql_prepare.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sql/sql_prepare.cc') diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index d4c96ebc535..49e22b1e0e4 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -1514,7 +1514,7 @@ static int mysql_test_select(Prepared_statement *stmt, if (!lex->result && !(lex->result= new (stmt->mem_root) select_send(thd))) { - my_error(ER_OUTOFMEMORY, MYF(ME_FATALERROR), + my_error(ER_OUTOFMEMORY, MYF(ME_FATAL), static_cast(sizeof(select_send))); goto error; } @@ -2085,7 +2085,7 @@ static bool mysql_test_multidelete(Prepared_statement *stmt, if (add_item_to_list(thd, new (thd->mem_root) Item_null(thd))) { - my_error(ER_OUTOFMEMORY, MYF(ME_FATALERROR), 0); + my_error(ER_OUTOFMEMORY, MYF(ME_FATAL), 0); goto error; } @@ -4718,7 +4718,7 @@ bool Prepared_statement::execute(String *expanded_query, bool open_cursor) alloc_query(thd, (char*) expanded_query->ptr(), expanded_query->length())) { - my_error(ER_OUTOFMEMORY, MYF(ME_FATALERROR), expanded_query->length()); + my_error(ER_OUTOFMEMORY, MYF(ME_FATAL), expanded_query->length()); goto error; } /* -- cgit v1.2.1