Update regression for new patches. Bump up catversion.

diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index f8150787c1accf3e09e9e0c66b68cdfe3d72b6df..529fed99d2ca26a859b31d32f8d684593a12a6a7 100644 (file)
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -37,7 +37,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: catversion.h,v 1.164 2002/11/08 17:27:03 momjian Exp $
+ * $Id: catversion.h,v 1.165 2002/11/23 18:13:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -53,6 +53,6 @@
  */
 
 /*                                                     yyyymmddN */
-#define CATALOG_VERSION_NO     200211081
+#define CATALOG_VERSION_NO     200211231
 
 #endif

diff --git a/src/test/regress/expected/triggers.out b/src/test/regress/expected/triggers.out
index b8e49452b6c7eed264a0c2e36ed0a0465c1105cd..363682f50b2791bf143f66438133275803eb4d4f 100644 (file)
--- a/src/test/regress/expected/triggers.out
+++ b/src/test/regress/expected/triggers.out
@@ -299,7 +299,7 @@ NOTICE:  trigger_func() called: action = UPDATE, when = AFTER, level = STATEMENT
 COPY main_table (a, b) FROM stdin;
 NOTICE:  trigger_func() called: action = INSERT, when = BEFORE, level = STATEMENT
 NOTICE:  trigger_func() called: action = INSERT, when = AFTER, level = STATEMENT
-SELECT * FROM main_table ORDER BY a;
+SELECT * FROM main_table ORDER BY a, b;
  a  | b  
 ----+----
   6 | 10

diff --git a/src/test/regress/sql/triggers.sql b/src/test/regress/sql/triggers.sql
index 214ffff44693b0ead4802af1b952ebee9ad4de54..37bfb3bfd57d32e92f9845296d7f623c4c411a0b 100644 (file)
--- a/src/test/regress/sql/triggers.sql
+++ b/src/test/regress/sql/triggers.sql
@@ -247,4 +247,4 @@ COPY main_table (a, b) FROM stdin;
 50     60
 \.
 
-SELECT * FROM main_table ORDER BY a;
\ No newline at end of file
+SELECT * FROM main_table ORDER BY a, b;