diff options
Diffstat (limited to 'src')
27 files changed, 81 insertions, 81 deletions
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index 46a842bb9a8..2c32723be62 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.286 2010/02/16 22:34:43 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.287 2010/02/17 04:19:39 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -4344,7 +4344,7 @@ xactGetCommittedChildren(TransactionId **ptr) */ /* - * Before 8.5 this was a fairly short function, but now it performs many + * Before 9.0 this was a fairly short function, but now it performs many * actions for which the order of execution is critical. */ static void diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 3c1b077c5af..31f50ecb502 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.374 2010/02/17 03:10:33 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.375 2010/02/17 04:19:39 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -7958,7 +7958,7 @@ pg_start_backup_callback(int code, Datum arg) * created by pg_start_backup, creating a backup history file in pg_xlog * instead (whence it will immediately be archived). The backup history file * contains the same info found in the label file, plus the backup-end time - * and WAL location. Before 8.5, the backup-end time was read from the backup + * and WAL location. Before 9.0, the backup-end time was read from the backup * history file at the beginning of archive recovery, but we now use the WAL * record for that and the file is for informational and debug purposes only. * diff --git a/src/backend/catalog/pg_largeobject.c b/src/backend/catalog/pg_largeobject.c index d27b20ede33..500a6c9bae6 100644 --- a/src/backend/catalog/pg_largeobject.c +++ b/src/backend/catalog/pg_largeobject.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/pg_largeobject.c,v 1.37 2010/01/07 02:41:16 rhaas Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/pg_largeobject.c,v 1.38 2010/02/17 04:19:39 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -191,7 +191,7 @@ LargeObjectAlterOwner(Oid loid, Oid newOwnerId) /* * lo_compat_privileges is not checked here, because ALTER * LARGE OBJECT ... OWNER did not exist at all prior to - * PostgreSQL 8.5. + * PostgreSQL 9.0. * * We must be the owner of the existing object. */ diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c index 0a9920097b6..3de1a9b0caa 100644 --- a/src/backend/commands/functioncmds.c +++ b/src/backend/commands/functioncmds.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/functioncmds.c,v 1.116 2010/02/14 18:42:14 rhaas Exp $ + * $PostgreSQL: pgsql/src/backend/commands/functioncmds.c,v 1.117 2010/02/17 04:19:39 tgl Exp $ * * DESCRIPTION * These routines take the parse tree and pick out the @@ -288,7 +288,7 @@ examine_parameter_list(List *parameters, Oid languageOid, ListCell *px; /* - * As of Postgres 8.5 we disallow using the same name for two + * As of Postgres 9.0 we disallow using the same name for two * input or two output function parameters. Depending on the * function's language, conflicting input and output names might * be bad too, but we leave it to the PL to complain if so. diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c index 2ff3835ab0f..32c06127912 100644 --- a/src/backend/commands/tablespace.c +++ b/src/backend/commands/tablespace.c @@ -19,7 +19,7 @@ * Thus the full path to an arbitrary file is * $PGDATA/pg_tblspc/spcoid/PG_MAJORVER_CATVER/dboid/relfilenode * e.g. - * $PGDATA/pg_tblspc/20981/PG_8.5_201001061/719849/83292814 + * $PGDATA/pg_tblspc/20981/PG_9.0_201002161/719849/83292814 * * There are two tablespaces created at initdb time: pg_global (for shared * tables) and pg_default (for everything else). For backwards compatibility @@ -40,7 +40,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.72 2010/01/14 11:08:01 sriggs Exp $ + * $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.73 2010/02/17 04:19:39 tgl Exp $ * *------------------------------------------------------------------------- */ diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 235a7001adf..94b28bf3d89 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.709 2010/02/16 22:34:49 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.710 2010/02/17 04:19:39 tgl Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -1997,7 +1997,7 @@ ClosePortalStmt: * COPY ( SELECT ... ) TO file [WITH] [(options)] * * In the preferred syntax the options are comma-separated - * and use generic identifiers instead of keywords. The pre-8.5 + * and use generic identifiers instead of keywords. The pre-9.0 * syntax had a hard-wired, space-separated set of options. * * Really old syntax, from versions 7.2 and prior: diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c index a2f15a9a03e..0e57611da42 100644 --- a/src/backend/replication/walreceiver.c +++ b/src/backend/replication/walreceiver.c @@ -2,7 +2,7 @@ * * walreceiver.c * - * The WAL receiver process (walreceiver) is new as of Postgres 8.5. It + * The WAL receiver process (walreceiver) is new as of Postgres 9.0. It * is the process in the standby server that takes charge of receiving * XLOG records from a primary server during streaming replication. * @@ -29,7 +29,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/replication/walreceiver.c,v 1.3 2010/02/03 09:47:19 heikki Exp $ + * $PostgreSQL: pgsql/src/backend/replication/walreceiver.c,v 1.4 2010/02/17 04:19:39 tgl Exp $ * *------------------------------------------------------------------------- */ diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c index 0115b70fa2a..eb9a5425a2e 100644 --- a/src/backend/replication/walsender.c +++ b/src/backend/replication/walsender.c @@ -2,7 +2,7 @@ * * walsender.c * - * The WAL sender process (walsender) is new as of Postgres 8.5. It takes + * The WAL sender process (walsender) is new as of Postgres 9.0. It takes * charge of XLOG streaming sender in the primary server. At first, it is * started by the postmaster when the walreceiver in the standby server * connects to the primary server and requests XLOG streaming replication, @@ -30,7 +30,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/replication/walsender.c,v 1.5 2010/02/03 09:47:19 heikki Exp $ + * $PostgreSQL: pgsql/src/backend/replication/walsender.c,v 1.6 2010/02/17 04:19:39 tgl Exp $ * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index cc62c4fb7c4..f015f5b842b 100644 --- a/src/backend/utils/cache/relcache.c +++ b/src/backend/utils/cache/relcache.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/relcache.c,v 1.306 2010/02/14 18:42:17 rhaas Exp $ + * $PostgreSQL: pgsql/src/backend/utils/cache/relcache.c,v 1.307 2010/02/17 04:19:39 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -3831,7 +3831,7 @@ RelationGetExclusionInfo(Relation indexRelation, * relation descriptors using sequential scans and write 'em to * the initialization file for use by subsequent backends. * - * As of Postgres 8.5, there is one local initialization file in each + * As of Postgres 9.0, there is one local initialization file in each * database, plus one shared initialization file for shared catalogs. * * We could dispense with the initialization files and just build the diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index d4e775b57cd..a689e302429 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -42,7 +42,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.221 2010/01/02 16:57:56 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.222 2010/02/17 04:19:39 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -2800,7 +2800,7 @@ is_log_level_output(int elevel, int log_min_level) * else display as whatever level is set. It may still be shown, but only * if log_min_messages is set lower than trace_recovery_messages. * - * Intention is to keep this for at least the whole of the 8.5 production + * Intention is to keep this for at least the whole of the 9.0 production * release, so we can more easily diagnose production problems in the field. */ int diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index fbdfa8f0523..bde3be91cf3 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -10,7 +10,7 @@ * Written by Peter Eisentraut <peter_e@gmx.net>. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.540 2010/02/17 01:39:35 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.541 2010/02/17 04:19:40 tgl Exp $ * *-------------------------------------------------------------------- */ @@ -1247,7 +1247,7 @@ static struct config_bool ConfigureNamesBool[] = {"lo_compat_privileges", PGC_SUSET, COMPAT_OPTIONS_PREVIOUS, gettext_noop("Enables backward compatibility mode for privilege checks on large objects"), gettext_noop("Skips privilege checks when reading or modifying large objects, " - "for compatibility with PostgreSQL releases prior to 8.5.") + "for compatibility with PostgreSQL releases prior to 9.0.") }, &lo_compat_privileges, false, NULL, NULL diff --git a/src/bin/pg_dump/pg_backup_db.c b/src/bin/pg_dump/pg_backup_db.c index 4aa10135bb0..53711de1191 100644 --- a/src/bin/pg_dump/pg_backup_db.c +++ b/src/bin/pg_dump/pg_backup_db.c @@ -5,7 +5,7 @@ * Implements the basic DB functions used by the archiver. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.86 2010/02/05 03:09:05 joe Exp $ + * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.87 2010/02/17 04:19:40 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -704,7 +704,7 @@ void DropBlobIfExists(ArchiveHandle *AH, Oid oid) { /* Call lo_unlink only if exists to avoid not-found error. */ - if (PQserverVersion(AH->connection) >= 80500) + if (PQserverVersion(AH->connection) >= 90000) { ahprintf(AH, "SELECT pg_catalog.lo_unlink(oid) " "FROM pg_catalog.pg_largeobject_metadata " diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index 538a518ef55..ace4ffe34bb 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -12,7 +12,7 @@ * by PostgreSQL * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.570 2010/02/07 20:48:10 tgl Exp $ + * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.571 2010/02/17 04:19:40 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -604,7 +604,7 @@ main(int argc, char **argv) * If supported, set extra_float_digits so that we can dump float data * exactly (given correctly implemented float I/O code, anyway) */ - if (g_fout->remoteVersion >= 80500) + if (g_fout->remoteVersion >= 90000) do_sql_command(g_conn, "SET extra_float_digits TO 3"); else if (g_fout->remoteVersion >= 70400) do_sql_command(g_conn, "SET extra_float_digits TO 2"); @@ -1952,7 +1952,7 @@ hasBlobs(Archive *AH) selectSourceSchema("pg_catalog"); /* Check for BLOB OIDs */ - if (AH->remoteVersion >= 80500) + if (AH->remoteVersion >= 90000) blobQry = "SELECT oid FROM pg_largeobject_metadata LIMIT 1"; else if (AH->remoteVersion >= 70100) blobQry = "SELECT loid FROM pg_largeobject LIMIT 1"; @@ -1990,7 +1990,7 @@ dumpBlobs(Archive *AH, void *arg) selectSourceSchema("pg_catalog"); /* Cursor to get all BLOB OIDs */ - if (AH->remoteVersion >= 80500) + if (AH->remoteVersion >= 90000) blobQry = "DECLARE bloboid CURSOR FOR SELECT oid FROM pg_largeobject_metadata"; else if (AH->remoteVersion >= 70100) blobQry = "DECLARE bloboid CURSOR FOR SELECT DISTINCT loid FROM pg_largeobject"; @@ -2080,7 +2080,7 @@ dumpBlobComments(Archive *AH, void *arg) selectSourceSchema("pg_catalog"); /* Cursor to get all BLOB comments */ - if (AH->remoteVersion >= 80500) + if (AH->remoteVersion >= 90000) blobQry = "DECLARE blobcmt CURSOR FOR SELECT oid, " "obj_description(oid, 'pg_largeobject'), " "pg_get_userbyid(lomowner), lomacl " @@ -3472,7 +3472,7 @@ getTables(int *numTables) * we cannot correctly identify inherited columns, owned sequences, etc. */ - if (g_fout->remoteVersion >= 80500) + if (g_fout->remoteVersion >= 90000) { /* * Left join to pick up dependency info linking sequences to their @@ -3992,7 +3992,7 @@ getIndexes(TableInfo tblinfo[], int numTables) * assume an index won't have more than one internal dependency. */ resetPQExpBuffer(query); - if (g_fout->remoteVersion >= 80500) + if (g_fout->remoteVersion >= 90000) { appendPQExpBuffer(query, "SELECT t.tableoid, t.oid, " @@ -4622,7 +4622,7 @@ getTriggers(TableInfo tblinfo[], int numTables) selectSourceSchema(tbinfo->dobj.namespace->dobj.name); resetPQExpBuffer(query); - if (g_fout->remoteVersion >= 80500) + if (g_fout->remoteVersion >= 90000) { /* * NB: think not to use pretty=true in pg_get_triggerdef. It @@ -4831,7 +4831,7 @@ getProcLangs(int *numProcLangs) /* Make sure we are in proper schema */ selectSourceSchema("pg_catalog"); - if (g_fout->remoteVersion >= 80500) + if (g_fout->remoteVersion >= 90000) { /* pg_language has a laninline column */ appendPQExpBuffer(query, "SELECT tableoid, oid, " @@ -5154,9 +5154,9 @@ getTableAttrs(TableInfo *tblinfo, int numTables) resetPQExpBuffer(q); - if (g_fout->remoteVersion >= 80500) + if (g_fout->remoteVersion >= 90000) { - /* attoptions is new in 8.5 */ + /* attoptions is new in 9.0 */ appendPQExpBuffer(q, "SELECT a.attnum, a.attname, a.atttypmod, " "a.attstattarget, a.attstorage, t.typstorage, " "a.attnotnull, a.atthasdef, a.attisdropped, " @@ -6048,7 +6048,7 @@ getDefaultACLs(int *numDefaultACLs) int i, ntups; - if (g_fout->remoteVersion < 80500) + if (g_fout->remoteVersion < 90000) { *numDefaultACLs = 0; return NULL; diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c index f1d74574313..53a1e25d7ad 100644 --- a/src/bin/pg_dump/pg_dumpall.c +++ b/src/bin/pg_dump/pg_dumpall.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.132 2010/02/05 03:09:05 joe Exp $ + * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.133 2010/02/17 04:19:40 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -507,7 +507,7 @@ main(int argc, char *argv[]) /* Dump role/database settings */ if (!tablespaces_only && !roles_only) { - if (server_version >= 80500) + if (server_version >= 90000) dumpDbRoleConfig(conn); } } @@ -956,7 +956,7 @@ dumpTablespaces(PGconn *conn) * Get all tablespaces except built-in ones (which we assume are named * pg_xxx) */ - if (server_version >= 80500) + if (server_version >= 90000) res = executeQuery(conn, "SELECT spcname, " "pg_catalog.pg_get_userbyid(spcowner) AS spcowner, " "spclocation, spcacl, " @@ -1348,14 +1348,14 @@ dumpDatabaseConfig(PGconn *conn, const char *dbname) { PGresult *res; - if (server_version >= 80500) + if (server_version >= 90000) printfPQExpBuffer(buf, "SELECT setconfig[%d] FROM pg_db_role_setting WHERE " "setrole = 0 AND setdatabase = (SELECT oid FROM pg_database WHERE datname = ", count); else printfPQExpBuffer(buf, "SELECT datconfig[%d] FROM pg_database WHERE datname = ", count); appendStringLiteralConn(buf, dbname, conn); - if (server_version >= 80500) + if (server_version >= 90000) appendPQExpBuffer(buf, ")"); appendPQExpBuffer(buf, ";"); @@ -1394,7 +1394,7 @@ dumpUserConfig(PGconn *conn, const char *username) { PGresult *res; - if (server_version >= 80500) + if (server_version >= 90000) printfPQExpBuffer(buf, "SELECT setconfig[%d] FROM pg_db_role_setting WHERE " "setdatabase = 0 AND setrole = " "(SELECT oid FROM pg_authid WHERE rolname = ", count); @@ -1403,7 +1403,7 @@ dumpUserConfig(PGconn *conn, const char *username) else printfPQExpBuffer(buf, "SELECT useconfig[%d] FROM pg_shadow WHERE usename = ", count); appendStringLiteralConn(buf, username, conn); - if (server_version >= 80500) + if (server_version >= 90000) appendPQExpBuffer(buf, ")"); res = executeQuery(conn, buf->data); diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c index d42cf2394fa..6a6517d0032 100644 --- a/src/bin/psql/describe.c +++ b/src/bin/psql/describe.c @@ -8,7 +8,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.236 2010/01/28 23:21:12 petere Exp $ + * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.237 2010/02/17 04:19:40 tgl Exp $ */ #include "postgres_fe.h" @@ -745,7 +745,7 @@ listDefaultACLs(const char *pattern) printQueryOpt myopt = pset.popt; static const bool translate_columns[] = {false, false, true, false}; - if (pset.sversion < 80500) + if (pset.sversion < 90000) { fprintf(stderr, _("The server (version %d.%d) does not support altering default privileges.\n"), pset.sversion / 10000, (pset.sversion / 100) % 100); @@ -1123,7 +1123,7 @@ describeOneTableDetails(const char *schemaname, initPQExpBuffer(&tmpbuf); /* Get general table info */ - if (pset.sversion >= 80500) + if (pset.sversion >= 90000) { printfPQExpBuffer(&buf, "SELECT c.relchecks, c.relkind, c.relhasindex, c.relhasrules, " @@ -1207,9 +1207,9 @@ describeOneTableDetails(const char *schemaname, strdup(PQgetvalue(res, 0, 6)) : 0; tableinfo.tablespace = (pset.sversion >= 80000) ? atooid(PQgetvalue(res, 0, 7)) : 0; - tableinfo.hasexclusion = (pset.sversion >= 80500) ? + tableinfo.hasexclusion = (pset.sversion >= 90000) ? strcmp(PQgetvalue(res, 0, 8), "t") == 0 : false; - tableinfo.reloftype = (pset.sversion >= 80500 && strcmp(PQgetvalue(res, 0, 9), "") != 0) ? + tableinfo.reloftype = (pset.sversion >= 90000 && strcmp(PQgetvalue(res, 0, 9), "") != 0) ? strdup(PQgetvalue(res, 0, 9)) : 0; PQclear(res); res = NULL; @@ -1413,7 +1413,7 @@ describeOneTableDetails(const char *schemaname, appendPQExpBuffer(&buf, "i.indisvalid,\n"); else appendPQExpBuffer(&buf, "true AS indisvalid,\n"); - if (pset.sversion >= 80500) + if (pset.sversion >= 90000) appendPQExpBuffer(&buf, " (NOT i.indimmediate) AND " "EXISTS (SELECT 1 FROM pg_catalog.pg_depend d, " @@ -1549,7 +1549,7 @@ describeOneTableDetails(const char *schemaname, else appendPQExpBuffer(&buf, "true as indisvalid, "); appendPQExpBuffer(&buf, "pg_catalog.pg_get_indexdef(i.indexrelid, 0, true)"); - if (pset.sversion >= 80500) + if (pset.sversion >= 90000) appendPQExpBuffer(&buf, ",\n (NOT i.indimmediate) AND " "EXISTS (SELECT 1 FROM pg_catalog.pg_depend d, " @@ -1862,9 +1862,9 @@ describeOneTableDetails(const char *schemaname, "t.tgenabled\n" "FROM pg_catalog.pg_trigger t\n" "WHERE t.tgrelid = '%s' AND ", - (pset.sversion >= 80500 ? ", true" : ""), + (pset.sversion >= 90000 ? ", true" : ""), oid); - if (pset.sversion >= 80500) + if (pset.sversion >= 90000) appendPQExpBuffer(&buf, "NOT t.tgisinternal"); else if (pset.sversion >= 80300) appendPQExpBuffer(&buf, "t.tgconstraint = 0"); @@ -2319,7 +2319,7 @@ listDbRoleSettings(const char *pattern, const char *pattern2) initPQExpBuffer(&buf); - if (pset.sversion >= 80500) + if (pset.sversion >= 90000) { bool havewhere; diff --git a/src/bin/psql/large_obj.c b/src/bin/psql/large_obj.c index 2c965828964..a83039d353c 100644 --- a/src/bin/psql/large_obj.c +++ b/src/bin/psql/large_obj.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/large_obj.c,v 1.54 2010/01/02 16:57:59 momjian Exp $ + * $PostgreSQL: pgsql/src/bin/psql/large_obj.c,v 1.55 2010/02/17 04:19:40 tgl Exp $ */ #include "postgres_fe.h" #include "large_obj.h" @@ -278,7 +278,7 @@ do_lo_list(void) char buf[1024]; printQueryOpt myopt = pset.popt; - if (pset.sversion >= 80500) + if (pset.sversion >= 90000) { snprintf(buf, sizeof(buf), "SELECT oid as \"%s\",\n" diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c index 242ea9ebae1..af1dc8c397d 100644 --- a/src/bin/scripts/vacuumdb.c +++ b/src/bin/scripts/vacuumdb.c @@ -5,7 +5,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/bin/scripts/vacuumdb.c,v 1.34 2010/02/08 04:33:54 tgl Exp $ + * $PostgreSQL: pgsql/src/bin/scripts/vacuumdb.c,v 1.35 2010/02/17 04:19:40 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -227,7 +227,7 @@ vacuum_one_database(const char *dbname, bool full, bool verbose, bool and_analyz else { appendPQExpBuffer(&sql, "VACUUM"); - if (PQserverVersion(conn) >= 80500) + if (PQserverVersion(conn) >= 90000) { const char *paren = " ("; const char *comma = ", "; diff --git a/src/include/catalog/pg_control.h b/src/include/catalog/pg_control.h index f064ef4acab..8d9d3f37176 100644 --- a/src/include/catalog/pg_control.h +++ b/src/include/catalog/pg_control.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_control.h,v 1.49 2010/01/20 19:43:40 heikki Exp $ + * $PostgreSQL: pgsql/src/include/catalog/pg_control.h,v 1.50 2010/02/17 04:19:40 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -21,7 +21,7 @@ /* Version identifier for this pg_control format */ -#define PG_CONTROL_VERSION 853 +#define PG_CONTROL_VERSION 901 /* * Body of CheckPoint XLOG records. This is declared here because we keep diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h index c1e711dff87..9cc8edd3c65 100644 --- a/src/include/nodes/primnodes.h +++ b/src/include/nodes/primnodes.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/primnodes.h,v 1.154 2010/01/02 16:58:04 momjian Exp $ + * $PostgreSQL: pgsql/src/include/nodes/primnodes.h,v 1.155 2010/02/17 04:19:40 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -211,7 +211,7 @@ typedef struct Param * Aggref * * The aggregate's args list is a targetlist, ie, a list of TargetEntry nodes - * (before Postgres 8.5 it was just bare expressions). The non-resjunk TLEs + * (before Postgres 9.0 it was just bare expressions). The non-resjunk TLEs * represent the aggregate's regular arguments (if any) and resjunk TLEs can * be added at the end to represent ORDER BY expressions that are not also * arguments. As in a top-level Query, the TLEs can be marked with diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32 index de97bcfab12..b9ebeb55cae 100644 --- a/src/include/pg_config.h.win32 +++ b/src/include/pg_config.h.win32 @@ -560,16 +560,16 @@ #define PACKAGE_NAME "PostgreSQL" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "PostgreSQL 8.5devel" +#define PACKAGE_STRING "PostgreSQL 9.0devel" /* Define to the version of this package. */ -#define PACKAGE_VERSION "8.5devel" +#define PACKAGE_VERSION "9.0devel" /* PostgreSQL version as a string */ -#define PG_VERSION "8.5devel" +#define PG_VERSION "9.0devel" /* PostgreSQL version as a number */ -#define PG_VERSION_NUM 80500 +#define PG_VERSION_NUM 90000 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "postgresql" diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index 994b70b1904..89e61a7ec71 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.386 2010/02/05 03:09:05 joe Exp $ + * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.387 2010/02/17 04:19:41 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -84,7 +84,7 @@ static int ldapServiceLookup(const char *purl, PQconninfoOption *options, #endif /* - * Pre-8.5 servers will return this SQLSTATE if asked to set + * Pre-9.0 servers will return this SQLSTATE if asked to set * application_name in a startup packet. We hard-wire the value rather * than looking into errcodes.h since it reflects historical behavior * rather than that of the current code. @@ -2033,7 +2033,7 @@ keep_going: /* We will come back to here until there is { /* * If we tried to send application_name, check to see - * if the error is about that --- pre-8.5 servers will + * if the error is about that --- pre-9.0 servers will * reject it at this stage of the process. If so, * close the connection and retry without sending * application_name. We could possibly get a false diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c index df4e8879c84..bded5aedd9d 100644 --- a/src/interfaces/libpq/fe-exec.c +++ b/src/interfaces/libpq/fe-exec.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.209 2010/02/16 20:58:14 momjian Exp $ + * $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.210 2010/02/17 04:19:41 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -3345,7 +3345,7 @@ PQescapeByteaConn(PGconn *conn, return NULL; return PQescapeByteaInternal(conn, from, from_length, to_length, conn->std_strings, - (conn->sversion >= 80500)); + (conn->sversion >= 90000)); } unsigned char * diff --git a/src/interfaces/libpq/libpq.rc.in b/src/interfaces/libpq/libpq.rc.in index 318fd628496..2e387c9f9b9 100644 --- a/src/interfaces/libpq/libpq.rc.in +++ b/src/interfaces/libpq/libpq.rc.in @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 8,5,0,0 - PRODUCTVERSION 8,5,0,0 + FILEVERSION 9,0,0,0 + PRODUCTVERSION 9,0,0,0 FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,13 +15,13 @@ BEGIN BEGIN VALUE "CompanyName", "\0" VALUE "FileDescription", "PostgreSQL Access Library\0" - VALUE "FileVersion", "8.5.0\0" + VALUE "FileVersion", "9.0.0\0" VALUE "InternalName", "libpq\0" VALUE "LegalCopyright", "Copyright (C) 2010\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "libpq.dll\0" VALUE "ProductName", "PostgreSQL\0" - VALUE "ProductVersion", "8.5.0\0" + VALUE "ProductVersion", "9.0.0\0" END END BLOCK "VarFileInfo" diff --git a/src/port/win32ver.rc b/src/port/win32ver.rc index 188b5b0c405..6757dc1ac2a 100644 --- a/src/port/win32ver.rc +++ b/src/port/win32ver.rc @@ -2,8 +2,8 @@ #include "pg_config.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 8,5,0,0 - PRODUCTVERSION 8,5,0,0 + FILEVERSION 9,0,0,0 + PRODUCTVERSION 9,0,0,0 FILEFLAGSMASK 0x17L FILEFLAGS 0x0L FILEOS VOS_NT_WINDOWS32 diff --git a/src/test/regress/expected/copy2.out b/src/test/regress/expected/copy2.out index 5f921dda8a2..15cbe029770 100644 --- a/src/test/regress/expected/copy2.out +++ b/src/test/regress/expected/copy2.out @@ -195,7 +195,7 @@ COPY y TO stdout WITH CSV FORCE QUOTE *; "Jackson, Sam","\h" "It is ""perfect""."," " "", --- Repeat above tests with new 8.5 option syntax +-- Repeat above tests with new 9.0 option syntax COPY y TO stdout (FORMAT CSV); "Jackson, Sam",\h "It is ""perfect"".", diff --git a/src/test/regress/sql/copy2.sql b/src/test/regress/sql/copy2.sql index ba0b0a62ad7..c2e8b037e74 100644 --- a/src/test/regress/sql/copy2.sql +++ b/src/test/regress/sql/copy2.sql @@ -130,7 +130,7 @@ COPY y TO stdout WITH CSV QUOTE '''' DELIMITER '|'; COPY y TO stdout WITH CSV FORCE QUOTE col2 ESCAPE E'\\'; COPY y TO stdout WITH CSV FORCE QUOTE *; --- Repeat above tests with new 8.5 option syntax +-- Repeat above tests with new 9.0 option syntax COPY y TO stdout (FORMAT CSV); COPY y TO stdout (FORMAT CSV, QUOTE '''', DELIMITER '|'); diff --git a/src/tools/version_stamp.pl b/src/tools/version_stamp.pl index 44d2d99e8fd..aff2c289fda 100755 --- a/src/tools/version_stamp.pl +++ b/src/tools/version_stamp.pl @@ -5,7 +5,7 @@ # # Copyright (c) 2008-2010, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/tools/version_stamp.pl,v 1.5 2010/01/02 16:58:16 momjian Exp $ +# $PostgreSQL: pgsql/src/tools/version_stamp.pl,v 1.6 2010/02/17 04:19:41 tgl Exp $ ################################################################# # @@ -22,8 +22,8 @@ # Major version is hard-wired into the script. We update it when we branch # a new development version. -$major1 = 8; -$major2 = 5; +$major1 = 9; +$major2 = 0; # Validate argument and compute derived variables $minor = shift; |