Back out LIMIT #,# removal and mark it as to-be-removed in 7.3.

diff --git a/HISTORY b/HISTORY
index 0716cd2d6ab390276dbfff195af7a6835d7c6107..10cd2f0d10427808e305a31ef1281f293107a398 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -37,9 +37,9 @@ several languages.
 Migration to 7.2
 
    A dump/restore using pg_dump is required for those wishing to migrate
-   data from any previous release.  One significant change is that
-   the SELECT ... LIMIT 10,20 syntax is no longer supported.  You must
-   now use LIMIT 10 OFFSET 20 to accomplish the same thing.
+   data from any previous release.  The SELECT ... LIMIT 10,20 syntax will
+   be removed in 7.3.  You should change your queries to use LIMIT 10
+   OFFSET 20.
 
 
 

diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index dcae6c746d679665c0360bde177a51390b7da6ad..0ededba2d42d5a2abb3fadde24ff1127188884aa 100644 (file)
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.267 2001/10/20 16:51:02 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.268 2001/10/23 02:45:37 momjian Exp $
  *
  * HISTORY
  *       AUTHOR                        DATE                    MAJOR EVENT
@@ -3656,7 +3656,11 @@ select_limit:    LIMIT select_limit_value OFFSET select_offset_value
                | OFFSET select_offset_value
                        { $$ = makeList2($2, NULL); }
                | LIMIT select_offset_value ',' select_limit_value
+                       { $$ = makeList2($4, $2); }
+#ifdef NOT_USED
+                       /* enable this in 7.3, bjm 2001-10-22 */
                        { elog(ERROR, "LIMIT #,# syntax no longer supported.\n\tUse separate LIMIT and OFFSET clauses."); }
+#endif
                ;