diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-03 12:53:30 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-03 12:53:30 +0200 |
| commit | 8812a2f85809aaa9e3f78b09cb4d76ea3b2b8b4a (patch) | |
| tree | 3d91ee7a6188edd11e3e4baaba1dae9ee26b5eb4 /sql/sql_update.cc | |
| parent | ec03390f9b39db005f612bf832ce9638da787eac (diff) | |
| parent | 0765caa073db5a9209934ce0ca852fb2f8a256e4 (diff) | |
| download | mariadb-git-8812a2f85809aaa9e3f78b09cb4d76ea3b2b8b4a.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index e1d22e6a1e9..db9f9013188 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -701,6 +701,8 @@ int mysql_update(THD *thd, if (reinit_io_cache(&tempfile,READ_CACHE,0L,0,0)) error=1; /* purecov: inspected */ select->file=tempfile; // Read row ptrs from this file + // select->file was copied, update self-references. + setup_io_cache(&select->file); if (error >= 0) goto err; } |