diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-08-31 14:15:52 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-08-31 14:15:52 +0200 |
| commit | 59408093d1add69dd4cd3d1674a73712528aed92 (patch) | |
| tree | 85e7d74ddb7c0a74c6c434b9c3dacfe9b7ebe2a3 /sql/sql_update.cc | |
| parent | a1fd37b1fd5803188d3f8b44914cca459f6e622f (diff) | |
| parent | 51e14492e9410718056b0c6d9d4dabd4a96e8070 (diff) | |
| download | mariadb-git-59408093d1add69dd4cd3d1674a73712528aed92.tar.gz | |
5.3 merge
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index f2b6c5c9f92..d8254c9dbdb 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -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; |