diff options
author | Bruce Momjian <bruce@momjian.us> | 1999-09-27 20:00:44 +0000 |
---|---|---|
committer | Bruce Momjian <bruce@momjian.us> | 1999-09-27 20:00:44 +0000 |
commit | 12a932251c9c11e4b5951e7856e932c67ff73b31 (patch) | |
tree | 9679e71501e606d9997d71b10d2f6310d28fc9ce /src/backend/commands/copy.c | |
parent | 23e10804f098ea726f667d6eefb1f71dfe1c7dbd (diff) | |
download | postgresql-12a932251c9c11e4b5951e7856e932c67ff73b31.tar.gz postgresql-12a932251c9c11e4b5951e7856e932c67ff73b31.zip |
Cancel query support from Massimo
Diffstat (limited to 'src/backend/commands/copy.c')
-rw-r--r-- | src/backend/commands/copy.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index 493d2a170e1..ada751c37fa 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -6,7 +6,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.88 1999/09/18 19:06:40 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.89 1999/09/27 20:00:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -29,6 +29,7 @@ #include "lib/stringinfo.h" #include "libpq/libpq.h" #include "miscadmin.h" +#include "tcop/tcopprot.h" #include "utils/acl.h" #include "utils/builtins.h" #include "utils/syscache.h" @@ -414,6 +415,8 @@ CopyTo(Relation rel, bool binary, bool oids, FILE *fp, char *delim) while (HeapTupleIsValid(tuple = heap_getnext(scandesc, 0))) { + if (QueryCancel) + CancelQuery(); if (oids && !binary) { @@ -686,6 +689,9 @@ CopyFrom(Relation rel, bool binary, bool oids, FILE *fp, char *delim) while (!done) { + if (QueryCancel) + CancelQuery(); + if (!binary) { int newline = 0; |