diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-05-29 23:54:25 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-06-04 12:32:23 +0200 |
| commit | c9061d11022d8fc7274510b04d48bf3f164ebf96 (patch) | |
| tree | a259f436b0ffe9b61aaf4185f809005796065fd7 /sql/sql_prepare.cc | |
| parent | 37659ef43be689b2a2f8c507d9395e839bf66066 (diff) | |
| download | mariadb-git-c9061d11022d8fc7274510b04d48bf3f164ebf96.tar.gz | |
mysys: rename ME_xxx flags to match plugin api
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 6 |
1 files changed, 3 insertions, 3 deletions
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<int>(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; } /* |