diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-05-25 09:15:08 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-05-25 09:15:08 +0300 |
| commit | 3cc8539d84f569f4829874bf36f4b44b0ceb030c (patch) | |
| tree | cc4cf6561f81b4d6b33af1dc5da888e6baff59af /sql/sql_handler.cc | |
| parent | 956d93b581b704fa56b0b6469ae35a2e79850ef4 (diff) | |
| parent | 1ace1075dc6bb02fe19802334f9d47446a17a79a (diff) | |
| download | mariadb-git-3cc8539d84f569f4829874bf36f4b44b0ceb030c.tar.gz | |
Merge 10.9 into 10.10
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 833492d3d9f..7235dc6472d 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -712,8 +712,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; |