Merge commit 'a4bebdd92624e018108c2610fc3f2c1584b6c687' into master

This is the commit merge of Postgres-XC with the intersection of
PostgreSQL REL9_1_STABLE and master branches.

Conflicts:
	COPYRIGHT
	contrib/pgbench/pgbench.c
	src/Makefile
	src/backend/access/transam/recovery.conf.sample
	src/backend/access/transam/varsup.c
	src/backend/access/transam/xlog.c
	src/backend/catalog/Makefile
	src/backend/catalog/dependency.c
	src/backend/catalog/system_views.sql
	src/backend/commands/copy.c
	src/backend/commands/explain.c
	src/backend/commands/sequence.c
	src/backend/commands/tablecmds.c
	src/backend/commands/vacuum.c
	src/backend/executor/nodeAgg.c
	src/backend/nodes/copyfuncs.c
	src/backend/nodes/equalfuncs.c
	src/backend/nodes/outfuncs.c
	src/backend/nodes/readfuncs.c
	src/backend/optimizer/path/allpaths.c
	src/backend/optimizer/plan/createplan.c
	src/backend/optimizer/plan/setrefs.c
	src/backend/parser/gram.y
	src/backend/parser/parse_utilcmd.c
	src/backend/postmaster/postmaster.c
	src/backend/rewrite/rewriteHandler.c
	src/backend/storage/lmgr/proc.c
	src/backend/tcop/postgres.c
	src/backend/utils/adt/ruleutils.c
	src/backend/utils/init/postinit.c
	src/backend/utils/misc/guc.c
	src/backend/utils/misc/postgresql.conf.sample
	src/backend/utils/sort/tuplesort.c
	src/bin/initdb/initdb.c
	src/bin/pg_ctl/pg_ctl.c
	src/bin/pg_dump/pg_dump.c
	src/include/access/xlog.h
	src/include/catalog/catversion.h
	src/include/catalog/indexing.h
	src/include/catalog/pg_aggregate.h
	src/include/catalog/pg_proc.h
	src/include/commands/copy.h
	src/include/nodes/parsenodes.h
	src/include/nodes/primnodes.h
	src/include/optimizer/pathnode.h
	src/include/parser/kwlist.h
	src/include/storage/procarray.h
	src/test/regress/expected/.gitignore
	src/test/regress/expected/aggregates.out
	src/test/regress/expected/alter_table.out
	src/test/regress/expected/bit.out
	src/test/regress/expected/box.out
	src/test/regress/expected/delete.out
	src/test/regress/expected/float4.out
	src/test/regress/expected/float8.out
	src/test/regress/expected/int2.out
	src/test/regress/expected/int8.out
	src/test/regress/expected/interval.out
	src/test/regress/expected/numeric.out
	src/test/regress/expected/point.out
	src/test/regress/expected/polygon.out
	src/test/regress/expected/sequence.out
	src/test/regress/expected/timestamp.out
	src/test/regress/expected/timestamptz.out
	src/test/regress/expected/transactions.out
	src/test/regress/expected/window.out
	src/test/regress/input/misc.source
	src/test/regress/output/create_misc_1.source
	src/test/regress/output/misc.source
	src/test/regress/sql/aggregates.sql
	src/test/regress/sql/alter_table.sql
	src/test/regress/sql/bit.sql
	src/test/regress/sql/box.sql
	src/test/regress/sql/delete.sql
	src/test/regress/sql/domain.sql
	src/test/regress/sql/float4.sql
	src/test/regress/sql/float8.sql
	src/test/regress/sql/int2.sql
	src/test/regress/sql/int8.sql
	src/test/regress/sql/interval.sql
	src/test/regress/sql/lseg.sql
	src/test/regress/sql/numeric.sql
	src/test/regress/sql/path.sql
	src/test/regress/sql/point.sql
	src/test/regress/sql/polygon.sql
	src/test/regress/sql/portals.sql
	src/test/regress/sql/sequence.sql
	src/test/regress/sql/timestamp.sql
	src/test/regress/sql/timestamptz.sql
	src/test/regress/sql/transactions.sql
	src/test/regress/sql/window.sql
	src/test/regress/sql/with.sql

1 files changed, 5 insertions, 2 deletions

diff --git a/src/backend/regex/regexec.c b/src/backend/regex/regexec.c
index 60a03a417e..7dc0ddba29 100644
--- a/src/backend/regex/regexec.c
+++ b/src/backend/regex/regexec.c
@@ -27,7 +27,7 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $PostgreSQL: pgsql/src/backend/regex/regexec.c,v 1.28 2010/02/01 02:45:29 tgl Exp $
+ * src/backend/regex/regexec.c
  *
  */
 
@@ -119,7 +119,7 @@ struct vars
 
 #define VISERR(vv)	((vv)->err != 0)	/* have we seen an error yet? */
 #define ISERR() VISERR(v)
-#define VERR(vv,e)	(((vv)->err) ? (vv)->err : ((vv)->err = (e)))
+#define VERR(vv,e)	((vv)->err = ((vv)->err ? (vv)->err : (e)))
 #define ERR(e)	VERR(v, e)		/* record an error */
 #define NOERR() {if (ISERR()) return v->err;}	/* if error seen, return it */
 #define OFF(p)	((p) - v->start)
@@ -192,6 +192,9 @@ pg_regexec(regex_t *re,
 	if (re->re_csize != sizeof(chr))
 		return REG_MIXED;
 
+	/* Initialize locale-dependent support */
+	pg_set_regex_collation(re->re_collation);
+
 	/* setup */
 	v->re = re;
 	v->g = (struct guts *) re->re_guts;