summaryrefslogtreecommitdiff
path: root/sql/sql_yacc.yy
diff options
context:
space:
mode:
authorunknown <gkodinov/kgeorge@rakia.gmz>2007-02-19 14:47:16 +0200
committerunknown <gkodinov/kgeorge@rakia.gmz>2007-02-19 14:47:16 +0200
commit6d537f01fd7b7cf97ae019aef03f1ed305bcb5fd (patch)
tree84ece3d24b76490b22cef354598d163716df3716 /sql/sql_yacc.yy
parentd7992c88c6e60c92e6736cd5c95790923f79a59d (diff)
parenta97fd193715799843f02228a01bba24e8b98fa44 (diff)
downloadmariadb-git-6d537f01fd7b7cf97ae019aef03f1ed305bcb5fd.tar.gz
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into rakia.gmz:/home/kgeorge/mysql/autopush/B25831-5.0-opt sql/item.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_yacc.yy: Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
-rw-r--r--sql/sql_yacc.yy7
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index b4147d2905c..d5b3aadbf39 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -4188,8 +4188,13 @@ select_into:
| select_from into;
select_from:
- FROM join_table_list where_clause group_clause having_clause
+ FROM join_table_list where_clause group_clause having_clause
opt_order_clause opt_limit_clause procedure_clause
+ {
+ Select->context.table_list=
+ Select->context.first_name_resolution_table=
+ (TABLE_LIST *) Select->table_list.first;
+ }
| FROM DUAL_SYM where_clause opt_limit_clause
/* oracle compatibility: oracle always requires FROM clause,
and DUAL is system table without fields.