diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-30 10:38:44 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-30 10:38:44 +0300 |
| commit | a49e394399859b23ba609d0058b498cfa876cac4 (patch) | |
| tree | d0f1a85011d7e99078624c2185a9ba69796a4262 /plugin | |
| parent | 260649de0472e90be665ae2c442c4435e125b022 (diff) | |
| parent | be803f037f98812410f24b67af61aa7857969dcf (diff) | |
| download | mariadb-git-a49e394399859b23ba609d0058b498cfa876cac4.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/feedback/feedback.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/plugin/feedback/feedback.cc b/plugin/feedback/feedback.cc index eb3f562f329..3b2e95f1e13 100644 --- a/plugin/feedback/feedback.cc +++ b/plugin/feedback/feedback.cc @@ -92,17 +92,19 @@ static COND * const OOM= (COND*)1; static COND* make_cond(THD *thd, TABLE_LIST *tables, LEX_STRING *filter) { Item_cond_or *res= NULL; - Name_resolution_context nrc; + /* A reference to this context will be stored in Item_field */ + Name_resolution_context *nrc= new (thd->mem_root) Name_resolution_context; LEX_CSTRING &db= tables->db; LEX_CSTRING &table= tables->alias; LEX_CSTRING &field= tables->table->field[0]->field_name; CHARSET_INFO *cs= &my_charset_latin1; - if (!filter->str) + if (!filter->str || !nrc) return 0; - nrc.init(); - nrc.resolve_in_table_list_only(tables); + nrc->init(); + nrc->resolve_in_table_list_only(tables); + nrc->select_lex= tables->select_lex; res= new (thd->mem_root) Item_cond_or(thd); if (!res) @@ -110,7 +112,7 @@ static COND* make_cond(THD *thd, TABLE_LIST *tables, LEX_STRING *filter) for (; filter->str; filter++) { - Item_field *fld= new (thd->mem_root) Item_field(thd, &nrc, db, table, + Item_field *fld= new (thd->mem_root) Item_field(thd, nrc, db, table, field); Item_string *pattern= new (thd->mem_root) Item_string(thd, filter->str, (uint) filter->length, cs); |