diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-25 12:04:45 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-25 12:04:45 +0300 |
| commit | 4725792bf3ca17b581586f54a2e0058b4a18cff1 (patch) | |
| tree | 0c1ae1ec376660682d940027fe70bd6d4e8afe58 /sql/sql_base.cc | |
| parent | b8fad8c6bffbc7e43796fffe607b23075cfc3e2b (diff) | |
| parent | e4394cc5472a18d791b48e56784742b512de2bf8 (diff) | |
| download | mariadb-git-4725792bf3ca17b581586f54a2e0058b4a18cff1.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 5f66ea9608f..a345c4827e3 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -7877,7 +7877,8 @@ bool setup_tables(THD *thd, Name_resolution_context *context, if (table_list->jtbm_subselect) { Item *item= table_list->jtbm_subselect->optimizer; - if (table_list->jtbm_subselect->optimizer->fix_fields(thd, &item)) + if (!table_list->jtbm_subselect->optimizer->fixed && + table_list->jtbm_subselect->optimizer->fix_fields(thd, &item)) { my_error(ER_TOO_MANY_TABLES,MYF(0), static_cast<int>(MAX_TABLES)); /* psergey-todo: WHY ER_TOO_MANY_TABLES ???*/ DBUG_RETURN(1); |