diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-04-26 12:58:14 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-04-26 12:58:14 +0200 |
| commit | 29868de2fff62c3ebd8af5cf533d3d224da1b332 (patch) | |
| tree | 2005b555be04b5feecee7db28ea4206522af3722 /sql | |
| parent | 7f5ceb77689d4858875bfae7c4f2abc11534b7f1 (diff) | |
| download | mariadb-git-29868de2fff62c3ebd8af5cf533d3d224da1b332.tar.gz | |
MDEV-9986 Full-text search of the utf8mb4 column causes crash
take into account that agg_arg_charsets_for_comparison()
can replace Item_field's with Item_func_conv_charset
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_func.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index bd6553d45d4..cabba7a666c 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -6366,6 +6366,8 @@ bool Item_func_match::fix_index() for (i=1; i < arg_count; i++) { + if (args[i]->type() != FIELD_ITEM) + goto err; item=(Item_field*)args[i]; for (keynr=0 ; keynr < fts ; keynr++) { |