~aglenyoung/+junk/postgres-9.3-dtrace

« back to all changes in this revision

Viewing changes to src/bin/pg_dump/pg_dump.c

  • Committer: Package Import Robot
  • Author(s): Martin Pitt, Christoph Berg, Martin Pitt
  • Date: 2013-06-26 15:13:32 UTC
  • mfrom: (1.1.1)
  • Revision ID: package-import@ubuntu.com-20130626151332-p34yjpn0txbdsdzd
Tags: 9.3~beta2-1
[ Christoph Berg ]
* hurd-i386: Ignore testsuite failures so we have a working libpq5 (they
  don't implement semaphores so the server won't even start).
* Mark postgresql-9.3 as beta in the description, suggested by Joshua D.
  Drake.

[ Martin Pitt ]
* New upstream release 9.3 beta2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
675
675
        if (numWorkers > 1 && fout->remoteVersion < 90200
676
676
                && !no_synchronized_snapshots)
677
677
                exit_horribly(NULL,
678
 
                                          "Synchronized snapshots are not supported by this server version.\n"
679
 
                                          "Run with --no-synchronized-snapshots instead if you do not need\n"
 
678
                 "Synchronized snapshots are not supported by this server version.\n"
 
679
                  "Run with --no-synchronized-snapshots instead if you do not need\n"
680
680
                                          "synchronized snapshots.\n");
681
681
 
682
682
        /* Find the last built-in OID, if needed */
13098
13098
                        appendPQExpBuffer(q, "\nOPTIONS (\n    %s\n)", ftoptions);
13099
13099
 
13100
13100
                /*
13101
 
                 * For materialized views, create the AS clause just like a view.
13102
 
                 * At this point, we always mark the view as not populated.
 
13101
                 * For materialized views, create the AS clause just like a view. At
 
13102
                 * this point, we always mark the view as not populated.
13103
13103
                 */
13104
13104
                if (tbinfo->relkind == RELKIND_MATVIEW)
13105
13105
                {
14663
14663
                                        /* check table explicitly requested */
14664
14664
                                        if (table_include_oids.head != NULL &&
14665
14665
                                                simple_oid_list_member(&table_include_oids,
14666
 
                                                                                                configtbloid))
 
14666
                                                                                           configtbloid))
14667
14667
                                                dumpobj = true;
14668
14668
 
14669
14669
                                        /* check table's schema explicitly requested */
14674
14674
                                /* check table excluded by an exclusion switch */
14675
14675
                                if (table_exclude_oids.head != NULL &&
14676
14676
                                        simple_oid_list_member(&table_exclude_oids,
14677
 
                                                                                        configtbloid))
 
14677
                                                                                   configtbloid))
14678
14678
                                        dumpobj = false;
14679
14679
 
14680
14680
                                /* check schema excluded by an exclusion switch */
14681
14681
                                if (simple_oid_list_member(&schema_exclude_oids,
14682
 
                                        configtbl->dobj.namespace->dobj.catId.oid))
 
14682
                                                                  configtbl->dobj.namespace->dobj.catId.oid))
14683
14683
                                        dumpobj = false;
14684
14684
 
14685
14685
                                if (dumpobj)
14686
14686
                                {
14687
14687
                                        /*
14688
 
                                         * Note: config tables are dumped without OIDs regardless of
14689
 
                                         * the --oids setting.  This is because row filtering
 
14688
                                         * Note: config tables are dumped without OIDs regardless
 
14689
                                         * of the --oids setting.  This is because row filtering
14690
14690
                                         * conditions aren't compatible with dumping OIDs.
14691
14691
                                         */
14692
14692
                                        makeTableDataInfo(configtbl, false);