diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-01-15 19:13:32 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-15 19:13:32 +0100 |
| commit | d3935adf7a4ea943583e9e51fe8fa8a2c14521dd (patch) | |
| tree | 4125365a32fa25dde9e79ccfb4dcd10269071607 /sql/sql_update.cc | |
| parent | 85ea99dcaf8fd91fa566a78062dbfa416c2309fe (diff) | |
| parent | 14ba37f76f87cc48cae62eb6bdf3cda294dff78d (diff) | |
| download | mariadb-git-d3935adf7a4ea943583e9e51fe8fa8a2c14521dd.tar.gz | |
mysql-5.5.29 merge
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 78b693c5237..5836f7bf5dc 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -2241,11 +2241,16 @@ err: } err2: - (void) table->file->ha_rnd_end(); - (void) tmp_table->file->ha_rnd_end(); + if (table->file->inited) + (void) table->file->ha_rnd_end(); + if (tmp_table->file->inited) + (void) tmp_table->file->ha_rnd_end(); check_opt_it.rewind(); while (TABLE *tbl= check_opt_it++) - tbl->file->ha_rnd_end(); + { + if (tbl->file->inited) + (void) tbl->file->ha_rnd_end(); + } if (updated != org_updated) { |