From: Peter Eisentraut Date: Thu, 19 Aug 2010 05:57:36 +0000 (+0000) Subject: Remove extra newlines at end and beginning of files, add missing newlines X-Git-Tag: REL9_1_ALPHA1~62 X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=3f1197191685512d1968ffd8958497159944c2a1;p=postgresql.git Remove extra newlines at end and beginning of files, add missing newlines at end of files. --- diff --git a/README b/README index 19ed46b4410..0790fd21abd 100644 --- a/README +++ b/README @@ -26,4 +26,3 @@ instructions. The latest version of this software may be obtained at http://www.postgresql.org/download/. For more information look at our web site located at http://www.postgresql.org/. - diff --git a/config/c-compiler.m4 b/config/c-compiler.m4 index a8df61b649e..78edf44944a 100644 --- a/config/c-compiler.m4 +++ b/config/c-compiler.m4 @@ -1,5 +1,5 @@ # Macros to detect C compiler features -# $PostgreSQL: pgsql/config/c-compiler.m4,v 1.22 2010/05/25 17:28:20 meskes Exp $ +# $PostgreSQL: pgsql/config/c-compiler.m4,v 1.23 2010/08/19 05:57:33 petere Exp $ # PGAC_C_SIGNED @@ -155,4 +155,3 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([extern void $2 (); void (*fptr) () = $2;],[])], [LDFLAGS="$pgac_save_LDFLAGS" AC_MSG_RESULT(assuming no)]) ])# PGAC_PROG_CC_LDFLAGS_OPT - diff --git a/contrib/btree_gist/sql/cidr.sql b/contrib/btree_gist/sql/cidr.sql index de06c24c92b..9bd77185b96 100644 --- a/contrib/btree_gist/sql/cidr.sql +++ b/contrib/btree_gist/sql/cidr.sql @@ -28,4 +28,3 @@ SELECT count(*) FROM cidrtmp WHERE a = '121.111.63.82'::cidr; SELECT count(*) FROM cidrtmp WHERE a >= '121.111.63.82'::cidr; SELECT count(*) FROM cidrtmp WHERE a > '121.111.63.82'::cidr; - diff --git a/contrib/btree_gist/sql/date.sql b/contrib/btree_gist/sql/date.sql index 3fa855c9052..f3b8166a6f0 100644 --- a/contrib/btree_gist/sql/date.sql +++ b/contrib/btree_gist/sql/date.sql @@ -29,4 +29,3 @@ SELECT count(*) FROM datetmp WHERE a = '2001-02-13'::date; SELECT count(*) FROM datetmp WHERE a >= '2001-02-13'::date; SELECT count(*) FROM datetmp WHERE a > '2001-02-13'::date; - diff --git a/contrib/btree_gist/sql/inet.sql b/contrib/btree_gist/sql/inet.sql index 39594945fea..328846c0a38 100644 --- a/contrib/btree_gist/sql/inet.sql +++ b/contrib/btree_gist/sql/inet.sql @@ -29,4 +29,3 @@ SELECT count(*) FROM inettmp WHERE a = '89.225.196.191'::inet; SELECT count(*) FROM inettmp WHERE a >= '89.225.196.191'::inet; SELECT count(*) FROM inettmp WHERE a > '89.225.196.191'::inet; - diff --git a/contrib/btree_gist/sql/int2.sql b/contrib/btree_gist/sql/int2.sql index c8303bde129..80ca6ac37cc 100644 --- a/contrib/btree_gist/sql/int2.sql +++ b/contrib/btree_gist/sql/int2.sql @@ -29,4 +29,3 @@ SELECT count(*) FROM int2tmp WHERE a = 237::int2; SELECT count(*) FROM int2tmp WHERE a >= 237::int2; SELECT count(*) FROM int2tmp WHERE a > 237::int2; - diff --git a/contrib/btree_gist/sql/int4.sql b/contrib/btree_gist/sql/int4.sql index 2f80c5afd1b..31307d3610d 100644 --- a/contrib/btree_gist/sql/int4.sql +++ b/contrib/btree_gist/sql/int4.sql @@ -29,4 +29,3 @@ SELECT count(*) FROM int4tmp WHERE a = 237::int4; SELECT count(*) FROM int4tmp WHERE a >= 237::int4; SELECT count(*) FROM int4tmp WHERE a > 237::int4; - diff --git a/contrib/btree_gist/sql/int8.sql b/contrib/btree_gist/sql/int8.sql index 97ad6056ed6..747bdca1ec9 100644 --- a/contrib/btree_gist/sql/int8.sql +++ b/contrib/btree_gist/sql/int8.sql @@ -29,4 +29,3 @@ SELECT count(*) FROM int8tmp WHERE a = 464571291354841::int8; SELECT count(*) FROM int8tmp WHERE a >= 464571291354841::int8; SELECT count(*) FROM int8tmp WHERE a > 464571291354841::int8; - diff --git a/contrib/btree_gist/sql/interval.sql b/contrib/btree_gist/sql/interval.sql index 21394350659..561e3d92ff9 100644 --- a/contrib/btree_gist/sql/interval.sql +++ b/contrib/btree_gist/sql/interval.sql @@ -29,4 +29,3 @@ SELECT count(*) FROM intervaltmp WHERE a = '199 days 21:21:23'::interval; SELECT count(*) FROM intervaltmp WHERE a >= '199 days 21:21:23'::interval; SELECT count(*) FROM intervaltmp WHERE a > '199 days 21:21:23'::interval; - diff --git a/contrib/btree_gist/sql/macaddr.sql b/contrib/btree_gist/sql/macaddr.sql index 18e0f3c68b2..d9c54b29301 100644 --- a/contrib/btree_gist/sql/macaddr.sql +++ b/contrib/btree_gist/sql/macaddr.sql @@ -29,4 +29,3 @@ SELECT count(*) FROM macaddrtmp WHERE a = '22:00:5c:e5:9b:0d'::macaddr; SELECT count(*) FROM macaddrtmp WHERE a >= '22:00:5c:e5:9b:0d'::macaddr; SELECT count(*) FROM macaddrtmp WHERE a > '22:00:5c:e5:9b:0d'::macaddr; - diff --git a/contrib/btree_gist/sql/time.sql b/contrib/btree_gist/sql/time.sql index 304e28add82..3329ee64da3 100644 --- a/contrib/btree_gist/sql/time.sql +++ b/contrib/btree_gist/sql/time.sql @@ -29,4 +29,3 @@ SELECT count(*) FROM timetmp WHERE a = '10:57:11'::time; SELECT count(*) FROM timetmp WHERE a >= '10:57:11'::time; SELECT count(*) FROM timetmp WHERE a > '10:57:11'::time; - diff --git a/contrib/btree_gist/sql/timestamp.sql b/contrib/btree_gist/sql/timestamp.sql index 5b04e3e2d2b..25e942874eb 100644 --- a/contrib/btree_gist/sql/timestamp.sql +++ b/contrib/btree_gist/sql/timestamp.sql @@ -29,4 +29,3 @@ SELECT count(*) FROM timestamptmp WHERE a = '2004-10-26 08:55:08'::timestamp; SELECT count(*) FROM timestamptmp WHERE a >= '2004-10-26 08:55:08'::timestamp; SELECT count(*) FROM timestamptmp WHERE a > '2004-10-26 08:55:08'::timestamp; - diff --git a/contrib/intarray/bench/bench.pl b/contrib/intarray/bench/bench.pl index 66df02dfc11..18872119899 100755 --- a/contrib/intarray/bench/bench.pl +++ b/contrib/intarray/bench/bench.pl @@ -103,4 +103,3 @@ sub exec_sql { $sth->finish; return @row; } - diff --git a/contrib/ltree/sql/ltree.sql b/contrib/ltree/sql/ltree.sql index 9241c2a0cb5..50aad78d3cc 100644 --- a/contrib/ltree/sql/ltree.sql +++ b/contrib/ltree/sql/ltree.sql @@ -291,4 +291,3 @@ SELECT count(*) FROM _ltreetest WHERE t ~ '23.*{1}.1' ; SELECT count(*) FROM _ltreetest WHERE t ~ '23.*.1' ; SELECT count(*) FROM _ltreetest WHERE t ~ '23.*.2' ; SELECT count(*) FROM _ltreetest WHERE t ? '{23.*.1,23.*.2}' ; - diff --git a/contrib/pageinspect/Makefile b/contrib/pageinspect/Makefile index 3a6b729c174..dd531948402 100644 --- a/contrib/pageinspect/Makefile +++ b/contrib/pageinspect/Makefile @@ -2,7 +2,7 @@ # # pageinspect Makefile # -# $PostgreSQL: pgsql/contrib/pageinspect/Makefile,v 1.4 2008/09/30 10:52:09 heikki Exp $ +# $PostgreSQL: pgsql/contrib/pageinspect/Makefile,v 1.5 2010/08/19 05:57:33 petere Exp $ # #------------------------------------------------------------------------- @@ -21,4 +21,3 @@ top_builddir = ../.. include $(top_builddir)/src/Makefile.global include $(top_srcdir)/contrib/contrib-global.mk endif - diff --git a/contrib/pg_trgm/sql/pg_trgm.sql b/contrib/pg_trgm/sql/pg_trgm.sql index 13045827ac7..20d86b8a0d2 100644 --- a/contrib/pg_trgm/sql/pg_trgm.sql +++ b/contrib/pg_trgm/sql/pg_trgm.sql @@ -41,4 +41,3 @@ set enable_seqscan=off; select t,similarity(t,'qwertyu0988') as sml from test_trgm where t % 'qwertyu0988' order by sml desc, t; select t,similarity(t,'gwertyu0988') as sml from test_trgm where t % 'gwertyu0988' order by sml desc, t; select t,similarity(t,'gwertyu1988') as sml from test_trgm where t % 'gwertyu1988' order by sml desc, t; - diff --git a/contrib/pg_upgrade/TESTING b/contrib/pg_upgrade/TESTING index 416f6d52c88..5cb60b177f7 100644 --- a/contrib/pg_upgrade/TESTING +++ b/contrib/pg_upgrade/TESTING @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/contrib/pg_upgrade/TESTING,v 1.3 2010/07/09 16:51:23 momjian Exp $ +$PostgreSQL: pgsql/contrib/pg_upgrade/TESTING,v 1.4 2010/08/19 05:57:33 petere Exp $ The most effective way to test pg_upgrade, aside from testing on user data, is by upgrading the PostgreSQL regression database. @@ -62,7 +62,3 @@ steps: 7) Diff the regression database dump file with the regression dump file loaded into the old server. - - - - diff --git a/contrib/pgcrypto/pgcrypto.sql.in b/contrib/pgcrypto/pgcrypto.sql.in index 8388e8620e7..bb1e26a086f 100644 --- a/contrib/pgcrypto/pgcrypto.sql.in +++ b/contrib/pgcrypto/pgcrypto.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/pgcrypto/pgcrypto.sql.in,v 1.15 2007/11/13 04:24:28 momjian Exp $ */ +/* $PostgreSQL: pgsql/contrib/pgcrypto/pgcrypto.sql.in,v 1.16 2010/08/19 05:57:33 petere Exp $ */ -- Adjust this setting to control where the objects get created. SET search_path = public; @@ -200,4 +200,3 @@ CREATE OR REPLACE FUNCTION dearmor(text) RETURNS bytea AS 'MODULE_PATHNAME', 'pg_dearmor' LANGUAGE C IMMUTABLE STRICT; - diff --git a/contrib/pgcrypto/rijndael.tbl b/contrib/pgcrypto/rijndael.tbl index bc0a3822cca..8ea62eae1b1 100644 --- a/contrib/pgcrypto/rijndael.tbl +++ b/contrib/pgcrypto/rijndael.tbl @@ -1136,4 +1136,3 @@ static const u4byte rco_tab[10] = { 0x00000001, 0x00000002, 0x00000004, 0x00000008, 0x00000010, 0x00000020, 0x00000040, 0x00000080, 0x0000001b, 0x00000036 }; - diff --git a/contrib/pgcrypto/sql/3des.sql b/contrib/pgcrypto/sql/3des.sql index 274d7d81f68..ef54592060d 100644 --- a/contrib/pgcrypto/sql/3des.sql +++ b/contrib/pgcrypto/sql/3des.sql @@ -29,4 +29,3 @@ select decrypt_iv(decode('50735067b073bb93', 'hex'), '0123456', 'abcd', '3des'); -- long message select encode(encrypt('Lets try a longer message.', '0123456789012345678901', '3des'), 'hex'); select decrypt(encrypt('Lets try a longer message.', '0123456789012345678901', '3des'), '0123456789012345678901', '3des'); - diff --git a/contrib/pgcrypto/sql/blowfish.sql b/contrib/pgcrypto/sql/blowfish.sql index 1a8536d686b..951cbc05197 100644 --- a/contrib/pgcrypto/sql/blowfish.sql +++ b/contrib/pgcrypto/sql/blowfish.sql @@ -90,4 +90,3 @@ select decrypt_iv(decode('95c7e89322525d59', 'hex'), '0123456', 'abcd', 'bf'); -- long message select encode(encrypt('Lets try a longer message.', '0123456789', 'bf'), 'hex'); select decrypt(encrypt('Lets try a longer message.', '0123456789', 'bf'), '0123456789', 'bf'); - diff --git a/contrib/pgcrypto/sql/cast5.sql b/contrib/pgcrypto/sql/cast5.sql index 599ee060fad..527a76a1607 100644 --- a/contrib/pgcrypto/sql/cast5.sql +++ b/contrib/pgcrypto/sql/cast5.sql @@ -45,4 +45,3 @@ select decrypt_iv(decode('384a970695ce016a', 'hex'), -- long message select encode(encrypt('Lets try a longer message.', '0123456789', 'cast5'), 'hex'); select decrypt(encrypt('Lets try a longer message.', '0123456789', 'cast5'), '0123456789', 'cast5'); - diff --git a/contrib/pgcrypto/sql/crypt-blowfish.sql b/contrib/pgcrypto/sql/crypt-blowfish.sql index effc1866205..b89dfd22b7b 100644 --- a/contrib/pgcrypto/sql/crypt-blowfish.sql +++ b/contrib/pgcrypto/sql/crypt-blowfish.sql @@ -15,4 +15,3 @@ SELECT res = crypt(data, res) AS "worked" FROM ctest; DROP TABLE ctest; - diff --git a/contrib/pgcrypto/sql/crypt-des.sql b/contrib/pgcrypto/sql/crypt-des.sql index b13d2f9de71..fabdc652fc9 100644 --- a/contrib/pgcrypto/sql/crypt-des.sql +++ b/contrib/pgcrypto/sql/crypt-des.sql @@ -15,4 +15,3 @@ SELECT res = crypt(data, res) AS "worked" FROM ctest; DROP TABLE ctest; - diff --git a/contrib/pgcrypto/sql/crypt-md5.sql b/contrib/pgcrypto/sql/crypt-md5.sql index 0002f0d34d7..ba7befb2287 100644 --- a/contrib/pgcrypto/sql/crypt-md5.sql +++ b/contrib/pgcrypto/sql/crypt-md5.sql @@ -15,4 +15,3 @@ SELECT res = crypt(data, res) AS "worked" FROM ctest; DROP TABLE ctest; - diff --git a/contrib/pgcrypto/sql/crypt-xdes.sql b/contrib/pgcrypto/sql/crypt-xdes.sql index 51271dba6da..d4a74f76bde 100644 --- a/contrib/pgcrypto/sql/crypt-xdes.sql +++ b/contrib/pgcrypto/sql/crypt-xdes.sql @@ -15,4 +15,3 @@ SELECT res = crypt(data, res) AS "worked" FROM ctest; DROP TABLE ctest; - diff --git a/contrib/pgcrypto/sql/des.sql b/contrib/pgcrypto/sql/des.sql index 0b3d3392511..6abc5b5ffed 100644 --- a/contrib/pgcrypto/sql/des.sql +++ b/contrib/pgcrypto/sql/des.sql @@ -27,4 +27,3 @@ select decrypt_iv(decode('50735067b073bb93', 'hex'), '0123456', 'abcd', 'des'); -- long message select encode(encrypt('Lets try a longer message.', '01234567', 'des'), 'hex'); select decrypt(encrypt('Lets try a longer message.', '01234567', 'des'), '01234567', 'des'); - diff --git a/contrib/pgcrypto/sql/hmac-md5.sql b/contrib/pgcrypto/sql/hmac-md5.sql index 70bef7cd505..71dcd089e6b 100644 --- a/contrib/pgcrypto/sql/hmac-md5.sql +++ b/contrib/pgcrypto/sql/hmac-md5.sql @@ -42,5 +42,3 @@ SELECT encode(hmac( 'Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data', decode('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'hex'), 'md5'), 'hex'); - - diff --git a/contrib/pgcrypto/sql/hmac-sha1.sql b/contrib/pgcrypto/sql/hmac-sha1.sql index 4adf6ed0863..6f741934bfd 100644 --- a/contrib/pgcrypto/sql/hmac-sha1.sql +++ b/contrib/pgcrypto/sql/hmac-sha1.sql @@ -42,5 +42,3 @@ SELECT encode(hmac( 'Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data', decode('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'hex'), 'sha1'), 'hex'); - - diff --git a/contrib/pgcrypto/sql/init.sql b/contrib/pgcrypto/sql/init.sql index ee1c231bdc2..8c1d2192a68 100644 --- a/contrib/pgcrypto/sql/init.sql +++ b/contrib/pgcrypto/sql/init.sql @@ -24,4 +24,3 @@ select gen_salt('foo'); select digest('foo', 'foo'); select hmac('foo', 'foo', 'foo'); select encrypt('foo', 'foo', 'foo'); - diff --git a/contrib/pgcrypto/sql/md5.sql b/contrib/pgcrypto/sql/md5.sql index d6e502779af..4df910fafbb 100644 --- a/contrib/pgcrypto/sql/md5.sql +++ b/contrib/pgcrypto/sql/md5.sql @@ -9,4 +9,3 @@ SELECT encode(digest('message digest', 'md5'), 'hex'); SELECT encode(digest('abcdefghijklmnopqrstuvwxyz', 'md5'), 'hex'); SELECT encode(digest('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789', 'md5'), 'hex'); SELECT encode(digest('12345678901234567890123456789012345678901234567890123456789012345678901234567890', 'md5'), 'hex'); - diff --git a/contrib/pgcrypto/sql/pgp-compression.sql b/contrib/pgcrypto/sql/pgp-compression.sql index f71c176da5a..ca9ee1fc008 100644 --- a/contrib/pgcrypto/sql/pgp-compression.sql +++ b/contrib/pgcrypto/sql/pgp-compression.sql @@ -28,4 +28,3 @@ select pgp_sym_decrypt( pgp_sym_encrypt('Secret message', 'key', 'compress-algo=2, compress-level=0'), 'key', 'expect-compress-algo=0'); - diff --git a/contrib/pgcrypto/sql/pgp-encrypt-DISABLED.sql b/contrib/pgcrypto/sql/pgp-encrypt-DISABLED.sql index 80fb4d123c0..4122300d97a 100644 --- a/contrib/pgcrypto/sql/pgp-encrypt-DISABLED.sql +++ b/contrib/pgcrypto/sql/pgp-encrypt-DISABLED.sql @@ -1,3 +1 @@ - -- no random source - diff --git a/contrib/pgcrypto/sql/pgp-encrypt.sql b/contrib/pgcrypto/sql/pgp-encrypt.sql index 218bd419e5e..cac37c84422 100644 --- a/contrib/pgcrypto/sql/pgp-encrypt.sql +++ b/contrib/pgcrypto/sql/pgp-encrypt.sql @@ -95,4 +95,3 @@ select encode(digest(pgp_sym_decrypt( pgp_sym_encrypt(E'\r\n0\n1\r\r\n\n2\r', 'key', 'convert-crlf=1'), 'key', 'convert-crlf=1'), 'sha1'), 'hex') as result, encode(digest(E'\r\n0\n1\r\r\n\n2\r', 'sha1'), 'hex') as expect; - diff --git a/contrib/pgcrypto/sql/pgp-info.sql b/contrib/pgcrypto/sql/pgp-info.sql index c525ce307e9..8e1d72a4151 100644 --- a/contrib/pgcrypto/sql/pgp-info.sql +++ b/contrib/pgcrypto/sql/pgp-info.sql @@ -20,4 +20,3 @@ select pgp_key_id(dearmor(seckey)) from keytbl where id=6; select pgp_key_id(dearmor(data)) as data_key_id from encdata order by id; - diff --git a/contrib/pgcrypto/sql/pgp-pubkey-DISABLED.sql b/contrib/pgcrypto/sql/pgp-pubkey-DISABLED.sql index b4aec5daf6d..d35c0971ba1 100644 --- a/contrib/pgcrypto/sql/pgp-pubkey-DISABLED.sql +++ b/contrib/pgcrypto/sql/pgp-pubkey-DISABLED.sql @@ -1,3 +1 @@ - -- no bignum support - diff --git a/contrib/pgcrypto/sql/pgp-pubkey-decrypt.sql b/contrib/pgcrypto/sql/pgp-pubkey-decrypt.sql index a7cb880625f..cc824200844 100644 --- a/contrib/pgcrypto/sql/pgp-pubkey-decrypt.sql +++ b/contrib/pgcrypto/sql/pgp-pubkey-decrypt.sql @@ -546,4 +546,3 @@ from keytbl, encdata where keytbl.id=5 and encdata.id=1; -- password-protected secret key, right password select pgp_pub_decrypt(dearmor(data), dearmor(seckey), 'parool') from keytbl, encdata where keytbl.id=5 and encdata.id=1; - diff --git a/contrib/pgcrypto/sql/pgp-pubkey-encrypt.sql b/contrib/pgcrypto/sql/pgp-pubkey-encrypt.sql index 2c4e622e5c8..879b47f8712 100644 --- a/contrib/pgcrypto/sql/pgp-pubkey-encrypt.sql +++ b/contrib/pgcrypto/sql/pgp-pubkey-encrypt.sql @@ -48,5 +48,3 @@ select pgp_pub_decrypt( pgp_pub_encrypt_bytea('Secret msg', dearmor(pubkey)), dearmor(seckey)) from keytbl where keytbl.id=1; - - diff --git a/contrib/pgcrypto/sql/pgp-zlib-DISABLED.sql b/contrib/pgcrypto/sql/pgp-zlib-DISABLED.sql index 85c24683be5..6f4eccd4578 100644 --- a/contrib/pgcrypto/sql/pgp-zlib-DISABLED.sql +++ b/contrib/pgcrypto/sql/pgp-zlib-DISABLED.sql @@ -1,3 +1 @@ - -- zlib is disabled - diff --git a/contrib/pgcrypto/sql/rijndael.sql b/contrib/pgcrypto/sql/rijndael.sql index 428ad1332c2..41595074bc6 100644 --- a/contrib/pgcrypto/sql/rijndael.sql +++ b/contrib/pgcrypto/sql/rijndael.sql @@ -61,4 +61,3 @@ select decrypt_iv(decode('2c24cb7da91d6d5699801268b0f5adad', 'hex'), -- long message select encode(encrypt('Lets try a longer message.', '0123456789', 'aes'), 'hex'); select decrypt(encrypt('Lets try a longer message.', '0123456789', 'aes'), '0123456789', 'aes'); - diff --git a/contrib/pgcrypto/sql/sha1.sql b/contrib/pgcrypto/sql/sha1.sql index 6a398b411eb..32b1f0698fd 100644 --- a/contrib/pgcrypto/sql/sha1.sql +++ b/contrib/pgcrypto/sql/sha1.sql @@ -9,4 +9,3 @@ SELECT encode(digest('message digest', 'sha1'), 'hex'); SELECT encode(digest('abcdefghijklmnopqrstuvwxyz', 'sha1'), 'hex'); SELECT encode(digest('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789', 'sha1'), 'hex'); SELECT encode(digest('12345678901234567890123456789012345678901234567890123456789012345678901234567890', 'sha1'), 'hex'); - diff --git a/contrib/pgcrypto/sql/sha2.sql b/contrib/pgcrypto/sql/sha2.sql index 447ae907653..3fe63d3e877 100644 --- a/contrib/pgcrypto/sql/sha2.sql +++ b/contrib/pgcrypto/sql/sha2.sql @@ -31,5 +31,3 @@ SELECT encode(digest('abc', 'sha512'), 'hex'); SELECT encode(digest('abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq', 'sha512'), 'hex'); SELECT encode(digest('abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu', 'sha512'), 'hex'); SELECT encode(digest('abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz', 'sha512'), 'hex'); - - diff --git a/contrib/pgcrypto/uninstall_pgcrypto.sql b/contrib/pgcrypto/uninstall_pgcrypto.sql index a2891f6882d..1bffb33ce79 100644 --- a/contrib/pgcrypto/uninstall_pgcrypto.sql +++ b/contrib/pgcrypto/uninstall_pgcrypto.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/pgcrypto/uninstall_pgcrypto.sql,v 1.4 2007/11/13 04:24:28 momjian Exp $ */ +/* $PostgreSQL: pgsql/contrib/pgcrypto/uninstall_pgcrypto.sql,v 1.5 2010/08/19 05:57:33 petere Exp $ */ -- Adjust this setting to control where the objects get dropped. SET search_path = public; @@ -43,4 +43,3 @@ DROP FUNCTION pgp_pub_decrypt_bytea(bytea, bytea, text, text); DROP FUNCTION pgp_key_id(bytea); DROP FUNCTION armor(bytea); DROP FUNCTION dearmor(text); - diff --git a/contrib/spi/insert_username.example b/contrib/spi/insert_username.example index 41e69bcbf26..a9d23fb2adc 100644 --- a/contrib/spi/insert_username.example +++ b/contrib/spi/insert_username.example @@ -18,4 +18,3 @@ INSERT INTO username_test VALUES ('tab', ' '); INSERT INTO username_test VALUES ('name', 'name'); SELECT * FROM username_test; - diff --git a/contrib/tablefunc/sql/tablefunc.sql b/contrib/tablefunc/sql/tablefunc.sql index 9f559b39778..8846a4218ef 100644 --- a/contrib/tablefunc/sql/tablefunc.sql +++ b/contrib/tablefunc/sql/tablefunc.sql @@ -196,4 +196,3 @@ INSERT INTO connectby_int VALUES(111,11); INSERT INTO connectby_int VALUES(1,111); -- this should not fail due to recursion detection SELECT * FROM connectby('connectby_int', 'keyid', 'parent_keyid', '11', 0, '-') AS t(keyid int, parent_keyid int, level int, branch text); - diff --git a/contrib/tsearch2/sql/tsearch2.sql b/contrib/tsearch2/sql/tsearch2.sql index b20055c45c6..bbae7b45dbc 100644 --- a/contrib/tsearch2/sql/tsearch2.sql +++ b/contrib/tsearch2/sql/tsearch2.sql @@ -340,4 +340,3 @@ SELECT count(*) FROM test_tsvector WHERE a @@ 'eq&yt'; SELECT count(*) FROM test_tsvector WHERE a @@ 'eq|yt'; SELECT count(*) FROM test_tsvector WHERE a @@ '(eq&yt)|(wr&qh)'; SELECT count(*) FROM test_tsvector WHERE a @@ '(eq|yt)&(wr|qh)'; - diff --git a/doc/KNOWN_BUGS b/doc/KNOWN_BUGS index b30f5a52a5b..44dd8812b79 100644 --- a/doc/KNOWN_BUGS +++ b/doc/KNOWN_BUGS @@ -1,4 +1,3 @@ PostgreSQL has a single combined bugs, missing features, and todo list simply called TODO, in this directory. A current copy is always available on our web site. - diff --git a/doc/MISSING_FEATURES b/doc/MISSING_FEATURES index b30f5a52a5b..44dd8812b79 100644 --- a/doc/MISSING_FEATURES +++ b/doc/MISSING_FEATURES @@ -1,4 +1,3 @@ PostgreSQL has a single combined bugs, missing features, and todo list simply called TODO, in this directory. A current copy is always available on our web site. - diff --git a/doc/src/sgml/pgupgrade.sgml b/doc/src/sgml/pgupgrade.sgml index 1c847c7af9d..3b3c00b8e1b 100644 --- a/doc/src/sgml/pgupgrade.sgml +++ b/doc/src/sgml/pgupgrade.sgml @@ -1,4 +1,4 @@ - + pg_upgrade @@ -537,4 +537,3 @@ psql --username postgres --file script.sql postgres - diff --git a/src/backend/optimizer/README b/src/backend/optimizer/README index 7f84bf15de1..a5299ee8fd7 100644 --- a/src/backend/optimizer/README +++ b/src/backend/optimizer/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/backend/optimizer/README,v 1.53 2010/03/28 22:59:32 tgl Exp $ +$PostgreSQL: pgsql/src/backend/optimizer/README,v 1.54 2010/08/19 05:57:34 petere Exp $ Optimizer ========= @@ -637,4 +637,3 @@ coding of our optimizer, he is available to field questions about optimizer topics. -- bjm & tgl - diff --git a/src/backend/optimizer/plan/README b/src/backend/optimizer/plan/README index c14cc0a6536..71582d9642b 100644 --- a/src/backend/optimizer/plan/README +++ b/src/backend/optimizer/plan/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/backend/optimizer/plan/README,v 1.3 2008/03/21 13:23:28 momjian Exp $ +$PostgreSQL: pgsql/src/backend/optimizer/plan/README,v 1.4 2010/08/19 05:57:34 petere Exp $ Subselects ========== @@ -10,7 +10,7 @@ From owner-pgsql-hackers@hub.org Fri Feb 13 09:01:19 1998 Received: from renoir.op.net (root@renoir.op.net [209.152.193.4]) by candle.pha.pa.us (8.8.5/8.8.5) with ESMTP id JAA11576 for ; Fri, 13 Feb 1998 09:01:17 -0500 (EST) -Received: from hub.org (hub.org [209.47.148.200]) by renoir.op.net (o1/$Revision: 1.3 $) with ESMTP id IAA09761 for ; Fri, 13 Feb 1998 08:41:22 -0500 (EST) +Received: from hub.org (hub.org [209.47.148.200]) by renoir.op.net (o1/$Revision: 1.4 $) with ESMTP id IAA09761 for ; Fri, 13 Feb 1998 08:41:22 -0500 (EST) Received: from localhost (majordom@localhost) by hub.org (8.8.8/8.7.5) with SMTP id IAA08135; Fri, 13 Feb 1998 08:40:17 -0500 (EST) Received: by hub.org (TLB v0.10a (1.23 tibbs 1997/01/09 00:29:32)); Fri, 13 Feb 1998 08:38:42 -0500 (EST) Received: (from majordom@localhost) by hub.org (8.8.8/8.7.5) id IAA06646 for pgsql-hackers-outgoing; Fri, 13 Feb 1998 08:38:35 -0500 (EST) @@ -156,5 +156,3 @@ SubSelect -> 17 sec (2M of memory) Using temp table -> 32 sec (12M of memory: -S 8192) Vadim - - diff --git a/src/backend/snowball/snowball.sql.in b/src/backend/snowball/snowball.sql.in index 197d94faf1f..28383e5c67d 100644 --- a/src/backend/snowball/snowball.sql.in +++ b/src/backend/snowball/snowball.sql.in @@ -1,4 +1,4 @@ --- $PostgreSQL: pgsql/src/backend/snowball/snowball.sql.in,v 1.6 2007/10/27 16:01:08 tgl Exp $$ +-- $PostgreSQL: pgsql/src/backend/snowball/snowball.sql.in,v 1.7 2010/08/19 05:57:34 petere Exp $$ -- text search configuration for _LANGNAME_ language CREATE TEXT SEARCH DICTIONARY _DICTNAME_ @@ -24,4 +24,3 @@ ALTER TEXT SEARCH CONFIGURATION _CFGNAME_ ADD MAPPING ALTER TEXT SEARCH CONFIGURATION _CFGNAME_ ADD MAPPING FOR word, hword_part, hword WITH _NONASCDICTNAME_; - diff --git a/src/backend/snowball/snowball_func.sql.in b/src/backend/snowball/snowball_func.sql.in index f55962c7969..8c09e20d487 100644 --- a/src/backend/snowball/snowball_func.sql.in +++ b/src/backend/snowball/snowball_func.sql.in @@ -1,4 +1,4 @@ --- $PostgreSQL: pgsql/src/backend/snowball/snowball_func.sql.in,v 1.2 2007/09/03 02:30:43 tgl Exp $$ +-- $PostgreSQL: pgsql/src/backend/snowball/snowball_func.sql.in,v 1.3 2010/08/19 05:57:34 petere Exp $$ SET search_path = pg_catalog; @@ -15,4 +15,3 @@ CREATE TEXT SEARCH TEMPLATE snowball LEXIZE = dsnowball_lexize); COMMENT ON TEXT SEARCH TEMPLATE snowball IS 'snowball stemmer'; - diff --git a/src/backend/snowball/stopwords/english.stop b/src/backend/snowball/stopwords/english.stop index a9130116d3e..5b16b504d66 100644 --- a/src/backend/snowball/stopwords/english.stop +++ b/src/backend/snowball/stopwords/english.stop @@ -125,4 +125,3 @@ just don should now - diff --git a/src/backend/storage/freespace/README b/src/backend/storage/freespace/README index b5a37f9cb55..c2c5889834e 100644 --- a/src/backend/storage/freespace/README +++ b/src/backend/storage/freespace/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/backend/storage/freespace/README,v 1.1 2008/09/30 10:52:13 heikki Exp $ +$PostgreSQL: pgsql/src/backend/storage/freespace/README,v 1.2 2010/08/19 05:57:34 petere Exp $ Free Space Map -------------- @@ -192,4 +192,3 @@ TODO - fastroot to avoid traversing upper nodes with just 1 child - use a different system for tables that fit into one FSM page, with a mechanism to switch to the real thing as it grows. - diff --git a/src/backend/tsearch/thesaurus_sample.ths b/src/backend/tsearch/thesaurus_sample.ths index 0b4857ec334..718f54a7bad 100644 --- a/src/backend/tsearch/thesaurus_sample.ths +++ b/src/backend/tsearch/thesaurus_sample.ths @@ -15,4 +15,3 @@ supernovae stars : *sn supernovae : *sn booking tickets : order invitation cards booking ? tickets : order invitation Cards - diff --git a/src/backend/tsearch/wparser_def.c b/src/backend/tsearch/wparser_def.c index cda28103c24..279fb527419 100644 --- a/src/backend/tsearch/wparser_def.c +++ b/src/backend/tsearch/wparser_def.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tsearch/wparser_def.c,v 1.32 2010/05/09 02:15:59 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/tsearch/wparser_def.c,v 1.33 2010/08/19 05:57:34 petere Exp $ * *------------------------------------------------------------------------- */ @@ -2572,4 +2572,3 @@ prsd_headline(PG_FUNCTION_ARGS) PG_RETURN_POINTER(prs); } - diff --git a/src/backend/utils/mb/Unicode/ISO10646-GB18030.TXT b/src/backend/utils/mb/Unicode/ISO10646-GB18030.TXT index 5558de16931..a26bab48a73 100644 --- a/src/backend/utils/mb/Unicode/ISO10646-GB18030.TXT +++ b/src/backend/utils/mb/Unicode/ISO10646-GB18030.TXT @@ -63486,4 +63486,3 @@ FFFC 8431A436 FFFD 8431A437 FFFE 8431A438 FFFF 8431A439 - diff --git a/src/backend/utils/mb/Unicode/UCS_to_BIG5.pl b/src/backend/utils/mb/Unicode/UCS_to_BIG5.pl index a80f16b40a0..b9f3c49c711 100755 --- a/src/backend/utils/mb/Unicode/UCS_to_BIG5.pl +++ b/src/backend/utils/mb/Unicode/UCS_to_BIG5.pl @@ -2,7 +2,7 @@ # # Copyright (c) 2001-2010, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/UCS_to_BIG5.pl,v 1.10 2010/01/02 16:57:56 momjian Exp $ +# $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/UCS_to_BIG5.pl,v 1.11 2010/08/19 05:57:34 petere Exp $ # # Generate UTF-8 <--> BIG5 conversion tables from # map files provided by Unicode organization. @@ -174,4 +174,3 @@ for $index ( sort {$a <=> $b} keys( %array ) ){ print FILE "};\n"; close(FILE); - diff --git a/src/backend/utils/mb/conversion_procs/Makefile b/src/backend/utils/mb/conversion_procs/Makefile index 33fc6b9f3a8..ae973f39550 100644 --- a/src/backend/utils/mb/conversion_procs/Makefile +++ b/src/backend/utils/mb/conversion_procs/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/mb/conversion_procs # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/Makefile,v 1.24 2009/11/04 23:47:04 tgl Exp $ +# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/Makefile,v 1.25 2010/08/19 05:57:34 petere Exp $ # #------------------------------------------------------------------------- @@ -217,4 +217,3 @@ uninstall: clean distclean maintainer-clean: rm -f $(SQLSCRIPT) @for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit; done - diff --git a/src/include/utils/formatting.h b/src/include/utils/formatting.h index da206b6fb86..4ba22db1f7c 100644 --- a/src/include/utils/formatting.h +++ b/src/include/utils/formatting.h @@ -1,8 +1,7 @@ - /* ----------------------------------------------------------------------- * formatting.h * - * $PostgreSQL: pgsql/src/include/utils/formatting.h,v 1.22 2010/01/02 16:58:10 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/formatting.h,v 1.23 2010/08/19 05:57:34 petere Exp $ * * * Portions Copyright (c) 1999-2010, PostgreSQL Global Development Group diff --git a/src/interfaces/ecpg/README.dynSQL b/src/interfaces/ecpg/README.dynSQL index 5c1c54cfbdc..d036da5c60d 100644 --- a/src/interfaces/ecpg/README.dynSQL +++ b/src/interfaces/ecpg/README.dynSQL @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/interfaces/ecpg/README.dynSQL,v 1.3 2008/03/21 13:23:28 momjian Exp $ +$PostgreSQL: pgsql/src/interfaces/ecpg/README.dynSQL,v 1.4 2010/08/19 05:57:34 petere Exp $ descriptor statements have the following shortcomings @@ -9,4 +9,3 @@ descriptor statements have the following shortcomings Since this is not likely to happen in the near future and you can cover the same functionality with the existing infrastructure (using s[n]printf), I'll leave the work to someone else. - diff --git a/src/interfaces/ecpg/include/ecpg_config.h.in b/src/interfaces/ecpg/include/ecpg_config.h.in index 72a34f4be0e..bf99a5e7930 100644 --- a/src/interfaces/ecpg/include/ecpg_config.h.in +++ b/src/interfaces/ecpg/include/ecpg_config.h.in @@ -17,4 +17,3 @@ /* Define to 1 to build client libraries as thread-safe code. * (--enable-thread-safety) */ #undef ENABLE_THREAD_SAFETY - diff --git a/src/interfaces/ecpg/preproc/README.parser b/src/interfaces/ecpg/preproc/README.parser index 950b05d3b7e..ddc3061d486 100644 --- a/src/interfaces/ecpg/preproc/README.parser +++ b/src/interfaces/ecpg/preproc/README.parser @@ -40,4 +40,3 @@ c) "addon" - the automatic action for the rule (SQL syntax constructed Multiple "addon" or "block" lines may appear together with the new code block if the code block is common for those rules. - diff --git a/src/interfaces/ecpg/preproc/check_rules.pl b/src/interfaces/ecpg/preproc/check_rules.pl index 7736721f1e0..a806cd24611 100755 --- a/src/interfaces/ecpg/preproc/check_rules.pl +++ b/src/interfaces/ecpg/preproc/check_rules.pl @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/check_rules.pl,v 1.2 2010/01/02 16:58:11 momjian Exp $ +# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/check_rules.pl,v 1.3 2010/08/19 05:57:34 petere Exp $ # test parser generater for ecpg # call with backend parser as stdin # @@ -133,4 +133,3 @@ sub generate_block { $s = "\\|", $block =~ s/$s//g; return $block; } - diff --git a/src/interfaces/ecpg/preproc/ecpg.tokens b/src/interfaces/ecpg/preproc/ecpg.tokens index 18d710a524b..d754ff9addd 100644 --- a/src/interfaces/ecpg/preproc/ecpg.tokens +++ b/src/interfaces/ecpg/preproc/ecpg.tokens @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.tokens,v 1.2 2009/07/14 20:34:48 tgl Exp $ */ +/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.tokens,v 1.3 2010/08/19 05:57:34 petere Exp $ */ /* special embedded SQL tokens */ %token SQL_ALLOCATE SQL_AUTOCOMMIT SQL_BOOL SQL_BREAK @@ -25,4 +25,3 @@ %token CSTRING CVARIABLE CPP_LINE IP %token DOLCONST ECONST NCONST UCONST UIDENT - diff --git a/src/interfaces/ecpg/preproc/ecpg.type b/src/interfaces/ecpg/preproc/ecpg.type index dbcd3e81106..aa062c3dc61 100644 --- a/src/interfaces/ecpg/preproc/ecpg.type +++ b/src/interfaces/ecpg/preproc/ecpg.type @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.type,v 1.6 2010/01/15 10:44:37 meskes Exp $ */ +/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.type,v 1.7 2010/08/19 05:57:34 petere Exp $ */ %type ECPGAllocateDescr %type ECPGCKeywords %type ECPGColId @@ -143,4 +143,3 @@ %type var_type %type action - diff --git a/src/interfaces/ecpg/test/compat_informix/test_informix.pgc b/src/interfaces/ecpg/test/compat_informix/test_informix.pgc index da9115e5ba1..e1cfd25a3b5 100644 --- a/src/interfaces/ecpg/test/compat_informix/test_informix.pgc +++ b/src/interfaces/ecpg/test/compat_informix/test_informix.pgc @@ -94,4 +94,3 @@ static void openit(void) { $open c; } - diff --git a/src/interfaces/ecpg/test/connect/Makefile b/src/interfaces/ecpg/test/connect/Makefile index 77016c897d9..2602d5d286f 100644 --- a/src/interfaces/ecpg/test/connect/Makefile +++ b/src/interfaces/ecpg/test/connect/Makefile @@ -10,4 +10,3 @@ TESTS = test1 test1.c \ test5 test5.c all: $(TESTS) - diff --git a/src/interfaces/ecpg/test/ecpg_schedule_tcp b/src/interfaces/ecpg/test/ecpg_schedule_tcp index 5214d251ac0..77481b51477 100644 --- a/src/interfaces/ecpg/test/ecpg_schedule_tcp +++ b/src/interfaces/ecpg/test/ecpg_schedule_tcp @@ -53,4 +53,3 @@ test: thread/prep test: thread/alloc test: thread/descriptor test: connect/test1 - diff --git a/src/interfaces/ecpg/test/expected/compat_informix-test_informix.c b/src/interfaces/ecpg/test/expected/compat_informix-test_informix.c index 4d5ffa825b5..4cc6e3d7132 100644 --- a/src/interfaces/ecpg/test/expected/compat_informix-test_informix.c +++ b/src/interfaces/ecpg/test/expected/compat_informix-test_informix.c @@ -253,4 +253,3 @@ if (sqlca.sqlcode < 0) dosqlprint ( );} #line 95 "test_informix.pgc" } - diff --git a/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.c b/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.c index b0b3239b9fd..58d11e8e7e1 100644 --- a/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.c +++ b/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.c @@ -445,4 +445,3 @@ if (sqlca.sqlcode < 0) sqlprint ( );} return (0); } - diff --git a/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test2.c b/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test2.c index 2497eb1a235..d3ebb0e106c 100644 --- a/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test2.c +++ b/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test2.c @@ -175,4 +175,3 @@ main(void) return (0); } - diff --git a/src/interfaces/ecpg/test/expected/pgtypeslib-num_test.c b/src/interfaces/ecpg/test/expected/pgtypeslib-num_test.c index 6c6eb0b23a6..6144034173f 100644 --- a/src/interfaces/ecpg/test/expected/pgtypeslib-num_test.c +++ b/src/interfaces/ecpg/test/expected/pgtypeslib-num_test.c @@ -159,4 +159,3 @@ if (sqlca.sqlcode < 0) sqlprint ( );} return (0); } - diff --git a/src/interfaces/ecpg/test/expected/preproc-comment.c b/src/interfaces/ecpg/test/expected/preproc-comment.c index c4bcb7aaa15..523c9f91c4f 100644 --- a/src/interfaces/ecpg/test/expected/preproc-comment.c +++ b/src/interfaces/ecpg/test/expected/preproc-comment.c @@ -40,4 +40,3 @@ int main(void) exit (0); } - diff --git a/src/interfaces/ecpg/test/expected/preproc-outofscope.c b/src/interfaces/ecpg/test/expected/preproc-outofscope.c index e8c4f5c0b46..ada4f89d6c3 100644 --- a/src/interfaces/ecpg/test/expected/preproc-outofscope.c +++ b/src/interfaces/ecpg/test/expected/preproc-outofscope.c @@ -99,7 +99,6 @@ int PGTYPESnumeric_from_decimal(decimal *, numeric *); /* exec sql begin declare section */ #line 1 "struct.h" - @@ -110,7 +109,7 @@ int PGTYPESnumeric_from_decimal(decimal *, numeric *); typedef struct mytype MYTYPE ; -#line 10 "struct.h" +#line 9 "struct.h" @@ -123,40 +122,40 @@ int PGTYPESnumeric_from_decimal(decimal *, numeric *); typedef struct mynulltype MYNULLTYPE ; -#line 20 "struct.h" +#line 19 "struct.h" #line 11 "outofscope.pgc" struct mytype { -#line 4 "struct.h" +#line 3 "struct.h" int id ; -#line 5 "struct.h" +#line 4 "struct.h" char t [ 64 ] ; -#line 6 "struct.h" +#line 5 "struct.h" double d1 ; -#line 7 "struct.h" +#line 6 "struct.h" double d2 ; -#line 8 "struct.h" +#line 7 "struct.h" char c [ 30 ] ; } ; struct mynulltype { -#line 14 "struct.h" +#line 13 "struct.h" int id ; -#line 15 "struct.h" +#line 14 "struct.h" int t ; -#line 16 "struct.h" +#line 15 "struct.h" int d1 ; -#line 17 "struct.h" +#line 16 "struct.h" int d2 ; -#line 18 "struct.h" +#line 17 "struct.h" int c ; } ;/* exec sql end declare section */ #line 12 "outofscope.pgc" diff --git a/src/interfaces/ecpg/test/expected/thread-alloc.c b/src/interfaces/ecpg/test/expected/thread-alloc.c index b99b8680012..199a77eb151 100644 --- a/src/interfaces/ecpg/test/expected/thread-alloc.c +++ b/src/interfaces/ecpg/test/expected/thread-alloc.c @@ -214,4 +214,3 @@ int main () return 0; } #endif - diff --git a/src/interfaces/ecpg/test/expected/thread-prep.c b/src/interfaces/ecpg/test/expected/thread-prep.c index 59dd227b834..cd28c850991 100644 --- a/src/interfaces/ecpg/test/expected/thread-prep.c +++ b/src/interfaces/ecpg/test/expected/thread-prep.c @@ -255,4 +255,3 @@ if (sqlca.sqlcode < 0) sqlprint();} return 0; } #endif - diff --git a/src/interfaces/ecpg/test/pgtypeslib/Makefile b/src/interfaces/ecpg/test/pgtypeslib/Makefile index 5392323da12..ee596915d8c 100644 --- a/src/interfaces/ecpg/test/pgtypeslib/Makefile +++ b/src/interfaces/ecpg/test/pgtypeslib/Makefile @@ -10,4 +10,3 @@ TESTS = dt_test dt_test.c \ nan_test nan_test.c all: $(TESTS) - diff --git a/src/interfaces/ecpg/test/pgtypeslib/dt_test.pgc b/src/interfaces/ecpg/test/pgtypeslib/dt_test.pgc index 4e3c4404437..fa58d2d3542 100644 --- a/src/interfaces/ecpg/test/pgtypeslib/dt_test.pgc +++ b/src/interfaces/ecpg/test/pgtypeslib/dt_test.pgc @@ -361,4 +361,3 @@ main(void) return (0); } - diff --git a/src/interfaces/ecpg/test/pgtypeslib/dt_test2.pgc b/src/interfaces/ecpg/test/pgtypeslib/dt_test2.pgc index 5ab2dfeccf7..0edf012fd11 100644 --- a/src/interfaces/ecpg/test/pgtypeslib/dt_test2.pgc +++ b/src/interfaces/ecpg/test/pgtypeslib/dt_test2.pgc @@ -140,4 +140,3 @@ main(void) return (0); } - diff --git a/src/interfaces/ecpg/test/pgtypeslib/num_test.pgc b/src/interfaces/ecpg/test/pgtypeslib/num_test.pgc index fcdc3964356..a024c8702fb 100644 --- a/src/interfaces/ecpg/test/pgtypeslib/num_test.pgc +++ b/src/interfaces/ecpg/test/pgtypeslib/num_test.pgc @@ -95,4 +95,3 @@ main(void) return (0); } - diff --git a/src/interfaces/ecpg/test/preproc/comment.pgc b/src/interfaces/ecpg/test/preproc/comment.pgc index f9218509908..c3ce20c2035 100644 --- a/src/interfaces/ecpg/test/preproc/comment.pgc +++ b/src/interfaces/ecpg/test/preproc/comment.pgc @@ -19,4 +19,3 @@ int main(void) exec sql disconnect; exit (0); } - diff --git a/src/interfaces/ecpg/test/preproc/struct.h b/src/interfaces/ecpg/test/preproc/struct.h index 75e802ac6fe..19da316d2e1 100644 --- a/src/interfaces/ecpg/test/preproc/struct.h +++ b/src/interfaces/ecpg/test/preproc/struct.h @@ -1,4 +1,3 @@ - struct mytype { int id; diff --git a/src/interfaces/ecpg/test/sql/Makefile b/src/interfaces/ecpg/test/sql/Makefile index 1cd2217ed72..59e4dd6fc92 100644 --- a/src/interfaces/ecpg/test/sql/Makefile +++ b/src/interfaces/ecpg/test/sql/Makefile @@ -28,4 +28,3 @@ all: $(TESTS) oldexec.c: oldexec.pgc ../regression.h $(ECPG) -r questionmarks -o $@ -I$(srcdir) $< - diff --git a/src/interfaces/ecpg/test/thread/Makefile b/src/interfaces/ecpg/test/thread/Makefile index 99591e7c981..1b4ddcff61b 100644 --- a/src/interfaces/ecpg/test/thread/Makefile +++ b/src/interfaces/ecpg/test/thread/Makefile @@ -11,4 +11,3 @@ TESTS = thread_implicit thread_implicit.c \ alloc alloc.c all: $(TESTS) - diff --git a/src/interfaces/ecpg/test/thread/alloc.pgc b/src/interfaces/ecpg/test/thread/alloc.pgc index 220dc43fb8a..ea98495be4e 100644 --- a/src/interfaces/ecpg/test/thread/alloc.pgc +++ b/src/interfaces/ecpg/test/thread/alloc.pgc @@ -86,4 +86,3 @@ int main () return 0; } #endif - diff --git a/src/interfaces/ecpg/test/thread/prep.pgc b/src/interfaces/ecpg/test/thread/prep.pgc index dc039a2294d..45205ddc8b2 100644 --- a/src/interfaces/ecpg/test/thread/prep.pgc +++ b/src/interfaces/ecpg/test/thread/prep.pgc @@ -92,4 +92,3 @@ int main () return 0; } #endif - diff --git a/src/pl/plperl/plc_perlboot.pl b/src/pl/plperl/plc_perlboot.pl index 72e96d1a796..bfe443adb88 100644 --- a/src/pl/plperl/plc_perlboot.pl +++ b/src/pl/plperl/plc_perlboot.pl @@ -1,5 +1,4 @@ - -# $PostgreSQL: pgsql/src/pl/plperl/plc_perlboot.pl,v 1.7 2010/07/27 04:18:28 alvherre Exp $ +# $PostgreSQL: pgsql/src/pl/plperl/plc_perlboot.pl,v 1.8 2010/08/19 05:57:35 petere Exp $ use 5.008001; use vars qw(%_SHARED); @@ -76,4 +75,3 @@ sub ::encode_array_constructor { } @$arg; return "ARRAY[$res]"; } - diff --git a/src/pl/plperl/plc_trusted.pl b/src/pl/plperl/plc_trusted.pl index a76cc2f5adf..b7ca1d6ae5c 100644 --- a/src/pl/plperl/plc_trusted.pl +++ b/src/pl/plperl/plc_trusted.pl @@ -1,6 +1,4 @@ - - -# $PostgreSQL: pgsql/src/pl/plperl/plc_trusted.pl,v 1.1 2010/05/13 16:39:43 adunstan Exp $ +# $PostgreSQL: pgsql/src/pl/plperl/plc_trusted.pl,v 1.2 2010/08/19 05:57:35 petere Exp $ package PostgreSQL::InServer::safe; diff --git a/src/pl/plperl/sql/plperl.sql b/src/pl/plperl/sql/plperl.sql index 651d5ee2b41..fcae9e093c4 100644 --- a/src/pl/plperl/sql/plperl.sql +++ b/src/pl/plperl/sql/plperl.sql @@ -390,4 +390,3 @@ DO $do$ use strict; my $name = "foo"; my $ref = $$name; $do$ LANGUAGE plperl; -- check that we can "use warnings" (in this case to turn a warn into an error) -- yields "ERROR: Useless use of sort in scalar context." DO $do$ use warnings FATAL => qw(void) ; my @y; my $x = sort @y; 1; $do$ LANGUAGE plperl; - diff --git a/src/pl/plperl/sql/plperl_trigger.sql b/src/pl/plperl/sql/plperl_trigger.sql index c8042d67ff5..d55f79aa7fb 100644 --- a/src/pl/plperl/sql/plperl_trigger.sql +++ b/src/pl/plperl/sql/plperl_trigger.sql @@ -116,4 +116,3 @@ DELETE FROM trigger_test; SELECT * FROM trigger_test; - diff --git a/src/pl/plperl/text2macro.pl b/src/pl/plperl/text2macro.pl index 7e13ea5b276..339eac68641 100644 --- a/src/pl/plperl/text2macro.pl +++ b/src/pl/plperl/text2macro.pl @@ -1,5 +1,4 @@ - -# $PostgreSQL: pgsql/src/pl/plperl/text2macro.pl,v 1.2 2010/01/20 01:08:21 adunstan Exp $ +# $PostgreSQL: pgsql/src/pl/plperl/text2macro.pl,v 1.3 2010/08/19 05:57:35 petere Exp $ =head1 NAME diff --git a/src/pl/plpython/expected/plpython_spi.out b/src/pl/plpython/expected/plpython_spi.out index 11bf00da1f5..7f4ae5ca997 100644 --- a/src/pl/plpython/expected/plpython_spi.out +++ b/src/pl/plpython/expected/plpython_spi.out @@ -1,3 +1,4 @@ +-- -- nested calls -- CREATE FUNCTION nested_call_one(a text) RETURNS text diff --git a/src/pl/plpython/sql/plpython_populate.sql b/src/pl/plpython/sql/plpython_populate.sql index a1963e76eea..cc1e19b5dd3 100644 --- a/src/pl/plpython/sql/plpython_populate.sql +++ b/src/pl/plpython/sql/plpython_populate.sql @@ -1,4 +1,3 @@ - INSERT INTO users (fname, lname, username) VALUES ('jane', 'doe', 'j_doe'); INSERT INTO users (fname, lname, username) VALUES ('john', 'doe', 'johnd'); INSERT INTO users (fname, lname, username) VALUES ('willem', 'doe', 'w_doe'); @@ -25,4 +24,4 @@ INSERT INTO sequences (sequence, eid, product) VALUES ('ABCDEF', 2, 'env') ; INSERT INTO sequences (sequence, eid, product) VALUES ('ABCDEF', 3, 'env') ; INSERT INTO sequences (sequence, eid, product) VALUES ('ABCDEF', 4, 'gag') ; INSERT INTO sequences (sequence, eid, product) VALUES ('ABCDEF', 5, 'env') ; -INSERT INTO sequences (sequence, eid, product) VALUES ('ABCDEF', 6, 'ns1') ; \ No newline at end of file +INSERT INTO sequences (sequence, eid, product) VALUES ('ABCDEF', 6, 'ns1') ; diff --git a/src/pl/plpython/sql/plpython_schema.sql b/src/pl/plpython/sql/plpython_schema.sql index 1cb84d620e6..669c4877f1a 100644 --- a/src/pl/plpython/sql/plpython_schema.sql +++ b/src/pl/plpython/sql/plpython_schema.sql @@ -1,4 +1,3 @@ - CREATE TABLE users ( fname text not null, lname text not null, diff --git a/src/pl/plpython/sql/plpython_spi.sql b/src/pl/plpython/sql/plpython_spi.sql index b607cdb9397..7f8f6a33d26 100644 --- a/src/pl/plpython/sql/plpython_spi.sql +++ b/src/pl/plpython/sql/plpython_spi.sql @@ -1,4 +1,4 @@ - +-- -- nested calls -- diff --git a/src/pl/tcl/expected/pltcl_queries.out b/src/pl/tcl/expected/pltcl_queries.out index 6b02fb4b48f..cdab74a436f 100644 --- a/src/pl/tcl/expected/pltcl_queries.out +++ b/src/pl/tcl/expected/pltcl_queries.out @@ -220,4 +220,3 @@ NOTICE: TG_table_name: trigger_test NOTICE: TG_table_schema: public NOTICE: TG_when: BEFORE NOTICE: args: {23 skidoo} - diff --git a/src/pl/tcl/expected/pltcl_queries_1.out b/src/pl/tcl/expected/pltcl_queries_1.out index 6201a9bcec3..5788df79df4 100644 --- a/src/pl/tcl/expected/pltcl_queries_1.out +++ b/src/pl/tcl/expected/pltcl_queries_1.out @@ -220,4 +220,3 @@ NOTICE: TG_table_name: trigger_test NOTICE: TG_table_schema: public NOTICE: TG_when: BEFORE NOTICE: args: {23 skidoo} - diff --git a/src/pl/tcl/modules/README b/src/pl/tcl/modules/README index 58529d17e13..4abc249655a 100644 --- a/src/pl/tcl/modules/README +++ b/src/pl/tcl/modules/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/pl/tcl/modules/README,v 1.3 2008/03/21 13:23:29 momjian Exp $ +$PostgreSQL: pgsql/src/pl/tcl/modules/README,v 1.4 2010/08/19 05:57:35 petere Exp $ Regular Tcl scripts of any size (over 8K :-) can be loaded into the table pltcl_modules using the pltcl_loadmod script. The script @@ -16,4 +16,3 @@ command that invoked unknown. I know, this readme should be more explanatory - but time. Jan - diff --git a/src/pl/tcl/modules/unknown.pltcl b/src/pl/tcl/modules/unknown.pltcl index 4f0a3fa991a..0729ac1b702 100644 --- a/src/pl/tcl/modules/unknown.pltcl +++ b/src/pl/tcl/modules/unknown.pltcl @@ -61,5 +61,3 @@ proc unknown {proname args} { #----------------------------------------------------------- return [uplevel 1 $proname $args] } - - diff --git a/src/pl/tcl/sql/pltcl_queries.sql b/src/pl/tcl/sql/pltcl_queries.sql index cc8b46842cd..3a99132ae4d 100644 --- a/src/pl/tcl/sql/pltcl_queries.sql +++ b/src/pl/tcl/sql/pltcl_queries.sql @@ -78,6 +78,3 @@ select * from T_pkey2 order by key1 using @<, key2; insert into trigger_test values(1,'insert'); update trigger_test set v = 'update' where i = 1; delete from trigger_test; - - - diff --git a/src/port/README b/src/port/README index ce2ec3bb075..147e35faf6f 100644 --- a/src/port/README +++ b/src/port/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/port/README,v 1.4 2008/03/21 13:23:29 momjian Exp $ +$PostgreSQL: pgsql/src/port/README,v 1.5 2010/08/19 05:57:35 petere Exp $ libpgport ========= @@ -30,4 +30,3 @@ dependent on symbols that are _used_ by libpq, but not intended to be exported by libpq. libpq's libpgport usage changes over time, so such a dependency is a problem. Win32, Linux, and Darwin use an export list to control the symbols exported by libpq. - diff --git a/src/template/dgux b/src/template/dgux index 43a19c6c2c1..2a85835b7da 100644 --- a/src/template/dgux +++ b/src/template/dgux @@ -1,3 +1 @@ -# $PostgreSQL: pgsql/src/template/dgux,v 1.12 2006/03/11 04:38:40 momjian Exp $ - - +# $PostgreSQL: pgsql/src/template/dgux,v 1.13 2010/08/19 05:57:35 petere Exp $ diff --git a/src/template/netbsd b/src/template/netbsd index 6e0ff48860d..c6ac2ba1702 100644 --- a/src/template/netbsd +++ b/src/template/netbsd @@ -1,3 +1,2 @@ -# $PostgreSQL: pgsql/src/template/netbsd,v 1.20 2006/03/11 04:38:41 momjian Exp $ +# $PostgreSQL: pgsql/src/template/netbsd,v 1.21 2010/08/19 05:57:35 petere Exp $ # tools/thread/thread_test must be run - diff --git a/src/template/sco b/src/template/sco index e0b08471db1..9a736da8be7 100644 --- a/src/template/sco +++ b/src/template/sco @@ -1,2 +1 @@ CC="$CC -b elf" - diff --git a/src/test/performance/runtests.pl b/src/test/performance/runtests.pl index 1d0c53dd280..f4bf2fc2ec8 100755 --- a/src/test/performance/runtests.pl +++ b/src/test/performance/runtests.pl @@ -135,4 +135,3 @@ while () ($tmp, $rtime, $rest) = split (/[ ]+/, $rtime); print RESF "$test: $rtime\n"; } - diff --git a/src/test/performance/sqls/connection b/src/test/performance/sqls/connection index b78caf5209e..5a5d458c7d1 100644 --- a/src/test/performance/sqls/connection +++ b/src/test/performance/sqls/connection @@ -1,2 +1 @@ - `echo "" | time $FrontEnd`; diff --git a/src/test/performance/sqls/crtsimple b/src/test/performance/sqls/crtsimple index 478e7c613b4..c0fef476a25 100644 --- a/src/test/performance/sqls/crtsimple +++ b/src/test/performance/sqls/crtsimple @@ -1,4 +1,3 @@ - if ( $TestDBMS =~ /^pgsql/ ) { `echo "CREATE TABLE simple (justint int);" | time $FrontEnd`; diff --git a/src/test/performance/sqls/crtsimpleidx b/src/test/performance/sqls/crtsimpleidx index cda626bdbd6..f1cae64b549 100644 --- a/src/test/performance/sqls/crtsimpleidx +++ b/src/test/performance/sqls/crtsimpleidx @@ -2,4 +2,3 @@ if ( $TestDBMS =~ /^pgsql/ ) { `echo "CREATE INDEX simpleidx ON simple (justint);" | time $FrontEnd`; } - diff --git a/src/test/performance/sqls/drpsimple b/src/test/performance/sqls/drpsimple index 327fbcce9df..b0c586d08c3 100644 --- a/src/test/performance/sqls/drpsimple +++ b/src/test/performance/sqls/drpsimple @@ -1,4 +1,3 @@ - if ( $TestDBMS =~ /^pgsql/ ) { `echo "DROP TABLE simple;" | time $FrontEnd`; diff --git a/src/test/performance/sqls/inssimple b/src/test/performance/sqls/inssimple index ed07fe4a073..950206a4ae5 100644 --- a/src/test/performance/sqls/inssimple +++ b/src/test/performance/sqls/inssimple @@ -1,5 +1,4 @@ - -# $PostgreSQL: pgsql/src/test/performance/sqls/inssimple,v 1.2 2006/03/11 04:38:41 momjian Exp $ +# $PostgreSQL: pgsql/src/test/performance/sqls/inssimple,v 1.3 2010/08/19 05:57:35 petere Exp $ # # Transactions are unsupported by MySQL - so for insertion of # 8192 rows, 1 INSERT per Xaction, we returned "Transactions unsupported" @@ -27,4 +26,3 @@ if ( $TestDBMS =~ /^mysql/ && $XACTBLOCK eq '' ) # Ok - run queries `time $FrontEnd < .sqlf`; - diff --git a/src/test/performance/sqls/orbsimple b/src/test/performance/sqls/orbsimple index 88101bb4c88..ab7b2fff11a 100644 --- a/src/test/performance/sqls/orbsimple +++ b/src/test/performance/sqls/orbsimple @@ -1,2 +1 @@ - `echo "SELECT * FROM simple ORDER BY justint;" | time $FrontEnd`; diff --git a/src/test/performance/sqls/slcsimple b/src/test/performance/sqls/slcsimple index e153a3838ce..dd70759aa67 100644 --- a/src/test/performance/sqls/slcsimple +++ b/src/test/performance/sqls/slcsimple @@ -1,4 +1,3 @@ - `> .sqlf`; # PgSQL specific to execute all queries in single xaction diff --git a/src/test/performance/sqls/vacuum b/src/test/performance/sqls/vacuum index 9e671d078c5..45b0fba4a3f 100644 --- a/src/test/performance/sqls/vacuum +++ b/src/test/performance/sqls/vacuum @@ -1,4 +1,3 @@ - if ( $TestDBMS =~ /^pgsql/ ) { `time $FrontEnd -c 'vacuum'`; diff --git a/src/test/regress/input/copy.source b/src/test/regress/input/copy.source index 376329d250d..2d34c72b6cc 100644 --- a/src/test/regress/input/copy.source +++ b/src/test/regress/input/copy.source @@ -106,4 +106,3 @@ this is just a line full of junk that would error out if parsed \. copy copytest3 to stdout csv header; - diff --git a/src/test/regress/input/create_function_2.source b/src/test/regress/input/create_function_2.source index b1289e83a4f..459ca3c0a33 100644 --- a/src/test/regress/input/create_function_2.source +++ b/src/test/regress/input/create_function_2.source @@ -68,4 +68,3 @@ CREATE FUNCTION oldstyle_length(int4, text) -- Function dynamic loading -- LOAD '@libdir@/regress@DLSUFFIX@'; - diff --git a/src/test/regress/input/misc.source b/src/test/regress/input/misc.source index c5813630625..fa58b545644 100644 --- a/src/test/regress/input/misc.source +++ b/src/test/regress/input/misc.source @@ -256,4 +256,3 @@ drop table oldstyle_test; -- -- rewrite rules -- - diff --git a/src/test/regress/sql/box.sql b/src/test/regress/sql/box.sql index a689295a8bd..f1ff8158b0b 100644 --- a/src/test/regress/sql/box.sql +++ b/src/test/regress/sql/box.sql @@ -117,4 +117,3 @@ SELECT '' AS one, b1.*, b2.* WHERE b1.f1 @> b2.f1 and not b1.f1 ~= b2.f1; SELECT '' AS four, height(f1), width(f1) FROM BOX_TBL; - diff --git a/src/test/regress/sql/case.sql b/src/test/regress/sql/case.sql index 2ab22fb1c6d..fd5c4002442 100644 --- a/src/test/regress/sql/case.sql +++ b/src/test/regress/sql/case.sql @@ -162,4 +162,3 @@ SELECT * FROM CASE_TBL; DROP TABLE CASE_TBL; DROP TABLE CASE2_TBL; - diff --git a/src/test/regress/sql/create_operator.sql b/src/test/regress/sql/create_operator.sql index 6637629ea44..5ce8128a242 100644 --- a/src/test/regress/sql/create_operator.sql +++ b/src/test/regress/sql/create_operator.sql @@ -34,5 +34,3 @@ CREATE OPERATOR #%# ( -- Test comments COMMENT ON OPERATOR ###### (int4, NONE) IS 'bad right unary'; - - diff --git a/src/test/regress/sql/drop.sql b/src/test/regress/sql/drop.sql index 2b143d95bc7..5df1b6adce5 100644 --- a/src/test/regress/sql/drop.sql +++ b/src/test/regress/sql/drop.sql @@ -244,4 +244,3 @@ DROP VIEW street; DROP VIEW iexit; DROP VIEW toyemp; - diff --git a/src/test/regress/sql/drop_if_exists.sql b/src/test/regress/sql/drop_if_exists.sql index ae7543fc438..62b3f579a5e 100644 --- a/src/test/regress/sql/drop_if_exists.sql +++ b/src/test/regress/sql/drop_if_exists.sql @@ -115,4 +115,3 @@ DROP GROUP tg2; DROP GROUP IF EXISTS tg1, tg2; DROP GROUP tg1; - diff --git a/src/test/regress/sql/float4.sql b/src/test/regress/sql/float4.sql index 4cde9d742f3..4ce6d9ea6eb 100644 --- a/src/test/regress/sql/float4.sql +++ b/src/test/regress/sql/float4.sql @@ -81,4 +81,3 @@ UPDATE FLOAT4_TBL WHERE FLOAT4_TBL.f1 > '0.0'; SELECT '' AS five, * FROM FLOAT4_TBL; - diff --git a/src/test/regress/sql/float8.sql b/src/test/regress/sql/float8.sql index 142e6d7d737..40f488d9596 100644 --- a/src/test/regress/sql/float8.sql +++ b/src/test/regress/sql/float8.sql @@ -167,4 +167,3 @@ INSERT INTO FLOAT8_TBL(f1) VALUES ('-1.2345678901234e+200'); INSERT INTO FLOAT8_TBL(f1) VALUES ('-1.2345678901234e-200'); SELECT '' AS five, * FROM FLOAT8_TBL; - diff --git a/src/test/regress/sql/hash_index.sql b/src/test/regress/sql/hash_index.sql index b0811b7dc0a..13ef74a1cb4 100644 --- a/src/test/regress/sql/hash_index.sql +++ b/src/test/regress/sql/hash_index.sql @@ -151,4 +151,3 @@ SELECT h.seqno AS f20000 -- SELECT count(*) AS i988 FROM hash_ovfl_heap -- WHERE x = 1000; - diff --git a/src/test/regress/sql/hs_primary_extremes.sql b/src/test/regress/sql/hs_primary_extremes.sql index 900bd1924e5..2796bc38189 100644 --- a/src/test/regress/sql/hs_primary_extremes.sql +++ b/src/test/regress/sql/hs_primary_extremes.sql @@ -71,4 +71,3 @@ COMMIT; SELECT hs_locks_drop(257); SELECT pg_switch_xlog(); - diff --git a/src/test/regress/sql/int2.sql b/src/test/regress/sql/int2.sql index 65c89e4abdd..bf4efba6297 100644 --- a/src/test/regress/sql/int2.sql +++ b/src/test/regress/sql/int2.sql @@ -85,4 +85,3 @@ SELECT '' AS five, i.f1, i.f1 - int4 '2' AS x FROM INT2_TBL i; SELECT '' AS five, i.f1, i.f1 / int2 '2' AS x FROM INT2_TBL i; SELECT '' AS five, i.f1, i.f1 / int4 '2' AS x FROM INT2_TBL i; - diff --git a/src/test/regress/sql/lseg.sql b/src/test/regress/sql/lseg.sql index 9202f2d2845..07c5a29e0a5 100644 --- a/src/test/regress/sql/lseg.sql +++ b/src/test/regress/sql/lseg.sql @@ -23,4 +23,3 @@ select * from LSEG_TBL; SELECT * FROM LSEG_TBL WHERE s <= lseg '[(1,2),(3,4)]'; SELECT * FROM LSEG_TBL WHERE (s <-> lseg '[(1,2),(3,4)]') < 10; - diff --git a/src/test/regress/sql/money.sql b/src/test/regress/sql/money.sql index 40bc0e1b41a..580425e5043 100644 --- a/src/test/regress/sql/money.sql +++ b/src/test/regress/sql/money.sql @@ -56,4 +56,3 @@ SELECT * FROM money_data; DELETE FROM money_data; INSERT INTO money_data VALUES ('$123.459'); SELECT * FROM money_data; - diff --git a/src/test/regress/sql/numeric_big.sql b/src/test/regress/sql/numeric_big.sql index 0e21ec03c8b..8f40c200c7d 100644 --- a/src/test/regress/sql/numeric_big.sql +++ b/src/test/regress/sql/numeric_big.sql @@ -645,4 +645,3 @@ SELECT t1.id1, t1.result, t2.expected FROM num_result t1, num_exp_power_10_ln t2 WHERE t1.id1 = t2.id AND t1.result != t2.expected; - diff --git a/src/test/regress/sql/numerology.sql b/src/test/regress/sql/numerology.sql index 6626cf20ebc..980d0d760f0 100644 --- a/src/test/regress/sql/numerology.sql +++ b/src/test/regress/sql/numerology.sql @@ -96,4 +96,3 @@ DROP TABLE TEMP_INT4; DROP TABLE TEMP_FLOAT; DROP TABLE TEMP_GROUP; - diff --git a/src/test/regress/sql/path.sql b/src/test/regress/sql/path.sql index 36cb7c8109f..7e69b539ad8 100644 --- a/src/test/regress/sql/path.sql +++ b/src/test/regress/sql/path.sql @@ -36,4 +36,3 @@ SELECT '' AS count, f1 AS closed_path FROM PATH_TBL WHERE isclosed(f1); SELECT '' AS count, pclose(f1) AS closed_path FROM PATH_TBL; SELECT '' AS count, popen(f1) AS open_path FROM PATH_TBL; - diff --git a/src/test/regress/sql/polygon.sql b/src/test/regress/sql/polygon.sql index 743ca22f536..1b3903b7822 100644 --- a/src/test/regress/sql/polygon.sql +++ b/src/test/regress/sql/polygon.sql @@ -171,4 +171,3 @@ SELECT '((0,4),(6,4),(1,2),(6,0),(0,0))'::polygon && '((2,1),(2,3),(3,3),(3,1))' -- +-------+ SELECT '((1,4),(1,1),(4,1),(4,2),(2,2),(2,4),(1,4))'::polygon && '((3,3),(4,3),(4,4),(3,4),(3,3))'::polygon AS "false"; SELECT '((200,800),(800,800),(800,200),(200,200))' && '(1000,1000,0,0)'::polygon AS "true"; - diff --git a/src/test/regress/sql/portals_p2.sql b/src/test/regress/sql/portals_p2.sql index 12bd903e5f1..190035ae01e 100644 --- a/src/test/regress/sql/portals_p2.sql +++ b/src/test/regress/sql/portals_p2.sql @@ -96,4 +96,3 @@ CLOSE foo24; CLOSE foo25; END; - diff --git a/src/test/regress/sql/prepare.sql b/src/test/regress/sql/prepare.sql index 1dc4db188e5..25f814b4667 100644 --- a/src/test/regress/sql/prepare.sql +++ b/src/test/regress/sql/prepare.sql @@ -75,4 +75,3 @@ SELECT name, statement, parameter_types FROM pg_prepared_statements DEALLOCATE ALL; SELECT name, statement, parameter_types FROM pg_prepared_statements ORDER BY name; - diff --git a/src/test/regress/sql/random.sql b/src/test/regress/sql/random.sql index 6ad1ff18660..ae6b70a157b 100644 --- a/src/test/regress/sql/random.sql +++ b/src/test/regress/sql/random.sql @@ -41,4 +41,3 @@ SELECT random, count(random) FROM RANDOM_TBL SELECT AVG(random) FROM RANDOM_TBL HAVING AVG(random) NOT BETWEEN 80 AND 120; - diff --git a/src/test/regress/sql/select_implicit.sql b/src/test/regress/sql/select_implicit.sql index 4e934da0931..448405bb1e2 100644 --- a/src/test/regress/sql/select_implicit.sql +++ b/src/test/regress/sql/select_implicit.sql @@ -152,4 +152,3 @@ SELECT * FROM test_missing_target3; DROP TABLE test_missing_target; DROP TABLE test_missing_target2; DROP TABLE test_missing_target3; - diff --git a/src/test/regress/sql/select_into.sql b/src/test/regress/sql/select_into.sql index 993c44b727d..2fa3d1e08ec 100644 --- a/src/test/regress/sql/select_into.sql +++ b/src/test/regress/sql/select_into.sql @@ -15,4 +15,3 @@ SELECT * WHERE onek2.unique1 < 2; DROP TABLE tmp1; - diff --git a/src/test/regress/sql/select_views.sql b/src/test/regress/sql/select_views.sql index dd1837f797c..14f1be86fbe 100644 --- a/src/test/regress/sql/select_views.sql +++ b/src/test/regress/sql/select_views.sql @@ -8,4 +8,3 @@ SELECT * FROM street; SELECT name, #thepath FROM iexit ORDER BY 1, 2; SELECT * FROM toyemp WHERE name = 'sharon'; - diff --git a/src/test/regress/sql/sequence.sql b/src/test/regress/sql/sequence.sql index f3eb81ec134..af35a054d8a 100644 --- a/src/test/regress/sql/sequence.sql +++ b/src/test/regress/sql/sequence.sql @@ -116,4 +116,4 @@ SELECT lastval(); ROLLBACK; DROP USER seq_user; -DROP SEQUENCE seq; \ No newline at end of file +DROP SEQUENCE seq; diff --git a/src/test/regress/sql/triggers.sql b/src/test/regress/sql/triggers.sql index 4decbfb68f8..68495ca112e 100644 --- a/src/test/regress/sql/triggers.sql +++ b/src/test/regress/sql/triggers.sql @@ -578,4 +578,3 @@ SELECT * FROM min_updates_test_oids; DROP TABLE min_updates_test; DROP TABLE min_updates_test_oids; - diff --git a/src/test/thread/README b/src/test/thread/README index 9f85ae73982..67220b328ba 100644 --- a/src/test/thread/README +++ b/src/test/thread/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/test/thread/README,v 1.3 2009/12/02 14:07:26 momjian Exp $ +$PostgreSQL: pgsql/src/test/thread/README,v 1.4 2010/08/19 05:57:35 petere Exp $ Threading ========= @@ -52,4 +52,3 @@ to test your system however, you can do so as follows: Your system uses gethostbyname which is thread-safe. Your platform is thread-safe. - diff --git a/src/tools/add_cvs_markers b/src/tools/add_cvs_markers index 7344735aa28..a28d26b59f3 100755 --- a/src/tools/add_cvs_markers +++ b/src/tools/add_cvs_markers @@ -1,6 +1,6 @@ #!/bin/sh -# $PostgreSQL: pgsql/src/tools/add_cvs_markers,v 1.2 2008/06/15 21:58:55 adunstan Exp $ +# $PostgreSQL: pgsql/src/tools/add_cvs_markers,v 1.3 2010/08/19 05:57:35 petere Exp $ # Author: Andrew Dunstan @@ -47,4 +47,3 @@ find . \( \( -name 'libstemmer' -o -name 'expected' -o -name 'ppport.h' \ xargs -l sed -i -e '1i/*\n * \x24PostgreSQL:$ \n */' rm -f dummy - diff --git a/src/tools/backend/README b/src/tools/backend/README index bde3a3e4c0f..ecf2b648783 100644 --- a/src/tools/backend/README +++ b/src/tools/backend/README @@ -1,5 +1,4 @@ -$PostgreSQL: pgsql/src/tools/backend/README,v 1.2 2008/03/21 13:23:29 momjian Exp $ +$PostgreSQL: pgsql/src/tools/backend/README,v 1.3 2010/08/19 05:57:35 petere Exp $ Just point your browser at the index.html file, and click on the flowchart to see the description and source code. - diff --git a/src/tools/backend/backend_dirs.html b/src/tools/backend/backend_dirs.html index a77cee96cfe..9b675c3e2a8 100644 --- a/src/tools/backend/backend_dirs.html +++ b/src/tools/backend/backend_dirs.html @@ -347,4 +347,3 @@ href="mailto:pgman@candle.pha.pa.us">pgman@candle.pha.pa.us Last updated: Fri May 6 14:22:27 EDT 2005 - diff --git a/src/tools/copyright b/src/tools/copyright index de1fff2e22d..230ed827d55 100755 --- a/src/tools/copyright +++ b/src/tools/copyright @@ -1,6 +1,6 @@ #!/bin/sh -# $PostgreSQL: pgsql/src/tools/copyright,v 1.18 2009/01/01 18:31:55 momjian Exp $ +# $PostgreSQL: pgsql/src/tools/copyright,v 1.19 2010/08/19 05:57:35 petere Exp $ echo "Using current year: `date '+%Y'`" @@ -12,4 +12,3 @@ do done echo "Manually update doc/src/sgml/legal.sgml and src/interfaces/libpq/libpq.rc.in too" 1>&2 - diff --git a/src/tools/editors/vim.samples b/src/tools/editors/vim.samples index 210d9a360aa..ccbc93f69b6 100644 --- a/src/tools/editors/vim.samples +++ b/src/tools/editors/vim.samples @@ -1,4 +1,3 @@ - """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " " These settings are appropriate for editing PostgreSQL code with vim diff --git a/src/tools/entab/Makefile b/src/tools/entab/Makefile index 64697a5d700..b252432e146 100644 --- a/src/tools/entab/Makefile +++ b/src/tools/entab/Makefile @@ -26,4 +26,3 @@ install: install -s $(TARGET) $(BINDIR) rm -f $(BINDIR)/detab ln $(BINDIR)/$(TARGET) $(BINDIR)/detab - diff --git a/src/tools/find_badmacros b/src/tools/find_badmacros index f58e213c9d4..1195e631825 100755 --- a/src/tools/find_badmacros +++ b/src/tools/find_badmacros @@ -3,7 +3,7 @@ # This script attempts to find bad ifdef's, i.e. ifdef's that use braces # but not the do { ... } while (0) syntax # -# $PostgreSQL: pgsql/src/tools/find_badmacros,v 1.2 2006/03/11 04:38:41 momjian Exp $ +# $PostgreSQL: pgsql/src/tools/find_badmacros,v 1.3 2010/08/19 05:57:35 petere Exp $ # # This is useful for running before pgindent @@ -20,4 +20,3 @@ do }' "$FILE" grep -on '^#define.*{' "$FILE" | grep -v 'do[ ]*{' done - diff --git a/src/tools/find_static b/src/tools/find_static index c841e9ab263..c0c8dc4809b 100755 --- a/src/tools/find_static +++ b/src/tools/find_static @@ -1,6 +1,6 @@ #!/bin/sh -# $PostgreSQL: pgsql/src/tools/find_static,v 1.5 2006/07/14 14:59:00 momjian Exp $ +# $PostgreSQL: pgsql/src/tools/find_static,v 1.6 2010/08/19 05:57:35 petere Exp $ trap "rm -f /tmp/$$" 0 1 2 3 15 @@ -49,4 +49,3 @@ echo " where scope = 'T' and func != 'main' order by file, func; " |psql debug - diff --git a/src/tools/make_diff/README b/src/tools/make_diff/README index 9e333b6164a..0dbab7dc74a 100644 --- a/src/tools/make_diff/README +++ b/src/tools/make_diff/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/tools/make_diff/README,v 1.4 2008/03/21 13:23:29 momjian Exp $ +$PostgreSQL: pgsql/src/tools/make_diff/README,v 1.5 2010/08/19 05:57:36 petere Exp $ scripts ======= @@ -37,4 +37,3 @@ the files I used with cporig. Finally, I remove my old copies with 'rmorig'. Bruce Momjian - diff --git a/src/tools/msvc/build.pl b/src/tools/msvc/build.pl index 764e5942f6a..f82af961be1 100644 --- a/src/tools/msvc/build.pl +++ b/src/tools/msvc/build.pl @@ -1,7 +1,6 @@ - # -*-perl-*- hey - emacs - this is a perl file -# $PostgreSQL: pgsql/src/tools/msvc/build.pl,v 1.3 2010/04/09 13:05:58 mha Exp $ +# $PostgreSQL: pgsql/src/tools/msvc/build.pl,v 1.4 2010/08/19 05:57:36 petere Exp $ BEGIN { diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl index 4c0792242cb..b942bb1dad4 100644 --- a/src/tools/msvc/vcregress.pl +++ b/src/tools/msvc/vcregress.pl @@ -1,7 +1,6 @@ - # -*-perl-*- hey - emacs - this is a perl file -# $PostgreSQL: pgsql/src/tools/msvc/vcregress.pl,v 1.15 2010/04/09 13:05:58 mha Exp $ +# $PostgreSQL: pgsql/src/tools/msvc/vcregress.pl,v 1.16 2010/08/19 05:57:36 petere Exp $ use strict; diff --git a/src/tools/pgindent/README b/src/tools/pgindent/README index 1cf0629d313..7b65abe52fc 100644 --- a/src/tools/pgindent/README +++ b/src/tools/pgindent/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/tools/pgindent/README,v 1.42 2010/07/06 19:26:28 momjian Exp $ +$PostgreSQL: pgsql/src/tools/pgindent/README,v 1.43 2010/08/19 05:57:36 petere Exp $ pgindent ======== @@ -75,4 +75,3 @@ To use pgindent: 4) Save a list of typedefs by running: src/tools/find_typedef /usr/local/pgsql/bin /usr/local/pgsql/lib > /tmp/pgtypedefs - diff --git a/src/tutorial/syscat.source b/src/tutorial/syscat.source index 11689352d30..2ab169e9ce6 100644 --- a/src/tutorial/syscat.source +++ b/src/tutorial/syscat.source @@ -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/tutorial/syscat.source,v 1.21 2010/01/02 16:58:17 momjian Exp $ +-- $PostgreSQL: pgsql/src/tutorial/syscat.source,v 1.22 2010/08/19 05:57:36 petere Exp $ -- --------------------------------------------------------------------------- @@ -182,4 +182,3 @@ SELECT am.amname, n.nspname, opf.opfname, opr.oprname -- Reset the search path -- RESET SEARCH_PATH; -