@@ -2679,17 +2679,20 @@ OptUseOp: USING all_Op{ $$ = cat2_str(make_str("using"), $2); }
26792679| /* EMPTY*/ {$$ = EMPTY; }
26802680;
26812681
2682- select_limit :LIMIT select_offset_value ' ,' select_limit_value
2683- {$$ = cat_str(4 , make_str(" limit" ),$2 , make_str(" ," ),$4 ); }
2684- | LIMIT select_limit_value OFFSET select_offset_value
2682+ select_limit :LIMIT select_limit_value OFFSET select_offset_value
26852683 {$$ = cat_str(4 , make_str(" limit" ),$2 , make_str(" offset" ),$4 ); }
2686- | LIMIT select_limit_value
2687- {$$ = cat2_str(make_str(" limit" ),$2 ); }
2688- | OFFSET select_offset_value LIMIT select_limit_value
2684+ | OFFSET select_offset_value LIMIT select_limit_value
26892685 {$$ = cat_str(4 , make_str(" offset" ),$2 , make_str(" limit" ),$4 ); }
2690- | OFFSET select_offset_value
2686+ | LIMIT select_limit_value
2687+ {$$ = cat2_str(make_str(" limit" ),$2 ); }
2688+ | OFFSET select_offset_value
26912689 {$$ = cat2_str(make_str(" offset" ),$2 ); }
2692- ;
2690+ | LIMIT select_limit_value ' ,' select_offset_value
2691+ {$$ = cat_str(4 , make_str(" limit" ),$2 , make_str(" ," ),$4 ); }
2692+ /* enable this in 7.3, bjm 2001-10-22
2693+ { mmerror(ET_NOTICE, "No longer supported LIMIT #,# syntax passed to backend."); }
2694+ */
2695+ ;
26932696
26942697opt_select_limit :select_limit {$$ =$1 ; }
26952698| /* EMPTY*/ {$$ = EMPTY; }