Commit 25e03cdf authored by unknown's avatar unknown

Fixes while during review of last pull

Temporary patch to remove some warnings


sql/item.cc:
  Trivial optimization
sql/protocol.cc:
  Fixed spelling error
sql/sql_parse.cc:
  Fix to not get warnings during inital temp open (should be deleted after Dimitri's next push)
  Style fixes
sql/table.cc:
  Ensure that cleanup is done, even if we get an error
parent 0be32e7e
...@@ -4390,9 +4390,8 @@ my_decimal *Item_cache_real::val_decimal(my_decimal *decimal_val) ...@@ -4390,9 +4390,8 @@ my_decimal *Item_cache_real::val_decimal(my_decimal *decimal_val)
void Item_cache_decimal::store(Item *item) void Item_cache_decimal::store(Item *item)
{ {
my_decimal *val= item->val_decimal_result(&decimal_value); my_decimal *val= item->val_decimal_result(&decimal_value);
if (val != &decimal_value && !item->null_value) if (!(null_value= item->null_value) && val != &decimal_value)
my_decimal2decimal(val, &decimal_value); my_decimal2decimal(val, &decimal_value);
null_value= item->null_value;
} }
double Item_cache_decimal::val_real() double Item_cache_decimal::val_real()
......
...@@ -326,7 +326,7 @@ send_ok(THD *thd, ha_rows affected_rows, ulonglong id, const char *message) ...@@ -326,7 +326,7 @@ send_ok(THD *thd, ha_rows affected_rows, ulonglong id, const char *message)
/* We can't anymore send an error to the client */ /* We can't anymore send an error to the client */
thd->net.report_error= 0; thd->net.report_error= 0;
thd->net.no_send_error= 1; thd->net.no_send_error= 1;
DBUG_PRINT("info", ("OK sent, so no more error sendong allowed")); DBUG_PRINT("info", ("OK sent, so no more error sending allowed"));
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
...@@ -388,7 +388,7 @@ send_eof(THD *thd, bool no_flush) ...@@ -388,7 +388,7 @@ send_eof(THD *thd, bool no_flush)
VOID(net_flush(net)); VOID(net_flush(net));
} }
thd->net.no_send_error= 1; thd->net.no_send_error= 1;
DBUG_PRINT("info", ("EOF sent, so no more error sendong allowed")); DBUG_PRINT("info", ("EOF sent, so no more error sending allowed"));
} }
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
......
...@@ -2363,7 +2363,10 @@ mysql_execute_command(THD *thd) ...@@ -2363,7 +2363,10 @@ mysql_execute_command(THD *thd)
lex->sql_command != SQLCOM_LOCK_TABLES && lex->sql_command != SQLCOM_LOCK_TABLES &&
lex->sql_command != SQLCOM_UNLOCK_TABLES) lex->sql_command != SQLCOM_UNLOCK_TABLES)
{ {
if (process_nested_sp(thd, lex, &locked_tables)) thd->no_warnings_for_error= 1;
res= process_nested_sp(thd, lex, &locked_tables);
thd->no_warnings_for_error= 0;
if (res)
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
} }
...@@ -4180,8 +4183,9 @@ unsent_create_error: ...@@ -4180,8 +4183,9 @@ unsent_create_error:
thd->row_count_func= 0; thd->row_count_func= 0;
res= sp->execute_procedure(thd, &lex->value_list); res= sp->execute_procedure(thd, &lex->value_list);
/* If warnings have been cleared, we have to clear total_warn_count /*
* too, otherwise the clients get confused. If warnings have been cleared, we have to clear total_warn_count
too, otherwise the clients get confused.
*/ */
if (thd->warn_list.is_empty()) if (thd->warn_list.is_empty())
thd->total_warn_count= 0; thd->total_warn_count= 0;
......
...@@ -1800,7 +1800,8 @@ bool st_table_list::setup_ancestor(THD *thd, Item **conds, ...@@ -1800,7 +1800,8 @@ bool st_table_list::setup_ancestor(THD *thd, Item **conds,
alloc(select->item_list.elements * alloc(select->item_list.elements *
sizeof(Field_translator))))) sizeof(Field_translator)))))
{ {
DBUG_RETURN(TRUE); res= TRUE;
goto ok; // Restore thd
} }
select_lex->no_wrap_view_item= 1; select_lex->no_wrap_view_item= 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment