Merge branch 'mysql-8.0' into mysql-trunk

Author: GlebShchepa

mysql-test/r/parser.result

@@ -2651,3 +2651,18 @@ WITH cte AS (SELECT 0 /*! ) */ SELECT * FROM cte a, cte b;
 WITH cte AS /*! ( */ SELECT 0) SELECT * FROM cte a, cte b;
 0	0
 0	0
+#
+# Bug#30528450: SPECIAL SYMBOL NAMED COLUMN NOT HONORED IN A SELECT
+#
+CREATE TABLE t1 (c1 INT, `*` INT, c3 INT);
+INSERT INTO t1 VALUES (1, 2, 3);
+SELECT `*` FROM t1;
+*
+2
+SELECT t1.`*`, t1.* FROM t1;
+*	c1	*	c3
+2	1	2	3
+SELECT test.t1.`*`, test.t1.* FROM t1;
+*	c1	*	c3
+2	1	2	3
+DROP TABLE t1;

mysql-test/t/parser.test

@@ -2549,3 +2549,16 @@ SELECT 1 UNION (SELECT 1 FROM DUAL INTO @var);
 
 WITH cte AS (SELECT 0 /*! ) */ SELECT * FROM cte a, cte b;
 WITH cte AS /*! ( */ SELECT 0) SELECT * FROM cte a, cte b;
+
+--echo #
+--echo # Bug#30528450: SPECIAL SYMBOL NAMED COLUMN NOT HONORED IN A SELECT
+--echo #
+
+CREATE TABLE t1 (c1 INT, `*` INT, c3 INT);
+INSERT INTO t1 VALUES (1, 2, 3);
+
+SELECT `*` FROM t1;
+SELECT t1.`*`, t1.* FROM t1;
+SELECT test.t1.`*`, test.t1.* FROM t1;
+
+DROP TABLE t1;

sql/dd/info_schema/show_query_builder.cc

