git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 08c6178)

Fix broken multibyte regression tests.

author Tatsuo Ishii <ishii@postgresql.org>

Sun, 9 Aug 2015 01:55:41 +0000 (10:55 +0900)

committer Tatsuo Ishii <ishii@postgresql.org>

Sun, 9 Aug 2015 02:05:53 +0000 (11:05 +0900)

commit 9043Fe390f4f0b4586cfe59cbd22314b9c3e2957 broke multibyte
regression tests because the commit removes the warning message when
temporary hash indexes is created, which has been added by commit
07af523870bcfe930134054febd3a6a114942e5b.

Back patched to 9.5 stable tree.

src/test/mb/expected/big5.out patch | blob | blame | history

src/test/mb/expected/euc_jp.out patch | blob | blame | history

src/test/mb/expected/euc_kr.out patch | blob | blame | history

src/test/mb/expected/euc_tw.out patch | blob | blame | history

src/test/mb/expected/gb18030.out patch | blob | blame | history

src/test/mb/expected/mule_internal.out patch | blob | blame | history

src/test/mb/expected/sjis.out patch | blob | blame | history

src/test/mb/expected/utf8.out patch | blob | blame | history

diff --git a/src/test/mb/expected/big5.out b/src/test/mb/expected/big5.out

index d7a6097e612e8182720285c83d2fb2391783bb01..97100cd0a2d049fcc7c8e218070320664e49437a 100644 (file)

--- a/src/test/mb/expected/big5.out

+++ b/src/test/mb/expected/big5.out

@@ -2,7 +2,6 @@ drop table

create table 1⁄4t°Ó ̧ê®Æ (¦æ·~§O text, ¤1⁄2\q©ïÀY varchar, ¦a§} varchar(16));

create index 1⁄4t°Ó ̧ê®Æindex1 on 1⁄4t°Ó ̧ê®Æ using btree (¦æ·~§O);

create index 1⁄4t°Ó ̧ê®Æindex2 on 1⁄4t°Ó ̧ê®Æ using hash (¤1⁄2\q©ïÀY);

-WARNING: hash indexes are not WAL-logged and their use is discouraged

insert into 1⁄4t°Ó ̧ê®Æ values ('1q ̧£·~', '1F1F¬ì§Þ', '\_A01¤ ̄');

insert into 1⁄4t°Ó ̧ê®Æ values ('»s3y·~', '°]·1⁄2¦3¤1⁄2\q', '¤¤B10¤¤');

insert into 1⁄4t°Ó ̧ê®Æ values ('À\¶1⁄4·~', '¬ü ̈ýaÑ\÷¦3¤1⁄2\q', '°aZ01¤E');

diff --git a/src/test/mb/expected/euc_jp.out b/src/test/mb/expected/euc_jp.out

index be248d91359a56049cb0b00d936cc12473be4c68..15f83e0231cc29c6d565dde9053ca94c49fd4788 100644 (file)

--- a/src/test/mb/expected/euc_jp.out

+++ b/src/test/mb/expected/euc_jp.out

@@ -3,7 +3,6 @@ ERROR: table "

create table ×ばつ»»μ¡ÍÑ ̧ì (ÍÑ ̧ì text, Ê¬Îà3円¡1⁄4\É varchar, È÷1Í1A¤À¤è char(16));

create index ×ばつ»»μ¡ÍÑ ̧ìindex1 on ×ばつ»»μ¡ÍÑ ̧ì using btree (ÍÑ ̧ì);

create index ×ばつ»»μ¡ÍÑ ̧ìindex2 on ×ばつ»»μ¡ÍÑ ̧ì using hash (Ê¬Îà3円¡1⁄4\É);

-WARNING: hash indexes are not WAL-logged and their use is discouraged

