Skip to content

Commit 63ababb

Browse files
dmpgprodmpgpro
committed
Merge branch 'REL9_5_STABLE' into PGPRO9_5
2 parents 3e485fe + 2d22c3b commit 63ababb

File tree

6 files changed

+40
-22
lines changed

6 files changed

+40
-22
lines changed

‎doc/src/sgml/external-projects.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@
178178
<row>
179179
<entry>PL/PHP</entry>
180180
<entry>PHP</entry>
181-
<entry><ulink url="http://www.commandprompt.com/community/plphp/">http://www.commandprompt.com/community/plphp/</ulink></entry>
181+
<entry><ulink url="https://public.commandprompt.com/projects/plphp">https://public.commandprompt.com/projects/plphp</ulink></entry>
182182
</row>
183183

184184
<row>

‎doc/src/sgml/ref/insert.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac
194194
column leaves the other fields null.) When referencing a
195195
column with <literal>ON CONFLICT DO UPDATE</>, do not include
196196
the table's name in the specification of a target column. For
197-
example, <literal>INSERT ... ON CONFLICT DO UPDATE tab SET
198-
table_name.col = 1</> is invalid (this follows the general
197+
example, <literal>INSERT INTO table_name ... ON CONFLICT DO UPDATE
198+
SET table_name.col = 1</> is invalid (this follows the general
199199
behavior for <command>UPDATE</>).
200200
</para>
201201
</listitem>

‎doc/src/sgml/ref/update.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ UPDATE [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ * ] [
123123
The column name can be qualified with a subfield name or array
124124
subscript, if needed. Do not include the table's name in the
125125
specification of a target column &mdash; for example,
126-
<literal>UPDATE tab SET tab.col = 1</> is invalid.
126+
<literal>UPDATE table_name SET table_name.col = 1</> is invalid.
127127
</para>
128128
</listitem>
129129
</varlistentry>

‎src/bin/pg_xlogdump/pg_xlogdump.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@ main(int argc, char **argv)
855855
if (!verify_directory(private.inpath))
856856
{
857857
fprintf(stderr,
858-
"%s: path \"%s\" cannot be opened: %s",
858+
"%s: path \"%s\" cannot be opened: %s\n",
859859
progname, private.inpath, strerror(errno));
860860
goto bad_argument;
861861
}

‎src/tools/msvc/Install.pm

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -400,12 +400,21 @@ sub GenerateTimezoneFiles
400400
my $mf = read_file("src/timezone/Makefile");
401401
$mf =~ s{\\\r?\n}{}g;
402402
$mf =~ /^TZDATA\s*:?=\s*(.*)$/m
403-
|| die "Could not find TZDATA row in timezone makefile\n";
403+
|| die "Could not find TZDATA line in timezone makefile\n";
404404
my @tzfiles = split /\s+/, $1;
405-
unshift @tzfiles, '';
405+
406406
print "Generating timezone files...";
407-
system("$conf\\zic\\zic -d \"$target/share/timezone\" "
408-
. join(" src/timezone/data/", @tzfiles));
407+
408+
my @args = ("$conf/zic/zic",
409+
'-d',
410+
"$target/share/timezone");
411+
foreach (@tzfiles)
412+
{
413+
my $tzfile = $_;
414+
push(@args, "src/timezone/data/$tzfile")
415+
}
416+
417+
system(@args);
409418
print "\n";
410419
}
411420

@@ -653,9 +662,10 @@ sub CopyIncludeFiles
653662
next unless (-d "src/include/$d");
654663

655664
EnsureDirectories("$target/include/server/$d");
656-
system(
657-
qq{xcopy /s /i /q /r /y src\\include\\$d\\*.h "$ctarget\\include\\server\\$d\\"}
658-
) && croak("Failed to copy include directory $d\n");
665+
my @args = ('xcopy', '/s', '/i', '/q', '/r', '/y',
666+
"src\\include\\$d\\*.h",
667+
"$ctarget\\include\\server\\$d\\");
668+
system(@args) && croak("Failed to copy include directory $d\n");
659669
}
660670
closedir($D);
661671

