summaryrefslogtreecommitdiff
path: root/sql/sql_lex.cc
diff options
context:
space:
mode:
authorChad MILLER <chad@mysql.com>2008-07-14 16:16:37 -0400
committerChad MILLER <chad@mysql.com>2008-07-14 16:16:37 -0400
commita4e7283a9254c09057c92ec20fc145c52bea1d51 (patch)
tree6009880c2c51b3422d95a760220fb7a20ebdb3e0 /sql/sql_lex.cc
parentc425bf421da9ffa55d3d568f70508fa12dd07aa0 (diff)
parent55ab1ef6951428e0be31956e152537dec670e7df (diff)
downloadmariadb-git-a4e7283a9254c09057c92ec20fc145c52bea1d51.tar.gz
Merge from 5.0 trunk.
Diffstat (limited to 'sql/sql_lex.cc')
-rw-r--r--sql/sql_lex.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index b669919dba6..468bae02b13 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -1253,6 +1253,7 @@ void st_select_lex::init_select()
non_agg_fields.empty();
cond_value= having_value= Item::COND_UNDEF;
inner_refs_list.empty();
+ full_group_by_flag= 0;
}
/*
@@ -1491,8 +1492,6 @@ bool st_select_lex::test_limit()
"LIMIT & IN/ALL/ANY/SOME subquery");
return(1);
}
- // no sense in ORDER BY without LIMIT
- order_list.empty();
return(0);
}