diff options
| author | gkodinov/kgeorge@rakia.(none) <> | 2006-09-05 13:12:30 +0300 |
|---|---|---|
| committer | gkodinov/kgeorge@rakia.(none) <> | 2006-09-05 13:12:30 +0300 |
| commit | 68b9ae4d14230514de87203f184eb892086d2084 (patch) | |
| tree | 46ccb1fdf17163d2c06a25212defe887cd042e92 /sql/sql_yacc.yy | |
| parent | cf3bed86b553fa410a5ef73cfdd397a491f0bdd3 (diff) | |
| parent | 3758b975f8c535917c9507b005ccc8ff5a76bfb8 (diff) | |
| download | mariadb-git-68b9ae4d14230514de87203f184eb892086d2084.tar.gz | |
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
into rakia.(none):/home/kgeorge/mysql/autopush/B21392-4.1-opt
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index efd83549312..73fab642264 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -4345,14 +4345,17 @@ table_wild_one: ident opt_wild opt_table_alias { if (!Select->add_table_to_list(YYTHD, new Table_ident($1), $3, - TL_OPTION_UPDATING, Lex->lock_option)) + TL_OPTION_UPDATING | + TL_OPTION_ALIAS, Lex->lock_option)) YYABORT; } | ident '.' ident opt_wild opt_table_alias { if (!Select->add_table_to_list(YYTHD, new Table_ident(YYTHD, $1, $3, 0), - $5, TL_OPTION_UPDATING, + $5, + TL_OPTION_UPDATING | + TL_OPTION_ALIAS, Lex->lock_option)) YYABORT; } |