@@ -708,9 +718,11 @@ sub GenerateNLSFiles
708718

709719
EnsureDirectories($target, "share/locale/$lang",
710720
"share/locale/$lang/LC_MESSAGES");
711-
system(
712-
"\"$nlspath\\bin\\msgfmt\" -o \"$target\\share\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo\" $_"
713-
) && croak("Could not run msgfmt on $dir\\$_");
721+
my @args = ("$nlspath\\bin\\msgfmt",
722+
'-o',
723+
"$target\\share\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo",
724+
$_);
725+
system(@args) && croak("Could not run msgfmt on $dir\\$_");
714726
print ".";
715727
}
716728
}

‎src/tools/msvc/vcregress.pl

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -435,35 +435,41 @@ sub upgradecheck
435435
print "\nRunning initdb on old cluster\n\n";
436436
standard_initdb() or exit 1;
437437
print "\nStarting old cluster\n\n";
438-
system("pg_ctl start -l $logdir/postmaster1.log -w") == 0 or exit 1;
438+
my @args = ('pg_ctl', 'start', '-l', "$logdir/postmaster1.log", '-w');
439+
system(@args) == 0 or exit 1;
439440
print "\nSetting up data for upgrading\n\n";
440441
installcheck();
441442

442443
# now we can chdir into the source dir
443444
chdir "$topdir/src/bin/pg_upgrade";
444445
print "\nDumping old cluster\n\n";
445-
system("pg_dumpall -f $tmp_root/dump1.sql") == 0 or exit 1;
446+
@args = ('pg_dumpall', '-f', "$tmp_root/dump1.sql");
447+
system(@args) == 0 or exit 1;
446448
print "\nStopping old cluster\n\n";
447449
system("pg_ctl -m fast stop") == 0 or exit 1;
448450
$ENV{PGDATA} = "$data";
449451
print "\nSetting up new cluster\n\n";
450452
standard_initdb() or exit 1;
451453
print "\nRunning pg_upgrade\n\n";
452-
system("pg_upgrade -d $data.old -D $data -b $bindir -B $bindir") == 0
453-
or exit 1;
454+
@args = ('pg_upgrade', '-d', "$data.old", '-D', $data, '-b', $bindir,
455+
'-B', $bindir);
456+
system(@args) == 0 or exit 1;
454457
print "\nStarting new cluster\n\n";
455-
system("pg_ctl -l $logdir/postmaster2.log -w start") == 0 or exit 1;
458+
@args = ('pg_ctl', '-l', "$logdir/postmaster2.log", '-w', 'start');
459+
system(@args) == 0 or exit 1;
456460
print "\nSetting up stats on new cluster\n\n";
457461
system(".\\analyze_new_cluster.bat") == 0 or exit 1;
458462
print "\nDumping new cluster\n\n";
459-
system("pg_dumpall -f $tmp_root/dump2.sql") == 0 or exit 1;
463+
@args = ('pg_dumpall', '-f', "$tmp_root/dump2.sql");
464+
system(@args) == 0 or exit 1;
460465
print "\nStopping new cluster\n\n";
461466
system("pg_ctl -m fast stop") == 0 or exit 1;
462467
print "\nDeleting old cluster\n\n";
463468
system(".\\delete_old_cluster.bat") == 0 or exit 1;
464469
print "\nComparing old and new cluster dumps\n\n";
465470

466-
system("diff -q $tmp_root/dump1.sql $tmp_root/dump2.sql");
471+
@args = ('diff', '-q', "$tmp_root/dump1.sql", "$tmp_root/dump2.sql");
472+
system(@args);
467473
$status = $?;
468474
if (!$status)
469475
{

0 commit comments

Comments
 (0)