diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-05-08 15:02:19 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-05-08 23:03:08 +0200 |
| commit | a70a1cf3f4ed10c9d9194b2b8df6b6f08551a937 (patch) | |
| tree | 517124ec5059f48bff1e02b934355e8162183efc /sql/sql_handler.cc | |
| parent | 40b8f3ec1a76fc23eb6bf9c5a8fef1debcbf5843 (diff) | |
| parent | 79660e59ee8fcd23f928c72dc77682b875bd58ce (diff) | |
| download | mariadb-git-a70a1cf3f4ed10c9d9194b2b8df6b6f08551a937.tar.gz | |
Merge branch '10.3' into 10.4
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 073d523b876..eb0dc1c2b3f 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -699,8 +699,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; |