diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-01 11:02:32 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-02 09:36:04 +0300 |
| commit | 3d615e4b1aa4f945f69d310f9a19de80fbaccdca (patch) | |
| tree | 1d23c043ef41badf359760b70db84bc825a8b4a5 /sql/handler.cc | |
| parent | 896c2c73a02c7e82299b00e66ee3ff5f85aa3adc (diff) | |
| parent | 959891662dfbb0b860f0bc70e09bc2c92dab831b (diff) | |
| download | mariadb-git-3d615e4b1aa4f945f69d310f9a19de80fbaccdca.tar.gz | |
Merge branch 'bb-10.2-ext' into 10.3
This excludes MDEV-12472 (InnoDB should accept XtraDB parameters,
warning that they are ignored). In other words, MariaDB 10.3 will not
recognize any XtraDB-specific parameters.
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index a5832be30e1..9b66801b109 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -6041,7 +6041,13 @@ int handler::update_first_row(uchar *new_data) { int end_error; if (!(error= ha_rnd_next(table->record[1]))) - error= update_row(table->record[1], new_data); + { + /* + We have to do the memcmp as otherwise we may get error 169 from InnoDB + */ + if (memcmp(table->record[0], table->record[1], table->s->reclength)) + error= update_row(table->record[1], new_data); + } end_error= ha_rnd_end(); if (!error) error= end_error; |