mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-04 06:05:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

5.3 merge

Browse source
This commit is contained in:
Sergei Golubchik 2012-08-31 14:15:52 +02:00
commit 59408093d1
20 changed files with 139 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sql/sql_update.cc
View file

@ -406,7 +406,7 @@ int mysql_update(THD *thd,
table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK);
select= make_select(table, 0, 0, conds, 0, &error);
if (error || !limit ||
if (error || !limit || thd->is_error() ||
(select && select->check_quick(thd, safe_update, limit)))
{
delete select;