Someone remove a #define too much from pg_proc.h which breaks
compiling nbtsearch.c after configuring with --enable-cassert. Patch below. -- --------------------------------------------- Göran Thyni, sysadm, JMS Bildbasen, Kiruna
This commit is contained in:
Bruce Momjian
parent
c312583767
commit
1b70585d4b
@ -218,7 +218,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.10 1998/05/09 23:27:14 thomas Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.11 1998/05/12 17:46:46 momjian Exp $
|
||||
*
|
||||
* HISTORY
|
||||
* AUTHOR DATE MAJOR EVENT
|
||||
@ -3978,7 +3978,7 @@ static const short yycheck[] = { 3,
|
||||
-1, -1, 192
|
||||
};
|
||||
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
|
||||
#line 3 "/usr/lib/bison.simple"
|
||||
#line 3 "/usr/local/bison/bison.simple"
|
||||
|
||||
/* Skeleton output parser for bison,
|
||||
Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
|
||||
@ -4171,7 +4171,7 @@ __yy_memcpy (char *to, char *from, int count)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#line 196 "/usr/lib/bison.simple"
|
||||
#line 196 "/usr/local/bison/bison.simple"
|
||||
|
||||
/* The user can define YYPARSE_PARAM as the name of an argument to be passed
|
||||
into yyparse. The argument should have type void *.
|
||||
@ -9517,7 +9517,7 @@ case 846:
|
||||
break;}
|
||||
}
|
||||
/* the action file gets copied in in place of this dollarsign */
|
||||
#line 498 "/usr/lib/bison.simple"
|
||||
#line 498 "/usr/local/bison/bison.simple"
|
||||
|
||||
yyvsp -= yylen;
|
||||
yyssp -= yylen;
|
||||
|
||||
@ -128,103 +128,105 @@ typedef union
|
||||
#define TABLE 355
|
||||
#define TIME 356
|
||||
#define TIMESTAMP 357
|
||||
#define TO 358
|
||||
#define TRAILING 359
|
||||
#define TRANSACTION 360
|
||||
#define TRIM 361
|
||||
#define UNION 362
|
||||
#define UNIQUE 363
|
||||
#define UPDATE 364
|
||||
#define USING 365
|
||||
#define VALUES 366
|
||||
#define VARCHAR 367
|
||||
#define VARYING 368
|
||||
#define VIEW 369
|
||||
#define WHERE 370
|
||||
#define WITH 371
|
||||
#define WORK 372
|
||||
#define YEAR_P 373
|
||||
#define ZONE 374
|
||||
#define FALSE_P 375
|
||||
#define TRIGGER 376
|
||||
#define TRUE_P 377
|
||||
#define TYPE_P 378
|
||||
#define ABORT_TRANS 379
|
||||
#define AFTER 380
|
||||
#define AGGREGATE 381
|
||||
#define ANALYZE 382
|
||||
#define BACKWARD 383
|
||||
#define BEFORE 384
|
||||
#define BINARY 385
|
||||
#define CACHE 386
|
||||
#define CLUSTER 387
|
||||
#define COPY 388
|
||||
#define CYCLE 389
|
||||
#define DATABASE 390
|
||||
#define DELIMITERS 391
|
||||
#define DO 392
|
||||
#define EACH 393
|
||||
#define EXPLAIN 394
|
||||
#define EXTEND 395
|
||||
#define FORWARD 396
|
||||
#define FUNCTION 397
|
||||
#define HANDLER 398
|
||||
#define INCREMENT 399
|
||||
#define INDEX 400
|
||||
#define INHERITS 401
|
||||
#define INSTEAD 402
|
||||
#define ISNULL 403
|
||||
#define LANCOMPILER 404
|
||||
#define LISTEN 405
|
||||
#define LOAD 406
|
||||
#define LOCK_P 407
|
||||
#define LOCATION 408
|
||||
#define MAXVALUE 409
|
||||
#define MINVALUE 410
|
||||
#define MOVE 411
|
||||
#define NEW 412
|
||||
#define NONE 413
|
||||
#define NOTHING 414
|
||||
#define NOTNULL 415
|
||||
#define OIDS 416
|
||||
#define OPERATOR 417
|
||||
#define PROCEDURAL 418
|
||||
#define RECIPE 419
|
||||
#define RENAME 420
|
||||
#define RESET 421
|
||||
#define RETURNS 422
|
||||
#define ROW 423
|
||||
#define RULE 424
|
||||
#define SEQUENCE 425
|
||||
#define SETOF 426
|
||||
#define SHOW 427
|
||||
#define START 428
|
||||
#define STATEMENT 429
|
||||
#define STDIN 430
|
||||
#define STDOUT 431
|
||||
#define TRUSTED 432
|
||||
#define VACUUM 433
|
||||
#define VERBOSE 434
|
||||
#define VERSION 435
|
||||
#define ARCHIVE 436
|
||||
#define USER 437
|
||||
#define PASSWORD 438
|
||||
#define CREATEDB 439
|
||||
#define NOCREATEDB 440
|
||||
#define CREATEUSER 441
|
||||
#define NOCREATEUSER 442
|
||||
#define VALID 443
|
||||
#define UNTIL 444
|
||||
#define IDENT 445
|
||||
#define SCONST 446
|
||||
#define Op 447
|
||||
#define ICONST 448
|
||||
#define PARAM 449
|
||||
#define FCONST 450
|
||||
#define OP 451
|
||||
#define UMINUS 452
|
||||
#define TYPECAST 453
|
||||
#define REDUCE 454
|
||||
#define TIMEZONE_HOUR 358
|
||||
#define TIMEZONE_MINUTE 359
|
||||
#define TO 360
|
||||
#define TRAILING 361
|
||||
#define TRANSACTION 362
|
||||
#define TRIM 363
|
||||
#define UNION 364
|
||||
#define UNIQUE 365
|
||||
#define UPDATE 366
|
||||
#define USER 367
|
||||
#define USING 368
|
||||
#define VALUES 369
|
||||
#define VARCHAR 370
|
||||
#define VARYING 371
|
||||
#define VIEW 372
|
||||
#define WHERE 373
|
||||
#define WITH 374
|
||||
#define WORK 375
|
||||
#define YEAR_P 376
|
||||
#define ZONE 377
|
||||
#define FALSE_P 378
|
||||
#define TRIGGER 379
|
||||
#define TRUE_P 380
|
||||
#define TYPE_P 381
|
||||
#define ABORT_TRANS 382
|
||||
#define AFTER 383
|
||||
#define AGGREGATE 384
|
||||
#define ANALYZE 385
|
||||
#define BACKWARD 386
|
||||
#define BEFORE 387
|
||||
#define BINARY 388
|
||||
#define CACHE 389
|
||||
#define CLUSTER 390
|
||||
#define COPY 391
|
||||
#define CYCLE 392
|
||||
#define DATABASE 393
|
||||
#define DELIMITERS 394
|
||||
#define DO 395
|
||||
#define EACH 396
|
||||
#define EXPLAIN 397
|
||||
#define EXTEND 398
|
||||
#define FORWARD 399
|
||||
#define FUNCTION 400
|
||||
#define HANDLER 401
|
||||
#define INCREMENT 402
|
||||
#define INDEX 403
|
||||
#define INHERITS 404
|
||||
#define INSTEAD 405
|
||||
#define ISNULL 406
|
||||
#define LANCOMPILER 407
|
||||
#define LISTEN 408
|
||||
#define LOAD 409
|
||||
#define LOCK_P 410
|
||||
#define LOCATION 411
|
||||
#define MAXVALUE 412
|
||||
#define MINVALUE 413
|
||||
#define MOVE 414
|
||||
#define NEW 415
|
||||
#define NONE 416
|
||||
#define NOTHING 417
|
||||
#define NOTNULL 418
|
||||
#define OIDS 419
|
||||
#define OPERATOR 420
|
||||
#define PROCEDURAL 421
|
||||
#define RECIPE 422
|
||||
#define RENAME 423
|
||||
#define RESET 424
|
||||
#define RETURNS 425
|
||||
#define ROW 426
|
||||
#define RULE 427
|
||||
#define SEQUENCE 428
|
||||
#define SETOF 429
|
||||
#define SHOW 430
|
||||
#define START 431
|
||||
#define STATEMENT 432
|
||||
#define STDIN 433
|
||||
#define STDOUT 434
|
||||
#define TRUSTED 435
|
||||
#define VACUUM 436
|
||||
#define VERBOSE 437
|
||||
#define VERSION 438
|
||||
#define ARCHIVE 439
|
||||
#define PASSWORD 440
|
||||
#define CREATEDB 441
|
||||
#define NOCREATEDB 442
|
||||
#define CREATEUSER 443
|
||||
#define NOCREATEUSER 444
|
||||
#define VALID 445
|
||||
#define UNTIL 446
|
||||
#define IDENT 447
|
||||
#define SCONST 448
|
||||
#define Op 449
|
||||
#define ICONST 450
|
||||
#define PARAM 451
|
||||
#define FCONST 452
|
||||
#define OP 453
|
||||
#define UMINUS 454
|
||||
#define TYPECAST 455
|
||||
#define REDUCE 456
|
||||
|
||||
|
||||
extern YYSTYPE yylval;
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
*
|
||||
* Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $Id: pg_proc.h,v 1.56 1998/05/09 22:48:36 thomas Exp $
|
||||
* $Id: pg_proc.h,v 1.57 1998/05/12 17:46:48 momjian Exp $
|
||||
*
|
||||
* NOTES
|
||||
* The script catalog/genbki.sh reads this file and generates .bki
|
||||
@ -1225,6 +1225,7 @@ DESCR("equals");
|
||||
|
||||
DATA(insert OID = 1029 ( nullvalue PGUID 11 f t f 1 f 16 "0" 100 0 0 100 foo bar ));
|
||||
DESCR("(internal)");
|
||||
#define NullValueRegProcedure 1029
|
||||
DATA(insert OID = 1030 ( nonnullvalue PGUID 11 f t f 1 f 16 "0" 100 0 0 100 foo bar ));
|
||||
DESCR("(internal)");
|
||||
DATA(insert OID = 1031 ( aclitemin PGUID 11 f t f 1 f 1033 "0" 100 0 0 100 foo bar ));
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user