From efc1610b64b04e7cf08cc1d6c608ede8b7d5ff07 Mon Sep 17 00:00:00 2001
From: Tatsuo Ishii <ishii@postgresql.org>
Date: Sun, 9 Aug 2015 10:55:41 +0900
Subject: [PATCH] Fix broken multibyte regression tests.
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 | 1 -
src/test/mb/expected/euc_jp.out | 1 -
src/test/mb/expected/euc_kr.out | 1 -
src/test/mb/expected/euc_tw.out | 1 -
src/test/mb/expected/gb18030.out | 1 -
src/test/mb/expected/mule_internal.out | 2 --
src/test/mb/expected/sjis.out | 1 -
src/test/mb/expected/utf8.out | 1 -
8 files changed, 9 deletions(-)
diff --git a/src/test/mb/expected/big5.out b/src/test/mb/expected/big5.out
index d7a6097e612..97100cd0a2d 100644
--- a/src/test/mb/expected/big5.out
+++ b/src/test/mb/expected/big5.out
@@ -2,7 +2,6 @@ drop table
create table 紅坝戈 (︽穨 text, そ╋繷 varchar, varchar(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');
diff --git a/src/test/mb/expected/euc_jp.out b/src/test/mb/expected/euc_jp.out
index be248d91359..15f83e0231c 100644
--- 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, 尸梧コ〖ド 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布');
diff --git a/src/test/mb/expected/euc_kr.out b/src/test/mb/expected/euc_kr.out
index 837f2e60d07..229ffd8f971 100644
--- a/src/test/mb/expected/euc_kr.out
+++ b/src/test/mb/expected/euc_kr.out
@@ -3,7 +3,6 @@ ERROR: table "酮擤薛
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');
diff --git a/src/test/mb/expected/euc_tw.out b/src/test/mb/expected/euc_tw.out
index f224e7820d5..99eb4884e12 100644
--- 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, 狞瞥婉螭 varchar, 氢蛇 varchar(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摩');
diff --git a/src/test/mb/expected/gb18030.out b/src/test/mb/expected/gb18030.out
index 562852b6741..b14234dce40 100644
--- a/src/test/mb/expected/gb18030.out
+++ b/src/test/mb/expected/gb18030.out
@@ -2,7 +2,6 @@ drop table 計
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下');
diff --git a/src/test/mb/expected/mule_internal.out b/src/test/mb/expected/mule_internal.out
index 67f7775706e..ac8b57dc421 100644
--- a/src/test/mb/expected/mule_internal.out
+++ b/src/test/mb/expected/mule_internal.out
@@ -3,7 +3,6 @@ ERROR: table "
create table 挿讙换挼脱捀� (捦褣胳 text, 捠瑨梧挜硳〖挜� varchar, 捜鲯雇1A挙罀よ char(16));
create index 挿讙换挼脱捀靑ndex1 on 挿讙换挼脱捀� using btree (捦褣胳);
create index 挿讙换挼脱捀靑ndex2 on 挿讙换挼脱捀� using hash (捠瑨梧挜硳〖挜�);
-WARNING: hash indexes are not WAL-logged and their use is discouraged
insert into 挿讙换挼脱捀� values('挜硳ン挜話ュ挕紥タ挜菕ィ挜箳プ挜鞉イ','挼01捑�');
insert into 挿讙换挼脱捀� values('挜硳ン挜話ュ挕紥タ挜皰ラ挜諕ィ挜脪ク挜�','捠珺10捗�');
insert into 挿讙换挼脱捀� values('挜硳ン挜話ュ挕紥タ挜讙ロ挜皰ラ挜迴〖','捒蚙01挷�');
@@ -178,7 +177,6 @@ ERROR: table "
create table 撏獡擤撗侩摼� (摽霌绢 text, 撦聯拙撃趽靛 varchar, 摵駬绊1A摱髶备 char(16));
create index 撏獡擤撗侩摼頸ndex1 on 撏獡擤撗侩摼� using btree (摽霌绢);
create index 撏獡擤撗侩摼頸ndex2 on 撏獡擤撗侩摼� using hash (撦聯拙撃趽靛);
-WARNING: hash indexes are not WAL-logged and their use is discouraged
insert into 撏獡擤撗侩摼� values('撃膿腔撆蛽叼摻簱敲摲箵捞', '撗01撨�');
insert into 撏獡擤撗侩摼� values('撃膿腔撆蛽弊摲侨摻�', '撦翨10擇�');
insert into 撏獡擤撗侩摼� values('撃膿腔撆蛽橇摲螕弊摲赣', '撿裐01擓�');
diff --git a/src/test/mb/expected/sjis.out b/src/test/mb/expected/sjis.out
index 73dd29b9843..db2bfd0d755 100644
--- a/src/test/mb/expected/sjis.out
+++ b/src/test/mb/expected/sjis.out
@@ -2,7 +2,6 @@ drop table
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壓');
diff --git a/src/test/mb/expected/utf8.out b/src/test/mb/expected/utf8.out
index 715f3468374..8f9f63c7e0e 100644
--- 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 瑷堢畻姗熺敤瑾瀒ndex1 on 瑷堢畻姗熺敤瑾� using btree (鐢ㄨ獮);
create index 瑷堢畻姗熺敤瑾瀒ndex2 on 瑷堢畻姗熺敤瑾� using hash (鍒嗛銈炽兗銉�);
-WARNING: hash indexes are not WAL-logged and their use is discouraged
insert into 瑷堢畻姗熺敤瑾� values('銈炽兂銉斻儱銉笺偪銉囥偅銈广儣銉偆','姗烝01涓�');
insert into 瑷堢畻姗熺敤瑾� values('銈炽兂銉斻儱銉笺偪銈般儵銉曘偅銉冦偗銈�','鍒咮10涓�');
insert into 瑷堢畻姗熺敤瑾� values('銈炽兂銉斻儱銉笺偪銉椼儹銈般儵銉炪兗','浜篫01涓�');
--
GitLab