insert into ×ばつ»»μ¡ÍÑ ̧ì values(×ばつ\ì\¤','μ¡A013⁄4å');

insert into ×ばつ»»μ¡ÍÑ ̧ì values('3円\ó\Ô\å¡1⁄4\¿\°\é\Õ\£\Ã\ ̄1円','Ê¬B10Ãæ');

insert into ×ばつ»»μ¡ÍÑ ̧ì values(×ばつ\í\°\é\Þ¡1⁄4','¿ÍZ0121⁄4');

diff --git a/src/test/mb/expected/euc_kr.out b/src/test/mb/expected/euc_kr.out

index 837f2e60d078180339ee70dc65bb05fca0cd4eb5..229ffd8f971543b1cd3422435826201bd57331dc 100644 (file)

--- a/src/test/mb/expected/euc_kr.out

+++ b/src/test/mb/expected/euc_kr.out

@@ -3,7 +3,6 @@ ERROR: table "ͪߩѦ

create table Íaß©Ñ¦¿ë3⁄4î (¿ë3⁄4î text, ×ばつ3⁄4ÄÚμå varchar, oñ°í1A¶ó± ̧ char(16));

create index Íaß©Ñ¦¿ë3⁄4îindex1 on Íaß©Ñ¦¿ë3⁄4î using btree (¿ë3⁄4î);

create index Íaß©Ñ¦¿ë3⁄4îindex2 on Íaß©Ñ¦¿ë3⁄4î using hash (×ばつ3⁄4ÄÚμå);

-WARNING: hash indexes are not WAL-logged and their use is discouraged

insert into Íaß©Ñ¦¿ë3⁄4î values('ÄÄÇ»ÅÍμð1⁄2oÇÃ·1ÀÌ', 'Ñ¦A01ß3⁄4');

insert into Íaß©Ñ¦¿ë3⁄4î values(×ばつ·¡ÇÈ1⁄2o', 'ÝÂB10ñé');

insert into Íaß©Ñ¦¿ë3⁄4î values(×ばつ·¡ ̧Ó', 'ìÑZ01ù»');

diff --git a/src/test/mb/expected/euc_tw.out b/src/test/mb/expected/euc_tw.out

index f224e7820d5ddbd392f73d1aba0edd611f65e50d..99eb4884e12668fe9c4abbe0ab21bbf12fb2e697 100644 (file)

--- a/src/test/mb/expected/euc_tw.out

+++ b/src/test/mb/expected/euc_tw.out

@@ -3,7 +3,6 @@ ERROR: table "

create table ìÞÙ ̧æñÕè (ÈçäÆÉ± text, ÄüÆ3Íñó¤ varchar, ÇâÉß varchar(16));

create index ìÞÙ ̧æñÕèindex1 on ìÞÙ ̧æñÕè using btree (ÈçäÆÉ±);

create index ìÞÙ ̧æñÕèindex2 on ìÞÙ ̧æñÕè using hash (ÄüÆ3Íñó¤);

-WARNING: hash indexes are not WAL-logged and their use is discouraged

insert into ìÞÙ ̧æñÕè values ('çÙæaäÆ', 'ç®ç®ÒïÊÀ', 'Æ¡A01Äî');

insert into ìÞÙ ̧æñÕè values ('êûÝßäÆ', 'ØÂäãÈ ́ÓîÄüÆ3', 'ÄãB10Äã');

insert into ìÞÙ ̧æñÕè values ('ó§ã£äÆ', 'Ó¡ÌÀÏ ́Ç1È ́ÓîÄüÆ3', 'ØíZ01Ä¦');

diff --git a/src/test/mb/expected/gb18030.out b/src/test/mb/expected/gb18030.out

index 562852b6741b9d99cf58d7bd4bb1334797933a06..b14234dce400c6ef1f95f4572fe423f2a7ef2717 100644 (file)

--- a/src/test/mb/expected/gb18030.out

+++ b/src/test/mb/expected/gb18030.out

@@ -2,7 +2,6 @@ drop table Ӌ

create table Ó8円bËã99円CÓÃÕZ (ÓÃÕZ text, ·Öî90円3円©`\É varchar, 82円ä¿1⁄41A¤À¤è char(16));

create index Ó8円bËã99円CÓÃÕZindex1 on Ó8円bËã99円CÓÃÕZ using btree (ÓÃÕZ);

create index Ó8円bËã99円CÓÃÕZindex2 on Ó8円bËã99円CÓÃÕZ using hash (·Öî90円3円©`\É);

-WARNING: hash indexes are not WAL-logged and their use is discouraged

insert into Ó8円bËã99円CÓÃÕZ values(×ばつ\ì\¤','99円CA01ÉÏ');

insert into Ó8円bËã99円CÓÃÕZ values('3円\ó\Ô\å©`\¿\°\é\Õ\£\Ã\ ̄1円','·ÖB10ÖÐ');

insert into Ó8円bËã99円CÓÃÕZ values(×ばつ\í\°\é\Þ©`','ÈËZ01ÏÂ');

diff --git a/src/test/mb/expected/mule_internal.out b/src/test/mb/expected/mule_internal.out

index 67f7775706efd89c8da15cf6c33f1fabf103cf4b..ac8b57dc4216fd68bc74ef774a934cef1f3db707 100644 (file)

--- a/src/test/mb/expected/mule_internal.out

+++ b/src/test/mb/expected/mule_internal.out

@@ -3,7 +3,6 @@ ERROR: table "

create table 92円×ばつ92円»»92円μ¡92円ÍÑ92円 ̧ì (92円ÍÑ92円 ̧ì text, 92円Ê¬92円Îà92円3円92円¡1⁄492円\É varchar, 92円È÷92円1Í1A92円¤À92円¤è char(16));

create index 92円×ばつ92円»»92円μ¡92円ÍÑ92円 ̧ìindex1 on 92円×ばつ92円»»92円μ¡92円ÍÑ92円 ̧ì using btree (92円ÍÑ92円 ̧ì);

create index 92円×ばつ92円»»92円μ¡92円ÍÑ92円 ̧ìindex2 on 92円×ばつ92円»»92円μ¡92円ÍÑ92円 ̧ì using hash (92円Ê¬92円Îà92円3円92円¡1⁄492円\É);

-WARNING: hash indexes are not WAL-logged and their use is discouraged

insert into 92円×ばつ92円»»92円μ¡92円ÍÑ92円 ̧ì values('92円3円92円\ó92円\Ô92円\å92円¡1⁄492円\¿92円\Ç92円\£92円1円92円×ばつ92円\ì92円\¤','92円μ¡A0192円3⁄4å');

insert into 92円×ばつ92円»»92円μ¡92円ÍÑ92円 ̧ì values('92円3円92円\ó92円\Ô92円\å92円¡1⁄492円\¿92円\°92円\é92円\Õ92円\£92円\Ã92円\ ̄92円1円','92円Ê¬B1092円Ãæ');

insert into 92円×ばつ92円»»92円μ¡92円ÍÑ92円 ̧ì values('92円3円92円\ó92円\Ô92円\å92円¡1⁄492円\¿92円×ばつ92円\í92円\°92円\é92円\Þ92円¡1⁄4','92円¿ÍZ0192円21⁄4');

@@ -178,7 +177,6 @@ ERROR: table "

create table 93円Ía93円ß©93円Ñ¦93円¿ë93円3⁄4î (93円¿ë93円3⁄4î text, 93円ÝÂ93円×ばつ3⁄493円ÄÚ93円μå varchar, 93円oñ93円°í1A93円¶ó93円± ̧ char(16));

create index 93円Ía93円ß©93円Ñ¦93円¿ë93円3⁄4îindex1 on 93円Ía93円ß©93円Ñ¦93円¿ë93円3⁄4î using btree (93円¿ë93円3⁄4î);

create index 93円Ía93円ß©93円Ñ¦93円¿ë93円3⁄4îindex2 on 93円Ía93円ß©93円Ñ¦93円¿ë93円3⁄4î using hash (93円ÝÂ93円×ばつ3⁄493円ÄÚ93円μå);

-WARNING: hash indexes are not WAL-logged and their use is discouraged

insert into 93円Ía93円ß©93円Ñ¦93円¿ë93円3⁄4î values('93円ÄÄ93円Ç»93円ÅÍ93円μð93円1⁄2o93円ÇÃ93円·193円ÀÌ', '93円Ñ¦A0193円ß3⁄4');

insert into 93円Ía93円ß©93円Ñ¦93円¿ë93円3⁄4î values('93円ÄÄ93円Ç»93円ÅÍ93円×ばつ93円·¡93円ÇÈ93円1⁄2o', '93円ÝÂB1093円ñé');

insert into 93円Ía93円ß©93円Ñ¦93円¿ë93円3⁄4î values('93円ÄÄ93円Ç»93円ÅÍ93円ÇÁ93円·Î93円×ばつ93円·¡93円 ̧Ó', '93円ìÑZ0193円ù»');

diff --git a/src/test/mb/expected/sjis.out b/src/test/mb/expected/sjis.out

index 73dd29b984394fc515af7b99e55824b5719fc6a6..db2bfd0d755ef11396df00242d6af51f6a62fa4a 100644 (file)

--- a/src/test/mb/expected/sjis.out

+++ b/src/test/mb/expected/sjis.out

@@ -2,7 +2,6 @@ drop table

create table 8円cv8円eZ8円b@97円p8円cê (97円p8円cê text, 95円a97円Þ83円R81円[83円h varchar, 94円õ8円dl1A82円3⁄482円æ char(16));

create index 8円cv8円eZ8円b@97円p8円cêindex1 on 8円cv8円eZ8円b@97円p8円cê using btree (97円p8円cê);

create index 8円cv8円eZ8円b@97円p8円cêindex2 on 8円cv8円eZ8円b@97円p8円cê using hash (95円a97円Þ83円R81円[83円h);

-WARNING: hash indexes are not WAL-logged and their use is discouraged

insert into 8円cv8円eZ8円b@97円p8円cê values('83円R83円93円83円s83円85円81円[83円^83円f83円B83円X83円v83円8円c83円C','8円b@A018円fã');

insert into 8円cv8円eZ8円b@97円p8円cê values('83円R83円93円83円s83円85円81円[83円^83円O83円89円83円t83円B83円b83円N83円X','95円aB1092円86円');

insert into 8円cv8円eZ8円b@97円p8円cê values('83円R83円93円83円s83円85円81円[83円^83円v83円8円d83円O83円89円83円}81円[','90円lZ0189円o');

diff --git a/src/test/mb/expected/utf8.out b/src/test/mb/expected/utf8.out

index 715f3468374ac7dd7bd36a2f321cc512e9d7ffa2..8f9f63c7e0e5718f9942e8b80530dcd0f3309bd7 100644 (file)

--- a/src/test/mb/expected/utf8.out

+++ b/src/test/mb/expected/utf8.out

@@ -3,7 +3,6 @@ ERROR: table "計算機用語" does not exist

create table 計算機用語 (用語 text, 分類コード varchar, 備考1Aだよ char(16));

create index 計算機用語index1 on 計算機用語 using btree (用語);

create index 計算機用語index2 on 計算機用語 using hash (分類コード);

-WARNING: hash indexes are not WAL-logged and their use is discouraged

insert into 計算機用語 values('コンピュータディスプレイ','機A01上');

insert into 計算機用語 values('コンピュータグラフィックス','分B10中');

insert into 計算機用語 values('コンピュータプログラマー','人Z01下');

This is the main PostgreSQL git repository.