diff options
| author | Sergei Petrunia <sergey@mariadb.com> | 2022-04-26 15:18:15 +0300 |
|---|---|---|
| committer | Sergei Petrunia <sergey@mariadb.com> | 2022-04-26 15:18:15 +0300 |
| commit | 2d18943a63ba51657c0e8ff0d4c98b16786a81b0 (patch) | |
| tree | 8a74a5f20839ad2378caf6bc794a6813ab6fc5e3 /sql/sql_handler.cc | |
| parent | c01ee954bf3b10fef85af7b8c77d319ff7bd6b61 (diff) | |
| parent | 9b2d36660bbb4f93c6b9e0761c91d57d47f59196 (diff) | |
| download | mariadb-git-bb-10.2-mdev26047-v2.tar.gz | |
Merge branch '10.2' of github.com:MariaDB/server into 10.2bb-10.2-mdev26047-v2bb-10.2-mdev26047
Diffstat (limited to 'sql/sql_handler.cc')
| -rw-r--r-- | sql/sql_handler.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index ec3756eceba..132556f57b8 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -613,8 +613,10 @@ mysql_ha_fix_cond_and_key(SQL_HANDLER *handler, if (!in_prepare) { MY_BITMAP *old_map= dbug_tmp_use_all_columns(table, &table->write_set); - (void) item->save_in_field(key_part->field, 1); + int res= item->save_in_field(key_part->field, 1); dbug_tmp_restore_column_map(&table->write_set, old_map); + if (res) + return 1; } key_len+= key_part->store_length; keypart_map= (keypart_map << 1) | 1; |