diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-05-03 10:59:54 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-05-03 10:59:54 +0200 |
| commit | 9614fde1aac6ffa4745804342ff70a96b2418e30 (patch) | |
| tree | d53f4578ce0a6b5cf30f3eef854d50c16fbabcee /sql/sql_handler.cc | |
| parent | 182b8a29e7a1a0f0fbffeed39518c2c9dc026e13 (diff) | |
| parent | 70555454b4c224e85383d482411961c7f2eba2e2 (diff) | |
| download | mariadb-git-9614fde1aac6ffa4745804342ff70a96b2418e30.tar.gz | |
Merge branch '10.2' into 10.3
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 3475b622130..c86458c438d 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -701,8 +701,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; |