diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l
index d83fed1a540ef3edef58b535e94dc52370854d0f..ef504750482d4484987c85a32c242be3baa9df6e 100755
--- a/src/backend/parser/scan.l
+++ b/src/backend/parser/scan.l
@@ -24,7 +24,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/parser/scan.l,v 1.153 2009/05/05 21:09:23 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/parser/scan.l,v 1.168 2010/07/20 00:34:44 rhaas Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -76,7 +76,7 @@ static uint32	utf16_top_part;
  */
 int				backslash_quote = BACKSLASH_QUOTE_SAFE_ENCODING;
 bool			escape_string_warning = true;
-bool			standard_conforming_strings = false;
+bool			standard_conforming_strings = true;
 
 static bool		warn_on_first_escape;
 static bool		saw_non_ascii = false;
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 14f7de8aea2a7c34aeafd8fdaaff3f9fd70f5400..96399c180dda972a9ecc43acec793767bba0ec2c 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -11,7 +11,7 @@
  * Written by Peter Eisentraut <peter_e@gmx.net>.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.385 2007/04/16 18:29:55 alvherre Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.563 2010/07/20 00:34:44 rhaas Exp $
  *
  *--------------------------------------------------------------------
  */
@@ -1053,7 +1053,7 @@ static struct config_bool ConfigureNamesBool[] =
 			GUC_REPORT
 		},
 		&standard_conforming_strings,
-		false, NULL, NULL
+		true, NULL, NULL
 	},
 
 	{
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index eb04f46688e5bed23e37de094e7e19103a105540..198eab57c10ffe25a21da0265acefa7d1bd95610 100755
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -495,7 +495,7 @@ max_appendonly_tables = 10000 # Maximum number of append only tables that can
 #backslash_quote = safe_encoding	# on, off, or safe_encoding
 #escape_string_warning = on
 #regex_flavor = advanced		# advanced, extended, or basic
-#standard_conforming_strings = off
+#standard_conforming_strings = on
 
 
 # - Other Platforms and Clients -
diff --git a/src/test/regress/bugbuster/expected/xpath.out b/src/test/regress/bugbuster/expected/xpath.out
index 7dc7fbd9fe3f6c1f4a90c3629ec71777b44b87d0..dbc830560bb6f9916bc63ff58acbc7ee492818f2 100644
--- a/src/test/regress/bugbuster/expected/xpath.out
+++ b/src/test/regress/bugbuster/expected/xpath.out
@@ -284,11 +284,7 @@ DETAIL:  Entity: line 1: parser error : Premature end of data in tag a line 1
 Entity: line 1: parser error : Premature end of data in tag a line 1
 <a>hello<a>
            ^
-select xmlcomment('<a>hello<\a>');
-WARNING:  nonstandard use of escape in a string literal
-LINE 1: select xmlcomment('<a>hello<\a>');
-                          ^
-HINT:  Use the escape string syntax for escapes, e.g., E'\r\n'.
+select xmlcomment(E'<a>hello<\a>');
      xmlcomment     
 --------------------
  <!--<a>hello<a>-->
@@ -300,11 +296,7 @@ select xmlcomment('adsfasdfasdfsadf');
  <!--adsfasdfasdfsadf-->
 (1 row)
 
-select xmlcomment('\n');
-WARNING:  nonstandard use of escape in a string literal
-LINE 1: select xmlcomment('\n');
-                          ^
-HINT:  Use the escape string syntax for escapes, e.g., E'\r\n'.
+select xmlcomment(E'\n');
  xmlcomment 
 ------------
  <!--       
diff --git a/src/test/regress/bugbuster/sql/xpath.sql b/src/test/regress/bugbuster/sql/xpath.sql
index ab7e01c344a5f08bf63fa53bf429c53de09e79dd..8b9d188ee27c2562d50ba942dadfa3794a58dddf 100644
--- a/src/test/regress/bugbuster/sql/xpath.sql
+++ b/src/test/regress/bugbuster/sql/xpath.sql
@@ -21,9 +21,9 @@ select xml_out((select * from readxml));
 
 select xml_out((select xml_in('<a>hello<a>')));
 
-select xmlcomment('<a>hello<\a>');
+select xmlcomment(E'<a>hello<\a>');
 select xmlcomment('adsfasdfasdfsadf');
-select xmlcomment('\n');
+select xmlcomment(E'\n');
 select xml('<hello></hello>');
 select xml('<a><say>speak</say><hello>say hello</hello></a>');
 select xml('hello');
diff --git a/src/test/regress/expected/gpcopy.out b/src/test/regress/expected/gpcopy.out
index d96404e594b234f82102e38a1d822f55cae9863e..1be6932a80fdd882b8979b64548e400eb2b93ea5 100755
--- a/src/test/regress/expected/gpcopy.out
+++ b/src/test/regress/expected/gpcopy.out
@@ -632,11 +632,7 @@ SELECT gp_truncate_error_log('errcopy');
  t
 (1 row)
 
-COPY errcopy from stdin delimiter '\t' log errors segment reject limit 3 rows;
-WARNING:  nonstandard use of escape in a string literal
-LINE 1: COPY errcopy from stdin delimiter '\t' log errors segment re...
-                                          ^
-HINT:  Use the escape string syntax for escapes, e.g., E'\r\n'.
+COPY errcopy from stdin delimiter E'\t' log errors segment reject limit 3 rows;
 ERROR:  Segment reject limit reached. Aborting operation. Last error was: missing data for column "b"
 CONTEXT:  COPY errcopy, line 3: "1       4"
 SELECT * FROM errcopy;
diff --git a/src/test/regress/sql/gpcopy.sql b/src/test/regress/sql/gpcopy.sql
index f2e37f41df3a8a7ff6bc22aeeb4c49641a1aa11d..07291ab1931fb9c9a3e2f2fea41a1da02bab0081 100644
--- a/src/test/regress/sql/gpcopy.sql
+++ b/src/test/regress/sql/gpcopy.sql
@@ -628,7 +628,7 @@ SELECT * FROM errcopy;
 TRUNCATE errcopy;
 SELECT gp_truncate_error_log('errcopy');
 
-COPY errcopy from stdin delimiter '\t' log errors segment reject limit 3 rows;
+COPY errcopy from stdin delimiter E'\t' log errors segment reject limit 3 rows;
 1       2       0
 1       3       4
 1       4