Follow-up post JSON_TABLE merge, table_join_options is not used

bc04ded2 · Vicențiu Ciorbaru · 3019d1cb · bc04ded2
Commit bc04ded2 authored Apr 21, 2021 by Vicențiu Ciorbaru
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

sql/sql_yacc.yy sql/sql_yacc.yy +2 -4

No files found.
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -11691,13 +11691,11 @@ table_function:
            }
            if (unlikely(Lex->json_table->m_nested_path.set_path(thd, $7)))
              MYSQL_YYABORT;
-            sel->table_join_options= 0;
-            if (!($$= Select->add_table_to_list(thd,
+            if (!($$= sel->add_table_to_list(thd,
                           new (thd->mem_root) Table_ident(thd, &any_db,
                                                           $10, TRUE),
                           NULL,
-                           Select->get_table_join_options() |
-                             TL_OPTION_TABLE_FUNCTION,
+                           TL_OPTION_TABLE_FUNCTION,
                           YYPS->m_lock_type,
                           YYPS->m_mdl_type,
                           0,0,0)))