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

Merged with lp:maria revision #3766

Browse Source
This commit is contained in:
Seppo Jaakola
2013-07-13 13:30:03 +03:00
parent 0a9216835f a057b50490
commit db0cfba638
1085 changed files with 177459 additions and 7453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_prepare.cc
View File

@ -879,7 +879,7 @@ static bool insert_params_with_log(Prepared_statement *stmt, uchar *null_array,
if (param->state == Item_param::NO_VALUE)
DBUG_RETURN(1);
if (param->limit_clause_param && param->item_type != Item::INT_ITEM)
if (param->limit_clause_param)
{
param->set_int(param->val_int(), MY_INT64_NUM_DECIMAL_DIGITS);
param->item_type= Item::INT_ITEM;
@ -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;
}
@ -3885,7 +3886,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;
}
/*
@ -4426,7 +4427,7 @@ bool Protocol_local::store(const char *str, size_t length,
bool Protocol_local::store(MYSQL_TIME *time, int decimals)
{
if (decimals != AUTO_SEC_PART_DIGITS)
time->second_part= sec_part_truncate(time->second_part, decimals);
my_time_trunc(time, decimals);
return store_column(time, sizeof(MYSQL_TIME));
}
@ -4444,7 +4445,7 @@ bool Protocol_local::store_date(MYSQL_TIME *time)
bool Protocol_local::store_time(MYSQL_TIME *time, int decimals)
{
if (decimals != AUTO_SEC_PART_DIGITS)
time->second_part= sec_part_truncate(time->second_part, decimals);
my_time_trunc(time, decimals);
return store_column(time, sizeof(MYSQL_TIME));
}