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

merge of 5.1-main into mysql-trunk.

Browse Source 
Changes to ha_innodb.cc are not propagated to plugin, they will come back
via Oracle/Innobase if needed.
This commit is contained in:
Guilhem Bichot
2009-08-12 15:44:34 +02:00
parent a39de6353a cea2f8b630
commit 8d1fdf09bb
146 changed files with 28995 additions and 691 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_update.cc
View File

@ -294,7 +294,7 @@ int mysql_update(THD *thd,
if (select_lex->inner_refs_list.elements &&
fix_inner_refs(thd, all_fields, select_lex, select_lex->ref_pointer_array))
DBUG_RETURN(-1);
DBUG_RETURN(1);
if (conds)
{
@ -334,7 +334,14 @@ int mysql_update(THD *thd,
{
delete select;
free_underlaid_joins(thd, select_lex);
if (error)
/*
There was an error or the error was already sent by
the quick select evaluation.
TODO: Add error code output parameter to Item::val_xxx() methods.
Currently they rely on the user checking DA for
errors when unwinding the stack after calling Item::val_xxx().
*/
if (error || thd->is_error())
{
DBUG_RETURN(1); // Error in where
}