git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c

index 9c8eaaf14e9880bb051a18ce15e364225610b62f..08666584299bc669cf6bedfcf197e8d9b7f771d4 100644 (file)

--- a/src/bin/pg_dump/pg_backup_archiver.c

+++ b/src/bin/pg_dump/pg_backup_archiver.c

*

*

* IDENTIFICATION

- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.67 2003年02月01日 22:06:59 tgl Exp $

+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.68 2003年02月14日 19:40:42 momjian Exp $

*

*-------------------------------------------------------------------------

*/

sav = SetOutput(AH, ropt->filename, ropt->compression);

ahprintf(AH, "--\n-- PostgreSQL database dump\n--\n\n");

-

+ ahprintf(AH, "SET autocommit TO 'on';\n\n");

+

/*

* Drop the items at the start, in reverse order

*/

dbname ? fmtId(dbname) : "-");

appendPQExpBuffer(qry, " %s\n\n",

fmtId(user));

-

+ appendPQExpBuffer(qry, "SET autocommit TO 'on';\n\n");

+

ahprintf(AH, qry->data);

destroyPQExpBuffer(qry);

diff --git a/src/bin/pg_dump/pg_backup_db.c b/src/bin/pg_dump/pg_backup_db.c

index eab4729e217304d6b48fec8d95ee6a4d88d70a14..60771922e5f9c0a4720240452e7a1566176c2af4 100644 (file)

--- a/src/bin/pg_dump/pg_backup_db.c

+++ b/src/bin/pg_dump/pg_backup_db.c

* Implements the basic DB functions used by the archiver.

*

* IDENTIFICATION

- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.45 2003年02月13日 04:54:15 momjian Exp $

+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.46 2003年02月14日 19:40:42 momjian Exp $

*

*-------------------------------------------------------------------------

*/

if (password)

free(password);

+ /* check for version mismatch */

+ _check_database_version(AH, true);

+

+ /* Turn autocommit on */

+ if (AH->public.remoteVersion >= 70300)

+ {

+ PGresult *res;

+

+ res = PQexec(AH->connection, "SET autocommit TO 'on'");

+ if (!res || PQresultStatus(res) != PGRES_COMMAND_OK)

+ die_horribly(AH, NULL, "SET autocommit TO 'on' failed: %s",

+ PQerrorMessage(AH->connection));

+ PQclear(res);

+ }

+

PQsetNoticeProcessor(newConn, notice_processor, NULL);

return newConn;

diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c

index 4421d13e060f0dc3aa7f79bbbe25e8c0fdbd196c..33b1bbae09346682fbbef8fd901bcea5d7ac252c 100644 (file)

--- a/src/bin/pg_dump/pg_dumpall.c

+++ b/src/bin/pg_dump/pg_dumpall.c

* Portions Copyright (c) 1994, Regents of the University of California

*

*

- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.13 2003年01月16日 15:27:59 tgl Exp $

+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.14 2003年02月14日 19:40:42 momjian Exp $

*

*-------------------------------------------------------------------------

*/

printf("-- PostgreSQL database cluster dump\n");

printf("--\n\n");

printf("\\connect \"template1\"\n\n");

+ printf("SET autocommit TO 'on';\n\n");

dumpUsers(conn);

dumpGroups(conn);

fprintf(stderr, _("%s: dumping database \"%s\"...\n"), progname, dbname);

printf("\\connect %s\n", fmtId(dbname));

+ printf("SET autocommit TO 'on';\n\n");

ret = runPgDump(dbname);

if (ret != 0)

{

}

PQclear(res);

+ if (server_version >= 70300)

+ {

+ PGresult *res;

+

+ res = executeQuery(conn, "SET autocommit TO 'on';SELECT 1;");

+ PQclear(res);

+ }

+

return conn;

}