Index: contrib/pg_upgrade/check.c
===================================================================
RCS file: /cvsroot/pgsql/contrib/pg_upgrade/check.c,v
retrieving revision 1.11
diff -c -c -r1.11 check.c
*** contrib/pg_upgrade/check.c	6 Jul 2010 19:18:55 -0000	1.11
--- contrib/pg_upgrade/check.c	13 Jul 2010 15:56:43 -0000
***************
*** 152,160 ****
  		{
  			prep_status(ctx, "Adjusting sequences");
  			exec_prog(ctx, true,
! 				  SYSTEMQUOTE "\"%s/psql\" --set ON_ERROR_STOP=on --port %d "
! 				   "--username \"%s\" -f \"%s\" --dbname template1 >> \"%s\""
! 					  SYSTEMQUOTE,
  					  ctx->new.bindir, ctx->new.port, ctx->user,
  					  sequence_script_file_name, ctx->logfile);
  			unlink(sequence_script_file_name);
--- 152,160 ----
  		{
  			prep_status(ctx, "Adjusting sequences");
  			exec_prog(ctx, true,
! 				  SYSTEMQUOTE "\"%s/psql\" --set ON_ERROR_STOP=on "
! 				  "--no-psqlrc --port %d --username \"%s\" "
! 				  "-f \"%s\" --dbname template1 >> \"%s\"" SYSTEMQUOTE,
  					  ctx->new.bindir, ctx->new.port, ctx->user,
  					  sequence_script_file_name, ctx->logfile);
  			unlink(sequence_script_file_name);
Index: contrib/pg_upgrade/pg_upgrade.c
===================================================================
RCS file: /cvsroot/pgsql/contrib/pg_upgrade/pg_upgrade.c,v
retrieving revision 1.10
diff -c -c -r1.10 pg_upgrade.c
*** contrib/pg_upgrade/pg_upgrade.c	6 Jul 2010 19:18:55 -0000	1.10
--- contrib/pg_upgrade/pg_upgrade.c	13 Jul 2010 15:56:43 -0000
***************
*** 202,210 ****
  	 */
  	prep_status(ctx, "Creating databases in the new cluster");
  	exec_prog(ctx, true,
! 			  SYSTEMQUOTE "\"%s/psql\" --port %d --username \"%s\" "
! 		   "--set ON_ERROR_STOP=on -f \"%s/%s\" --dbname template1 >> \"%s\""
! 			  SYSTEMQUOTE,
  			  ctx->new.bindir, ctx->new.port, ctx->user, ctx->cwd,
  			  GLOBALS_DUMP_FILE, ctx->logfile);
  	check_ok(ctx);
--- 202,211 ----
  	 */
  	prep_status(ctx, "Creating databases in the new cluster");
  	exec_prog(ctx, true,
! 			  SYSTEMQUOTE "\"%s/psql\" --set ON_ERROR_STOP=on "
! 			  /* --no-psqlrc prevents AUTOCOMMIT=off */
! 			  "--no-psqlrc --port %d --username \"%s\" "
! 			  "-f \"%s/%s\" --dbname template1 >> \"%s\"" SYSTEMQUOTE,
  			  ctx->new.bindir, ctx->new.port, ctx->user, ctx->cwd,
  			  GLOBALS_DUMP_FILE, ctx->logfile);
  	check_ok(ctx);
***************
*** 225,233 ****
  
  	prep_status(ctx, "Restoring database schema to new cluster");
  	exec_prog(ctx, true,
! 			  SYSTEMQUOTE "\"%s/psql\" --port %d --username \"%s\" "
! 		   "--set ON_ERROR_STOP=on -f \"%s/%s\" --dbname template1 >> \"%s\""
! 			  SYSTEMQUOTE,
  			  ctx->new.bindir, ctx->new.port, ctx->user, ctx->cwd,
  			  DB_DUMP_FILE, ctx->logfile);
  	check_ok(ctx);
--- 226,234 ----
  
  	prep_status(ctx, "Restoring database schema to new cluster");
  	exec_prog(ctx, true,
! 			  SYSTEMQUOTE "\"%s/psql\" --set ON_ERROR_STOP=on "
! 			  "--no-psqlrc --port %d --username \"%s\" "
! 			  "-f \"%s/%s\" --dbname template1 >> \"%s\"" SYSTEMQUOTE,
  			  ctx->new.bindir, ctx->new.port, ctx->user, ctx->cwd,
  			  DB_DUMP_FILE, ctx->logfile);
  	check_ok(ctx);