diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-12-29 14:32:58 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-12-29 14:32:58 +0100 |
| commit | 3454b5cf35a61e8f6cfab376638520dee4a50609 (patch) | |
| tree | 938ade6b1e3526a5d2b008a2189604e00a578ba9 | |
| parent | 4601e6e565dacd074e211108acf48c067f951b4f (diff) | |
| parent | e59c1cef3bc4016f9fa9d7a0f6935463b7283a58 (diff) | |
| download | mariadb-git-3454b5cf35a61e8f6cfab376638520dee4a50609.tar.gz | |
Merge branch '10.3' into 10.4
| -rw-r--r-- | mysql-test/main/cte_recursive.result | 4 | ||||
| -rw-r--r-- | sql/sql_lex.cc | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/mysql-test/main/cte_recursive.result b/mysql-test/main/cte_recursive.result index 370da62bf1c..6f30de39b46 100644 --- a/mysql-test/main/cte_recursive.result +++ b/mysql-test/main/cte_recursive.result @@ -1301,7 +1301,7 @@ select ancestors.name, ancestors.dob from ancestors; id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY <derived4> ALL NULL NULL NULL NULL 24 4 DERIVED folks ALL NULL NULL NULL NULL 12 Using where -6 RECURSIVE UNION <derived3> ALL NULL NULL NULL NULL 12 +6 UNION <derived3> ALL NULL NULL NULL NULL 12 5 RECURSIVE UNION <derived4> ALL NULL NULL NULL NULL 24 NULL UNION RESULT <union4,6,5> ALL NULL NULL NULL NULL NULL 3 DERIVED folks ALL NULL NULL NULL NULL 12 Using where @@ -4029,7 +4029,7 @@ id select_type table type possible_keys key key_len ref rows Extra 3 RECURSIVE UNION t1 ALL NULL NULL NULL NULL 4 Using where 3 RECURSIVE UNION <derived2> ref key0 key0 9 test.t1.c 2 NULL UNION RESULT <union2,3> ALL NULL NULL NULL NULL NULL -4 RECURSIVE UNION <derived2> ALL NULL NULL NULL NULL 4 +4 UNION <derived2> ALL NULL NULL NULL NULL 4 with recursive r_cte as ( select * from t1 as s union diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 10cd20e1207..e196765b6bc 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -4831,14 +4831,14 @@ void st_select_lex::set_explain_type(bool on_the_fly) /* pos_in_table_list=NULL for e.g. post-join aggregation JOIN_TABs. */ - if (!tab->table); - else if (const TABLE_LIST *pos= tab->table->pos_in_table_list) + if (!(tab->table && tab->table->pos_in_table_list)) + continue; + TABLE_LIST *tbl= tab->table->pos_in_table_list; + if (tbl->with && tbl->with->is_recursive && + tbl->is_with_table_recursive_reference()) { - if (pos->with && pos->with->is_recursive) - { - uses_cte= true; - break; - } + uses_cte= true; + break; } } if (uses_cte) |