|
7 | 7 | * |
8 | 8 | * |
9 | 9 | * IDENTIFICATION |
10 | | - * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.138 2001/06/01 02:41:35 tgl Exp $ |
| 10 | + * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.139 2001/06/08 21:16:48 petere Exp $ |
11 | 11 | * |
12 | 12 | *------------------------------------------------------------------------- |
13 | 13 | */ |
@@ -59,7 +59,7 @@ static const char BinarySignature[12] = "PGBCOPY\n\377\r\n\0"; |
59 | 59 | * Static communication variables ... pretty grotty, but COPY has |
60 | 60 | * never been reentrant... |
61 | 61 | */ |
62 | | -intlineno=0;/* exported for use by elog() -- dz */ |
| 62 | +intcopy_lineno=0;/* exported for use by elog() -- dz */ |
63 | 63 | staticboolfe_eof; |
64 | 64 |
|
65 | 65 | /* |
@@ -705,14 +705,14 @@ CopyFrom(Relation rel, bool binary, bool oids, FILE *fp, |
705 | 705 | values= (Datum*)palloc(attr_count*sizeof(Datum)); |
706 | 706 | nulls= (char*)palloc(attr_count*sizeof(char)); |
707 | 707 |
|
708 | | -lineno=0; |
| 708 | +copy_lineno=0; |
709 | 709 | fe_eof= false; |
710 | 710 |
|
711 | 711 | while (!done) |
712 | 712 | { |
713 | 713 | CHECK_FOR_INTERRUPTS(); |
714 | 714 |
|
715 | | -lineno++; |
| 715 | +copy_lineno++; |
716 | 716 |
|
717 | 717 | /* Reset the per-output-tuple exprcontext */ |
718 | 718 | ResetPerTupleExprContext(estate); |
@@ -920,7 +920,7 @@ CopyFrom(Relation rel, bool binary, bool oids, FILE *fp, |
920 | 920 | /* |
921 | 921 | * Done, clean up |
922 | 922 | */ |
923 | | -lineno=0; |
| 923 | +copy_lineno=0; |
924 | 924 |
|
925 | 925 | pfree(values); |
926 | 926 | pfree(nulls); |
|