diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-02-02 18:14:35 +0100 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-02-02 18:14:35 +0100 |
| commit | 0765caa073db5a9209934ce0ca852fb2f8a256e4 (patch) | |
| tree | a7572a4c6b4f8c8f1d7b13090233f7526953d89c /sql/sql_update.cc | |
| parent | 96cb428b350ba48ee17ad9968d08f5318e48258c (diff) | |
| parent | 7a63ffab71644118223aefe66094366a7b7f115e (diff) | |
| download | mariadb-git-0765caa073db5a9209934ce0ca852fb2f8a256e4.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 10.0
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 4dc190ab8cb..94fbe0924b6 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -689,6 +689,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; } |