diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-05-09 22:04:06 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-05-09 22:04:06 +0200 |
| commit | ef781162ff2eb97f405b19dc150ab674e91dbc05 (patch) | |
| tree | 63b897dece50ab65652174af4cd0aabd8f3a8505 /sql/sql_handler.cc | |
| parent | e9af6b2a4d8750c32d4953f08f8bc5f2e33cb9e3 (diff) | |
| parent | 16cebed54065ad9e18953aa86d48f6007d53c2d3 (diff) | |
| download | mariadb-git-ef781162ff2eb97f405b19dc150ab674e91dbc05.tar.gz | |
Merge branch '10.4' into 10.5
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 eab33a79b38..276cef6236b 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -700,8 +700,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; |