@@ -73,10 +73,8 @@ bool Select_lex_builder::add_to_select_item_list(Item *expr) {
 
 // Add item representing star in "SELECT '*' ...".
 bool Select_lex_builder::add_star_select_item() {
-  const LEX_CSTRING star = {STRING_WITH_LEN("*")};
-
-  PTI_simple_ident_ident *ident_star =
-      new (m_thd->mem_root) PTI_simple_ident_ident(*m_pos, star);
+  Item_asterisk *ident_star =
+      new (m_thd->mem_root) Item_asterisk(*m_pos, nullptr, nullptr);
   if (ident_star == nullptr) return true;
 
   return add_to_select_item_list(ident_star);

sql/item.cc

@@ -2513,10 +2513,6 @@ bool Item_field::itemize(Parse_context *pc, Item **res) {
   if (super::itemize(pc, res)) return true;
   SELECT_LEX *const select = pc->select;
   if (select->parsing_place != CTX_HAVING) select->select_n_where_fields++;
-
-  if (select->parsing_place == CTX_SELECT_LIST && field_name &&
-      field_name[0] == '*' && field_name[1] == 0)
-    select->with_wild++;
   return false;
 }
 
@@ -10333,3 +10329,16 @@ Item_field *FindEqualField(Item_field *item_field, table_map reachable_tables) {
 
   return item_field;
 }
+
+bool Item_asterisk::itemize(Parse_context *pc, Item **res) {
+  DBUG_ASSERT(pc->select->parsing_place == CTX_SELECT_LIST);
+
+  if (skip_itemize(res)) {
+    return false;
+  }
+  if (super::itemize(pc, res)) {
+    return true;
+  }
+  pc->select->with_wild++;
+  return false;
+}

sql/item.h

@@ -4080,6 +4080,48 @@ class Item_field : public Item_ident {
 
   bool replace_field_processor(uchar *arg) override;
   bool strip_db_table_name_processor(uchar *) override;
+
+  /**
+    Checks if the current object represents an asterisk select list item
+
+    @returns false if a regular column reference, true if an asterisk
+             select list item.
+  */
+  virtual bool is_asterisk() const { return false; }
+};
+
+/**
+  Represents [schema.][table.]* in a select list
+
+  Item_asterisk is used to insert placeholder objects for the special
+  select list item * (asterisk) into AST.
+  Those placeholder objects are to be substituted later with e.g. a list of real
+  table columns by a resolver (@see setup_wild).
+
+  @todo The parent class Item_field is redundant. Refactor setup_wild() to
+        replace Item_field with a simpler one.
+*/
+class Item_asterisk : public Item_field {
+  typedef Item_field super;
+
+ public:
+  /**
+    Constructor
+
+    @param pos                  Location of the * (asterisk) lexeme.
+    @param opt_schema_name      Schema name or nullptr.
+    @param opt_table_name       Table name or nullptr.
+  */
+  Item_asterisk(const POS &pos, const char *opt_schema_name,
+                const char *opt_table_name)
+      : super(pos, opt_schema_name, opt_table_name, "*") {}
+
+  bool itemize(Parse_context *pc, Item **res) override;
+  bool fix_fields(THD *, Item **) override {
+    DBUG_ASSERT(false);  // should never happen: see setup_wild()
+    return true;
+  }
+  bool is_asterisk() const override { return true; }
 };
 
 // See if the provided item points to a reachable field (one that belongs to a

sql/parse_tree_items.cc

@@ -162,18 +162,6 @@ static Item *handle_sql2003_note184_exception(Parse_context *pc, Item *left,
   return result;
 }
 
-bool PTI_table_wild::itemize(Parse_context *pc, Item **item) {
-  if (super::itemize(pc, item)) return true;
-
-  schema = pc->thd->get_protocol()->has_client_capability(CLIENT_NO_SCHEMA)
-               ? nullptr
-               : schema;
-  *item = new (pc->mem_root) Item_field(POS(), schema, table, "*");
-  if (*item == nullptr || (*item)->itemize(pc, item)) return true;
-  pc->select->with_wild++;
-  return false;
-}
-
 bool PTI_comp_op::itemize(Parse_context *pc, Item **res) {
   if (super::itemize(pc, res) || left->itemize(pc, &left) ||
       right->itemize(pc, &right))

sql/parse_tree_items.h

@@ -42,20 +42,6 @@ class PT_subquery;
 class PT_window;
 struct udf_func;
 
-class PTI_table_wild : public Parse_tree_item {
-  typedef Parse_tree_item super;
-
-  const char *schema;
-  const char *table;
-
- public:
-  explicit PTI_table_wild(const POS &pos, const char *schema_arg,
-                          const char *table_arg)
-      : super(pos), schema(schema_arg), table(table_arg) {}
-
-  bool itemize(Parse_context *pc, Item **item) override;
-};
-
 class PTI_truth_transform : public Parse_tree_item {
   typedef Parse_tree_item super;
 

sql/sql_resolver.cc

@@ -1433,9 +1433,10 @@ bool SELECT_LEX::setup_wild(THD *thd) {
 
   while (with_wild && (item = it++)) {
     Item_field *item_field;
-    if (item->type() == Item::FIELD_ITEM && (item_field = (Item_field *)item) &&
-        item_field->field_name && item_field->field_name[0] == '*' &&
-        !item_field->field) {
+    if (item->type() == Item::FIELD_ITEM &&
+        (item_field = down_cast<Item_field *>(item)) &&
+        item_field->is_asterisk()) {
+      DBUG_ASSERT(item_field->field == nullptr);
       const uint elem = fields_list.elements;
       const bool any_privileges = item_field->any_privileges;
       Item_subselect *subsel = master_unit()->item;

sql/sql_show_status.cc

@@ -101,8 +101,6 @@ static SELECT_LEX *build_query(const POS &pos, THD *thd,
   static const LEX_CSTRING as_value = {STRING_WITH_LEN("Value")};
   static const LEX_CSTRING pfs = {STRING_WITH_LEN("performance_schema")};
 
-  static const LEX_CSTRING star = {STRING_WITH_LEN("*")};
-
   static const Query_options options = {
       0 /* query_spec_options */
   };
@@ -198,8 +196,8 @@ static SELECT_LEX *build_query(const POS &pos, THD *thd,
   if (table_reference_list1.push_back(derived_table)) return nullptr;
 
   /* SELECT * ... */
-  PTI_simple_ident_ident *ident_star;
-  ident_star = new (thd->mem_root) PTI_simple_ident_ident(pos, star);
+  Item_asterisk *ident_star;
+  ident_star = new (thd->mem_root) Item_asterisk(pos, nullptr, nullptr);
   if (ident_star == nullptr) return nullptr;
 
   PT_select_item_list *item_list1;

sql/sql_yacc.yy

@@ -37,6 +37,7 @@ Note: YYTHD is passed as an argument to yyparse(), and subsequently to yylex().
 #define YYPS (& YYTHD->m_parser_state->m_yacc)
 #define YYCSCL (YYLIP->query_charset)
 #define YYMEM_ROOT (YYTHD->mem_root)
+#define YYCLIENT_NO_SCHEMA (YYTHD->get_protocol()->has_client_capability(CLIENT_NO_SCHEMA))
 
 #define YYINITDEPTH 100
 #define YYMAXDEPTH 3200                        /* Because of 64K stack */
@@ -9458,9 +9459,9 @@ query_primary:
         | explicit_table
           {
             auto item_list= NEW_PTN PT_select_item_list;
-            if (item_list == nullptr ||
-                item_list->push_back(
-                  NEW_PTN Item_field(@$, nullptr, nullptr, "*")))
+            auto asterisk= NEW_PTN Item_asterisk(@$, nullptr, nullptr);
+            if (item_list == nullptr || asterisk == nullptr ||
+                item_list->push_back(asterisk))
               MYSQL_YYABORT;
             $$= NEW_PTN PT_explicit_table({}, item_list, $1);
           }
@@ -9653,9 +9654,9 @@ select_item_list:
           }
         | '*'
           {
-            Item *item= NEW_PTN Item_field(@$, NULL, NULL, "*");
-            $$= NEW_PTN PT_select_item_list;
-            if ($$ == NULL || $$->push_back(item))
+            Item *item = NEW_PTN Item_asterisk(@$, nullptr, nullptr);
+            $$ = NEW_PTN PT_select_item_list;
+            if ($$ == nullptr || item == nullptr || $$->push_back(item))
               MYSQL_YYABORT;
           }
         ;
@@ -14206,13 +14207,14 @@ insert_ident:
 table_wild:
           ident '.' '*'
           {
-            $$= NEW_PTN PTI_table_wild(@$, NULL, $1.str);
+            $$ = NEW_PTN Item_asterisk(@$, nullptr, $1.str);
           }
         | ident '.' ident '.' '*'
           {
             if (check_and_convert_db_name(&$1, false) != Ident_name_check::OK)
               MYSQL_YYABORT;
-            $$= NEW_PTN PTI_table_wild(@$, $1.str, $3.str);
+            auto schema_name = YYCLIENT_NO_SCHEMA ? nullptr : $1.str;
+            $$ = NEW_PTN Item_asterisk(@$, schema_name, $3.str);
           }
         ;
 
@@ -14268,11 +14270,9 @@ table_ident:
           }
         | ident '.' ident
           {
-            if (YYTHD->get_protocol()->has_client_capability(CLIENT_NO_SCHEMA))
-              $$= NEW_PTN Table_ident(to_lex_cstring($3));
-            else {
-              $$= NEW_PTN Table_ident(to_lex_cstring($1), to_lex_cstring($3));
-            }
+            auto schema_name = YYCLIENT_NO_SCHEMA ? LEX_CSTRING{}
+                                                  : to_lex_cstring($1.str);
+            $$= NEW_PTN Table_ident(schema_name, to_lex_cstring($3));
             if ($$ == NULL)
               MYSQL_YYABORT;
           }
@@ -15998,12 +15998,9 @@ grant_ident:
           }
         | schema '.' ident
           {
-            Table_ident *tmp;
-            if (YYTHD->get_protocol()->has_client_capability(CLIENT_NO_SCHEMA))
-              tmp = NEW_PTN Table_ident(to_lex_cstring($3));
-            else {
-              tmp = NEW_PTN Table_ident(to_lex_cstring($1), to_lex_cstring($3));
-            }
+            auto schema_name = YYCLIENT_NO_SCHEMA ? LEX_CSTRING{}
+                                                  : to_lex_cstring($1.str);
+            auto tmp = NEW_PTN Table_ident(schema_name, to_lex_cstring($3));
             if (tmp == NULL)
               MYSQL_YYABORT;
             LEX *lex=Lex;