diff options
| author | unknown <serg@serg.mysql.com> | 2002-09-23 14:38:35 +0000 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2002-09-23 14:38:35 +0000 |
| commit | 14d3ff6b738e3cc5518c9a531fded82845b718c8 (patch) | |
| tree | 3ff9c36a44bf890b1996426c8edc8f96d441379d /sql | |
| parent | 3e77f4c6674a02d8202a0a66b3ef7a78620d3347 (diff) | |
| download | mariadb-git-14d3ff6b738e3cc5518c9a531fded82845b718c8.tar.gz | |
followup: s/st_table_list->name/st_table_list->alias/
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_yacc.yy | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 1e92c833872..a9c1121adaa 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1760,15 +1760,15 @@ join_table_list: | join_table_list INNER_SYM JOIN_SYM join_table ON expr { add_join_on($4,$6); $$=$4; } | join_table_list INNER_SYM JOIN_SYM join_table - { Lex->db1=$1->db; Lex->table1=$1->name; - Lex->db2=$4->db; Lex->table2=$4->name; } + { Lex->db1=$1->db; Lex->table1=$1->alias; + Lex->db2=$4->db; Lex->table2=$4->alias; } USING '(' using_list ')' { add_join_on($4,$8); $$=$4; } | join_table_list LEFT opt_outer JOIN_SYM join_table ON expr { add_join_on($5,$7); $5->outer_join|=JOIN_TYPE_LEFT; $$=$5; } | join_table_list LEFT opt_outer JOIN_SYM join_table - { Lex->db1=$1->db; Lex->table1=$1->name; - Lex->db2=$5->db; Lex->table2=$5->name; } + { Lex->db1=$1->db; Lex->table1=$1->alias; + Lex->db2=$5->db; Lex->table2=$5->alias; } USING '(' using_list ')' { add_join_on($5,$9); $5->outer_join|=JOIN_TYPE_LEFT; $$=$5; } | join_table_list NATURAL LEFT opt_outer JOIN_SYM join_table @@ -1776,8 +1776,8 @@ join_table_list: | join_table_list RIGHT opt_outer JOIN_SYM join_table ON expr { add_join_on($1,$7); $1->outer_join|=JOIN_TYPE_RIGHT; $$=$1; } | join_table_list RIGHT opt_outer JOIN_SYM join_table - { Lex->db1=$1->db; Lex->table1=$1->name; - Lex->db2=$5->db; Lex->table2=$5->name; } + { Lex->db1=$1->db; Lex->table1=$1->alias; + Lex->db2=$5->db; Lex->table2=$5->alias; } USING '(' using_list ')' { add_join_on($1,$9); $1->outer_join|=JOIN_TYPE_RIGHT; $$=$1; } | join_table_list NATURAL RIGHT opt_outer JOIN_SYM join_table |