summaryrefslogtreecommitdiff
path: root/sql/sql_yacc.yy
diff options
context:
space:
mode:
authorigor@rurik.mysql.com <>2006-04-21 08:19:38 -0700
committerigor@rurik.mysql.com <>2006-04-21 08:19:38 -0700
commit639e8750329613363ac4b3c92b55d5e2db992568 (patch)
tree14c80cec6058de5f107603a041b64dfe66d10484 /sql/sql_yacc.yy
parent37ac7822065195d0bf7061d947306f2481c7191c (diff)
downloadmariadb-git-639e8750329613363ac4b3c92b55d5e2db992568.tar.gz
Post merge fixes
Diffstat (limited to 'sql/sql_yacc.yy')
-rw-r--r--sql/sql_yacc.yy2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index a911ad41cd7..f3f0990c917 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -5719,7 +5719,7 @@ order_clause:
SELECT_LEX *first_sl= unit->first_select();
if (!first_sl->next_select() &&
(first_sl->order_list.elements ||
- first_sl->select_limit != HA_POS_ERROR) &&
+ first_sl->select_limit) &&
unit->add_fake_select_lex(lex->thd))
YYABORT;
}