From 479cb1e420c40d78b49535c0ceeaa5f65c7d6797 Mon Sep 17 00:00:00 2001 From: Tatsuo Ishii 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 呾C蚚惤 (蚚惤 text, 煦戊奈玉 varchar, 靽1A分方 char(16)); create index 呾C蚚惤index1 on 呾C蚚惤 using btree (蚚惤); create index 呾C蚚惤index2 on 呾C蚚惤 using hash (煦戊奈玉); -WARNING: hash indexes are not WAL-logged and their use is discouraged insert into 呾C蚚惤 values('戊件疋亙奈正犯奴旦皿伊奶','CA01奻'); insert into 呾C蚚惤 values('戊件疋亙奈正弘仿白奴永弁旦','煦B10笢'); insert into 呾C蚚惤 values('戊件疋亙奈正皿伕弘仿穴奈','汳01狟'); 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 煌遙窗迕賄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票'); @@ -178,7 +177,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/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 vZ@p (p text, R[h varchar, l1A char(16)); create index vZ@p甋ndex1 on vZ@p using btree (p); create index vZ@p甋ndex2 on vZ@p using hash (R[h); -WARNING: hash indexes are not WAL-logged and their use is discouraged insert into vZ@p values('Rs[^fBXvC','@A01'); insert into vZ@p values('Rs[^OtBbNX','朋10'); insert into vZ@p values('Rs[^vO}[','lZ01'); 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 閮蝞璈刻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('喋喋乓潦踴准啜押','鈭暢01銝');