database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

mysql-5.5.31 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2013-05-07 13:05:09 +02:00
parent d4be9e7bc0 e5055e22f1
commit b381cf843c
264 changed files with 3748 additions and 1718 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_prepare.cc
View File

@ -1503,7 +1503,8 @@ static int mysql_test_select(Prepared_statement *stmt,
if (!lex->result && !(lex->result= new (stmt->mem_root) select_send))
{
my_error(ER_OUTOFMEMORY, MYF(0), static_cast<int>(sizeof(select_send)));
my_error(ER_OUTOFMEMORY, MYF(ME_FATALERROR),
static_cast<int>(sizeof(select_send)));
goto error;
}
@ -1877,7 +1878,7 @@ static bool mysql_test_multidelete(Prepared_statement *stmt,
stmt->thd->lex->current_select= &stmt->thd->lex->select_lex;
if (add_item_to_list(stmt->thd, new Item_null()))
{
my_error(ER_OUTOFMEMORY, MYF(0), 0);
my_error(ER_OUTOFMEMORY, MYF(ME_FATALERROR), 0);
goto error;
}
@ -3860,7 +3861,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, 0, expanded_query->length());
my_error(ER_OUTOFMEMORY, MYF(ME_FATALERROR), expanded_query->length());
goto error;
}
/*