summaryrefslogtreecommitdiff
path: root/sql/sql_handler.h
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@askmonty.org>2018-05-16 09:44:22 +0400
committerAlexey Botchkov <holyfoot@askmonty.org>2018-05-16 09:44:22 +0400
commita639eff5940ed4147709511aeaee922fa7095284 (patch)
tree7d8faf3e9668d27904fc37b18a701ef9155f1b54 /sql/sql_handler.h
parentcd15e764a8a4f3e799f1efaede413c95e3233df6 (diff)
downloadmariadb-git-a639eff5940ed4147709511aeaee922fa7095284.tar.gz
MDEV-15813 ASAN use-after-poison in hp_hashnr upon HANDLER READ on a versioned HEAP table.
Check index capabilities before executing HANDLER READ command.
Diffstat (limited to 'sql/sql_handler.h')
-rw-r--r--sql/sql_handler.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_handler.h b/sql/sql_handler.h
index ffefec91fad..4c16f7e5c57 100644
--- a/sql/sql_handler.h
+++ b/sql/sql_handler.h
@@ -80,5 +80,6 @@ void mysql_ha_rm_temporary_tables(THD *thd);
SQL_HANDLER *mysql_ha_read_prepare(THD *thd, TABLE_LIST *tables,
enum enum_ha_read_modes mode,
const char *keyname,
- List<Item> *key_expr, Item *cond);
+ List<Item> *key_expr, enum ha_rkey_function ha_rkey_mode,
+ Item *cond);
#endif