summaryrefslogtreecommitdiff
path: root/sql/sql_yacc.yy
diff options
context:
space:
mode:
authorserg@serg.mysql.com <>2002-09-23 14:38:35 +0000
committerserg@serg.mysql.com <>2002-09-23 14:38:35 +0000
commit4850c9414342757ce910c2c3ddfcf9df4618a7d6 (patch)
tree3ff9c36a44bf890b1996426c8edc8f96d441379d /sql/sql_yacc.yy
parente5ee3122a39b014637e68259944ae985d306515b (diff)
downloadmariadb-git-4850c9414342757ce910c2c3ddfcf9df4618a7d6.tar.gz
followup: s/st_table_list->name/st_table_list->alias/
Diffstat (limited to 'sql/sql_yacc.yy')
-rw-r--r--sql/sql_yacc.yy12
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