Fix multibyte regress results for EUC_CN, EUC_KR and EUC_TW

diff --git a/src/test/regress/expected/euc_cn.out b/src/test/regress/expected/euc_cn.out
index b9944f4..37790f8 100644 (file)
--- a/src/test/regress/expected/euc_cn.out
+++ b/src/test/regress/expected/euc_cn.out
@@ -1,87 +1,87 @@
-QUERY: drop table ¼ÆËã»úÊõÓï;
+drop table ¼ÆËã»úÊõÓï;
 ERROR:  Relation '¼ÆËã»úÊõÓï' does not exist
-QUERY: create table ¼ÆËã»úÊõÓï(ÊõÓï text, ·ÖÀàºÅ varchar, ±¸×¢1A char(16));
-QUERY: create index ¼ÆËã»úÊõÓïindex1 on ¼ÆËã»úÊõÓï using btree(ÊõÓï);
-QUERY: create index ¼ÆËã»úÊõÓïindex2 on ¼ÆËã»úÊõÓï using btree(·ÖÀàºÅ);
-QUERY: insert into ¼ÆËã»úÊõÓï values('µçÄÔÏÔʾÆÁ','»úA01ÉÏ');
-QUERY: insert into ¼ÆËã»úÊõÓï values('µçÄÔͼÐÎ','·ÖB01ÖÐ');
-QUERY: insert into ¼ÆËã»úÊõÓï values('µçÄÔ³ÌÐòÔ±','ÈËZ01ÏÂ');
-QUERY: vacuum ¼ÆËã»úÊõÓï;
-QUERY: select * from ¼ÆËã»úÊõÓï;
-ÊõÓï      |·ÖÀàºÅ |±¸×¢1a
-----------+-------+------
-µçÄÔÏÔʾÆÁ|»úA01ÉÏ|      
-µçÄÔͼÐÎ  |·ÖB01ÖÐ|      
-µçÄÔ³ÌÐòÔ±|ÈËZ01ÏÂ|      
+create table ¼ÆËã»úÊõÓï(ÊõÓï text, ·ÖÀàºÅ varchar, ±¸×¢1A char(16));
+create index ¼ÆËã»úÊõÓïindex1 on ¼ÆËã»úÊõÓï using btree(ÊõÓï);
+create index ¼ÆËã»úÊõÓïindex2 on ¼ÆËã»úÊõÓï using btree(·ÖÀàºÅ);
+insert into ¼ÆËã»úÊõÓï values('µçÄÔÏÔʾÆÁ','»úA01ÉÏ');
+insert into ¼ÆËã»úÊõÓï values('µçÄÔͼÐÎ','·ÖB01ÖÐ');
+insert into ¼ÆËã»úÊõÓï values('µçÄÔ³ÌÐòÔ±','ÈËZ01ÏÂ');
+vacuum ¼ÆËã»úÊõÓï;
+select * from ¼ÆËã»úÊõÓï;
+    ÊõÓï    | ·ÖÀàºÅ  | ±¸×¢1a 
+------------+---------+--------
+ µçÄÔÏÔʾÆÁ | »úA01ÉÏ | 
+ µçÄÔͼÐÎ   | ·ÖB01ÖÐ | 
+ µçÄÔ³ÌÐòÔ± | ÈËZ01Ï | 
 (3 rows)
 
-QUERY: select * from ¼ÆËã»úÊõÓï where ·ÖÀàºÅ = 'ÈËZ01ÏÂ';
-ÊõÓï      |·ÖÀàºÅ |±¸×¢1a
-----------+-------+------
-µçÄÔ³ÌÐòÔ±|ÈËZ01ÏÂ|      
+select * from ¼ÆËã»úÊõÓï where ·ÖÀàºÅ = 'ÈËZ01ÏÂ';
+    ÊõÓï    | ·ÖÀàºÅ  | ±¸×¢1a 
+------------+---------+--------
+ µçÄÔ³ÌÐòÔ± | ÈËZ01Ï | 
 (1 row)
 
-QUERY: select * from ¼ÆËã»úÊõÓï where ·ÖÀàºÅ ~* 'ÈËz01ÏÂ';
-ÊõÓï      |·ÖÀàºÅ |±¸×¢1a
-----------+-------+------
-µçÄÔ³ÌÐòÔ±|ÈËZ01ÏÂ|      
+select * from ¼ÆËã»úÊõÓï where ·ÖÀàºÅ ~* 'ÈËz01ÏÂ';
+    ÊõÓï    | ·ÖÀàºÅ  | ±¸×¢1a 
+------------+---------+--------
+ µçÄÔ³ÌÐòÔ± | ÈËZ01Ï | 
 (1 row)
 
-QUERY: select * from ¼ÆËã»úÊõÓï where ·ÖÀàºÅ like '_Z01_';
-ÊõÓï      |·ÖÀàºÅ |±¸×¢1a
-----------+-------+------
-µçÄÔ³ÌÐòÔ±|ÈËZ01ÏÂ|      
+select * from ¼ÆËã»úÊõÓï where ·ÖÀàºÅ like '_Z01_';
+    ÊõÓï    | ·ÖÀàºÅ  | ±¸×¢1a 
+------------+---------+--------
+ µçÄÔ³ÌÐòÔ± | ÈËZ01Ï | 
 (1 row)
 
-QUERY: select * from ¼ÆËã»úÊõÓï where ·ÖÀàºÅ like '_Z%';
-ÊõÓï      |·ÖÀàºÅ |±¸×¢1a
-----------+-------+------
-µçÄÔ³ÌÐòÔ±|ÈËZ01ÏÂ|      
+select * from ¼ÆËã»úÊõÓï where ·ÖÀàºÅ like '_Z%';
+    ÊõÓï    | ·ÖÀàºÅ  | ±¸×¢1a 
+------------+---------+--------
+ µçÄÔ³ÌÐòÔ± | ÈËZ01Ï | 
 (1 row)
 
-QUERY: select * from ¼ÆËã»úÊõÓï where ÊõÓï ~ 'µçÄÔ[ÏÔͼ]';
-ÊõÓï      |·ÖÀàºÅ |±¸×¢1a
-----------+-------+------
-µçÄÔÏÔʾÆÁ|»úA01ÉÏ|      
-µçÄÔͼÐÎ  |·ÖB01ÖÐ|      
+select * from ¼ÆËã»úÊõÓï where ÊõÓï ~ 'µçÄÔ[ÏÔͼ]';
+    ÊõÓï    | ·ÖÀàºÅ  | ±¸×¢1a 
+------------+---------+--------
+ µçÄÔÏÔʾÆÁ | »úA01ÉÏ | 
+ µçÄÔͼÐÎ   | ·ÖB01ÖÐ | 
 (2 rows)
 
-QUERY: select * from ¼ÆËã»úÊõÓï where ÊõÓï ~* 'µçÄÔ[ÏÔͼ]';
-ÊõÓï      |·ÖÀàºÅ |±¸×¢1a
-----------+-------+------
-µçÄÔÏÔʾÆÁ|»úA01ÉÏ|      
-µçÄÔͼÐÎ  |·ÖB01ÖÐ|      
+select * from ¼ÆËã»úÊõÓï where ÊõÓï ~* 'µçÄÔ[ÏÔͼ]';
+    ÊõÓï    | ·ÖÀàºÅ  | ±¸×¢1a 
+------------+---------+--------
+ µçÄÔÏÔʾÆÁ | »úA01ÉÏ | 
+ µçÄÔͼÐÎ   | ·ÖB01ÖÐ | 
 (2 rows)
 
-QUERY: select *,character_length(ÊõÓï) from ¼ÆËã»úÊõÓï;
-ÊõÓï      |·ÖÀàºÅ |±¸×¢1a|length
-----------+-------+------+------
-µçÄÔÏÔʾÆÁ|»úA01ÉÏ|      |     5
-µçÄÔͼÐÎ  |·ÖB01ÖÐ|      |     4
-µçÄÔ³ÌÐòÔ±|ÈËZ01ÏÂ|      |     5
+select *,character_length(ÊõÓï) from ¼ÆËã»úÊõÓï;
+    ÊõÓï    | ·ÖÀàºÅ  | ±¸×¢1a | length 
+------------+---------+--------+--------
+ µçÄÔÏÔʾÆÁ | »úA01ÉÏ |        |      5
+ µçÄÔͼÐÎ   | ·ÖB01ÖÐ |        |      4
+ µçÄÔ³ÌÐòÔ± | ÈËZ01Ï |        |      5
 (3 rows)
 
-QUERY: select *,octet_length(ÊõÓï) from ¼ÆËã»úÊõÓï;
-ÊõÓï      |·ÖÀàºÅ |±¸×¢1a|octet_length
-----------+-------+------+------------
-µçÄÔÏÔʾÆÁ|»úA01ÉÏ|      |          10
-µçÄÔͼÐÎ  |·ÖB01ÖÐ|      |           8
-µçÄÔ³ÌÐòÔ±|ÈËZ01ÏÂ|      |          10
+select *,octet_length(ÊõÓï) from ¼ÆËã»úÊõÓï;
+    ÊõÓï    | ·ÖÀàºÅ  | ±¸×¢1a | octet_length 
+------------+---------+--------+--------------
+ µçÄÔÏÔʾÆÁ | »úA01ÉÏ |        |           10
+ µçÄÔͼÐÎ   | ·ÖB01ÖÐ |        |            8
+ µçÄÔ³ÌÐòÔ± | ÈËZ01Ï |        |           10
 (3 rows)
 
-QUERY: select *,position('ÏÔ' in ÊõÓï) from ¼ÆËã»úÊõÓï;
-ÊõÓï      |·ÖÀàºÅ |±¸×¢1a|strpos
-----------+-------+------+------
-µçÄÔÏÔʾÆÁ|»úA01ÉÏ|      |     3
-µçÄÔͼÐÎ  |·ÖB01ÖÐ|      |     0
-µçÄÔ³ÌÐòÔ±|ÈËZ01ÏÂ|      |     0
+select *,position('ÏÔ' in ÊõÓï) from ¼ÆËã»úÊõÓï;
+    ÊõÓï    | ·ÖÀàºÅ  | ±¸×¢1a | strpos 
+------------+---------+--------+--------
+ µçÄÔÏÔʾÆÁ | »úA01ÉÏ |        |      3
+ µçÄÔͼÐÎ   | ·ÖB01ÖÐ |        |      0
+ µçÄÔ³ÌÐòÔ± | ÈËZ01Ï |        |      0
 (3 rows)
 
-QUERY: select *,substring(ÊõÓï from 3 for 4) from ¼ÆËã»úÊõÓï;
-ÊõÓï      |·ÖÀàºÅ |±¸×¢1a|substr
-----------+-------+------+------
-µçÄÔÏÔʾÆÁ|»úA01ÉÏ|      |ÏÔʾÆÁ
-µçÄÔͼÐÎ  |·ÖB01ÖÐ|      |ͼÐÎ  
-µçÄÔ³ÌÐòÔ±|ÈËZ01ÏÂ|      |³ÌÐòÔ±
+select *,substring(ÊõÓï from 3 for 4) from ¼ÆËã»úÊõÓï;
+    ÊõÓï    | ·ÖÀàºÅ  | ±¸×¢1a | substr 
+------------+---------+--------+--------
+ µçÄÔÏÔʾÆÁ | »úA01ÉÏ |        | ÏÔʾÆÁ
+ µçÄÔͼÐÎ   | ·ÖB01ÖÐ |        | ͼÐÎ
+ µçÄÔ³ÌÐòÔ± | ÈËZ01Ï |        | ³ÌÐòÔ±
 (3 rows)
 

diff --git a/src/test/regress/expected/euc_kr.out b/src/test/regress/expected/euc_kr.out
index 9d3ca8c..4c91395 100644 (file)
--- a/src/test/regress/expected/euc_kr.out
+++ b/src/test/regress/expected/euc_kr.out
@@ -1,87 +1,87 @@
-QUERY: drop table ͪߩѦ¿ë¾î;
+drop table ͪߩѦ¿ë¾î;
 ERROR:  Relation 'ͪߩѦ¿ë¾î' does not exist
-QUERY: create table ͪߩѦ¿ë¾î (¿ë¾î text, ÝÂ×¾ÄÚµå varchar, ºñ°í1A¶ó±¸ char(16));
-QUERY: create index ͪߩѦ¿ë¾îindex1 on ͪߩѦ¿ë¾î using btree (¿ë¾î);
-QUERY: create index ͪߩѦ¿ë¾îindex2 on ͪߩѦ¿ë¾î using hash (ÝÂ×¾ÄÚµå);
-QUERY: insert into ͪߩѦ¿ë¾î values('ÄÄÇ»Å͵ð½ºÇ÷¹ÀÌ', 'ѦA01ß¾');
-QUERY: insert into ͪߩѦ¿ë¾î values('ÄÄÇ»Åͱ׷¡ÇȽº', 'ÝÂB10ñé');
-QUERY: insert into ͪߩѦ¿ë¾î values('ÄÄÇ»ÅÍÇÁ·Î±×·¡¸Ó', 'ìÑZ01ù»');
-QUERY: vacuum ͪߩѦ¿ë¾î;
-QUERY: select * from ͪߩѦ¿ë¾î;
-¿ë¾î            |ÝÂ×¾ÄÚµå|ºñ°í1a¶ó±¸
-----------------+--------+----------
-ÄÄÇ»Å͵ð½ºÇ÷¹ÀÌ|ѦA01ß¾ |          
-ÄÄÇ»Åͱ׷¡ÇȽº  |ÝÂB10ñé |          
-ÄÄÇ»ÅÍÇÁ·Î±×·¡¸Ó|ìÑZ01ù» |          
+create table ͪߩѦ¿ë¾î (¿ë¾î text, ÝÂ×¾ÄÚµå varchar, ºñ°í1A¶ó±¸ char(16));
+create index ͪߩѦ¿ë¾îindex1 on ͪߩѦ¿ë¾î using btree (¿ë¾î);
+create index ͪߩѦ¿ë¾îindex2 on ͪߩѦ¿ë¾î using hash (ÝÂ×¾ÄÚµå);
+insert into ͪߩѦ¿ë¾î values('ÄÄÇ»Å͵ð½ºÇ÷¹ÀÌ', 'ѦA01ß¾');
+insert into ͪߩѦ¿ë¾î values('ÄÄÇ»Åͱ׷¡ÇȽº', 'ÝÂB10ñé');
+insert into ͪߩѦ¿ë¾î values('ÄÄÇ»ÅÍÇÁ·Î±×·¡¸Ó', 'ìÑZ01ù»');
+vacuum ͪߩѦ¿ë¾î;
+select * from ͪߩѦ¿ë¾î;
+       ¿ë¾î       | ÝÂ×¾ÄÚµå | ºñ°í1a¶ó±¸ 
+------------------+----------+------------
+ ÄÄÇ»Å͵ð½ºÇ÷¹ÀÌ | ѦA01ß¾  | 
+ ÄÄÇ»Åͱ׷¡ÇȽº   | ÝÂB10ñé  | 
+ ÄÄÇ»ÅÍÇÁ·Î±×·¡¸Ó | ìÑZ01ù»  | 
 (3 rows)
 
-QUERY: select * from ͪߩѦ¿ë¾î where ÝÂ×¾ÄÚµå = 'ìÑZ01ù»';
-¿ë¾î            |ÝÂ×¾ÄÚµå|ºñ°í1a¶ó±¸
-----------------+--------+----------
-ÄÄÇ»ÅÍÇÁ·Î±×·¡¸Ó|ìÑZ01ù» |          
+select * from ͪߩѦ¿ë¾î where ÝÂ×¾ÄÚµå = 'ìÑZ01ù»';
+       ¿ë¾î       | ÝÂ×¾ÄÚµå | ºñ°í1a¶ó±¸ 
+------------------+----------+------------
+ ÄÄÇ»ÅÍÇÁ·Î±×·¡¸Ó | ìÑZ01ù»  | 
 (1 row)
 
-QUERY: select * from ͪߩѦ¿ë¾î where ÝÂ×¾ÄÚµå ~* 'ìÑz01ù»';
-¿ë¾î            |ÝÂ×¾ÄÚµå|ºñ°í1a¶ó±¸
-----------------+--------+----------
-ÄÄÇ»ÅÍÇÁ·Î±×·¡¸Ó|ìÑZ01ù» |          
+select * from ͪߩѦ¿ë¾î where ÝÂ×¾ÄÚµå ~* 'ìÑz01ù»';
+       ¿ë¾î       | ÝÂ×¾ÄÚµå | ºñ°í1a¶ó±¸ 
+------------------+----------+------------
+ ÄÄÇ»ÅÍÇÁ·Î±×·¡¸Ó | ìÑZ01ù»  | 
 (1 row)
 
-QUERY: select * from ͪߩѦ¿ë¾î where ÝÂ×¾ÄÚµå like '_Z01_';
-¿ë¾î            |ÝÂ×¾ÄÚµå|ºñ°í1a¶ó±¸
-----------------+--------+----------
-ÄÄÇ»ÅÍÇÁ·Î±×·¡¸Ó|ìÑZ01ù» |          
+select * from ͪߩѦ¿ë¾î where ÝÂ×¾ÄÚµå like '_Z01_';
+       ¿ë¾î       | ÝÂ×¾ÄÚµå | ºñ°í1a¶ó±¸ 
+------------------+----------+------------
+ ÄÄÇ»ÅÍÇÁ·Î±×·¡¸Ó | ìÑZ01ù»  | 
 (1 row)
 
-QUERY: select * from ͪߩѦ¿ë¾î where ÝÂ×¾ÄÚµå like '_Z%';
-¿ë¾î            |ÝÂ×¾ÄÚµå|ºñ°í1a¶ó±¸
-----------------+--------+----------
-ÄÄÇ»ÅÍÇÁ·Î±×·¡¸Ó|ìÑZ01ù» |          
+select * from ͪߩѦ¿ë¾î where ÝÂ×¾ÄÚµå like '_Z%';
+       ¿ë¾î       | ÝÂ×¾ÄÚµå | ºñ°í1a¶ó±¸ 
+------------------+----------+------------
+ ÄÄÇ»ÅÍÇÁ·Î±×·¡¸Ó | ìÑZ01ù»  | 
 (1 row)
 
-QUERY: select * from ͪߩѦ¿ë¾î where ¿ë¾î ~ 'ÄÄÇ»ÅÍ[µð±×]';
-¿ë¾î            |ÝÂ×¾ÄÚµå|ºñ°í1a¶ó±¸
-----------------+--------+----------
-ÄÄÇ»Å͵ð½ºÇ÷¹ÀÌ|ѦA01ß¾ |          
-ÄÄÇ»Åͱ׷¡ÇȽº  |ÝÂB10ñé |          
+select * from ͪߩѦ¿ë¾î where ¿ë¾î ~ 'ÄÄÇ»ÅÍ[µð±×]';
+       ¿ë¾î       | ÝÂ×¾ÄÚµå | ºñ°í1a¶ó±¸ 
+------------------+----------+------------
+ ÄÄÇ»Å͵ð½ºÇ÷¹ÀÌ | ѦA01ß¾  | 
+ ÄÄÇ»Åͱ׷¡ÇȽº   | ÝÂB10ñé  | 
 (2 rows)
 
-QUERY: select * from ͪߩѦ¿ë¾î where ¿ë¾î ~* 'ÄÄÇ»ÅÍ[µð±×]';
-¿ë¾î            |ÝÂ×¾ÄÚµå|ºñ°í1a¶ó±¸
-----------------+--------+----------
-ÄÄÇ»Å͵ð½ºÇ÷¹ÀÌ|ѦA01ß¾ |          
-ÄÄÇ»Åͱ׷¡ÇȽº  |ÝÂB10ñé |          
+select * from ͪߩѦ¿ë¾î where ¿ë¾î ~* 'ÄÄÇ»ÅÍ[µð±×]';
+       ¿ë¾î       | ÝÂ×¾ÄÚµå | ºñ°í1a¶ó±¸ 
+------------------+----------+------------
+ ÄÄÇ»Å͵ð½ºÇ÷¹ÀÌ | ѦA01ß¾  | 
+ ÄÄÇ»Åͱ׷¡ÇȽº   | ÝÂB10ñé  | 
 (2 rows)
 
-QUERY: select *,character_length(¿ë¾î) from ͪߩѦ¿ë¾î;
-¿ë¾î            |ÝÂ×¾ÄÚµå|ºñ°í1a¶ó±¸|length
-----------------+--------+----------+------
-ÄÄÇ»Å͵ð½ºÇ÷¹ÀÌ|ѦA01ß¾ |          |     8
-ÄÄÇ»Åͱ׷¡ÇȽº  |ÝÂB10ñé |          |     7
-ÄÄÇ»ÅÍÇÁ·Î±×·¡¸Ó|ìÑZ01ù» |          |     8
+select *,character_length(¿ë¾î) from ͪߩѦ¿ë¾î;
+       ¿ë¾î       | ÝÂ×¾ÄÚµå | ºñ°í1a¶ó±¸ | length 
+------------------+----------+------------+--------
+ ÄÄÇ»Å͵ð½ºÇ÷¹ÀÌ | ѦA01ß¾  |            |      8
+ ÄÄÇ»Åͱ׷¡ÇȽº   | ÝÂB10ñé  |            |      7
+ ÄÄÇ»ÅÍÇÁ·Î±×·¡¸Ó | ìÑZ01ù»  |            |      8
 (3 rows)
 
-QUERY: select *,octet_length(¿ë¾î) from ͪߩѦ¿ë¾î;
-¿ë¾î            |ÝÂ×¾ÄÚµå|ºñ°í1a¶ó±¸|octet_length
-----------------+--------+----------+------------
-ÄÄÇ»Å͵ð½ºÇ÷¹ÀÌ|ѦA01ß¾ |          |          16
-ÄÄÇ»Åͱ׷¡ÇȽº  |ÝÂB10ñé |          |          14
-ÄÄÇ»ÅÍÇÁ·Î±×·¡¸Ó|ìÑZ01ù» |          |          16
+select *,octet_length(¿ë¾î) from ͪߩѦ¿ë¾î;
+       ¿ë¾î       | ÝÂ×¾ÄÚµå | ºñ°í1a¶ó±¸ | octet_length 
+------------------+----------+------------+--------------
+ ÄÄÇ»Å͵ð½ºÇ÷¹ÀÌ | ѦA01ß¾  |            |           16
+ ÄÄÇ»Åͱ׷¡ÇȽº   | ÝÂB10ñé  |            |           14
+ ÄÄÇ»ÅÍÇÁ·Î±×·¡¸Ó | ìÑZ01ù»  |            |           16
 (3 rows)
 
-QUERY: select *,position('µð' in ¿ë¾î) from ͪߩѦ¿ë¾î;
-¿ë¾î            |ÝÂ×¾ÄÚµå|ºñ°í1a¶ó±¸|strpos
-----------------+--------+----------+------
-ÄÄÇ»Å͵ð½ºÇ÷¹ÀÌ|ѦA01ß¾ |          |     4
-ÄÄÇ»Åͱ׷¡ÇȽº  |ÝÂB10ñé |          |     0
-ÄÄÇ»ÅÍÇÁ·Î±×·¡¸Ó|ìÑZ01ù» |          |     0
+select *,position('µð' in ¿ë¾î) from ͪߩѦ¿ë¾î;
+       ¿ë¾î       | ÝÂ×¾ÄÚµå | ºñ°í1a¶ó±¸ | strpos 
+------------------+----------+------------+--------
+ ÄÄÇ»Å͵ð½ºÇ÷¹ÀÌ | ѦA01ß¾  |            |      4
+ ÄÄÇ»Åͱ׷¡ÇȽº   | ÝÂB10ñé  |            |      0
+ ÄÄÇ»ÅÍÇÁ·Î±×·¡¸Ó | ìÑZ01ù»  |            |      0
 (3 rows)
 
-QUERY: select *,substring(¿ë¾î from 3 for 4) from ͪߩѦ¿ë¾î;
-¿ë¾î            |ÝÂ×¾ÄÚµå|ºñ°í1a¶ó±¸|substr  
-----------------+--------+----------+--------
-ÄÄÇ»Å͵ð½ºÇ÷¹ÀÌ|ѦA01ß¾ |          |Å͵ð½ºÇÃ
-ÄÄÇ»Åͱ׷¡ÇȽº  |ÝÂB10ñé |          |Åͱ׷¡ÇÈ
-ÄÄÇ»ÅÍÇÁ·Î±×·¡¸Ó|ìÑZ01ù» |          |ÅÍÇÁ·Î±×
+select *,substring(¿ë¾î from 3 for 4) from ͪߩѦ¿ë¾î;
+       ¿ë¾î       | ÝÂ×¾ÄÚµå | ºñ°í1a¶ó±¸ |  substr  
+------------------+----------+------------+----------
+ ÄÄÇ»Å͵ð½ºÇ÷¹ÀÌ | ѦA01ß¾  |            | Å͵ð½ºÇÃ
+ ÄÄÇ»Åͱ׷¡ÇȽº   | ÝÂB10ñé  |            | Åͱ׷¡ÇÈ
+ ÄÄÇ»ÅÍÇÁ·Î±×·¡¸Ó | ìÑZ01ù»  |            | ÅÍÇÁ·Î±×
 (3 rows)
 

diff --git a/src/test/regress/expected/euc_tw.out b/src/test/regress/expected/euc_tw.out
index a7d2b94..c35ee95 100644 (file)
--- a/src/test/regress/expected/euc_tw.out
+++ b/src/test/regress/expected/euc_tw.out
@@ -1,85 +1,85 @@
-QUERY: drop table ìÞÙ¸æñÕè;
+drop table ìÞÙ¸æñÕè;
 ERROR:  Relation 'ìÞÙ¸æñÕè' does not exist
-QUERY: create table ìÞÙ¸æñÕè (ÈçäÆɱ text, ÄüƳÍñó¤ varchar, ÇâÉß varchar(16));
-QUERY: create index ìÞÙ¸æñÕèindex1 on ìÞÙ¸æñÕè using btree (ÈçäÆɱ);
-QUERY: create index ìÞÙ¸æñÕèindex2 on ìÞÙ¸æñÕè using hash (ÄüƳÍñó¤);
-QUERY: insert into ìÞÙ¸æñÕè values ('çÙæªäÆ', 'ç®ç®ÒïÊÀ', 'Æ¡A01Äî');
-QUERY: insert into ìÞÙ¸æñÕè values ('êûÝßäÆ', 'ØÂäãÈ´ÓîÄüƳ', 'ÄãB10Äã');
-QUERY: insert into ìÞÙ¸æñÕè values ('ó§ã£äÆ', 'Ó¡ÌÀϴǹȴÓîÄüƳ', 'ØíZ01Ħ');
-QUERY: vacuum ìÞÙ¸æñÕè;
-QUERY: select * from ìÞÙ¸æñÕè;
-ÈçäÆɱ|ÄüƳÍñó¤        |ÇâÉß   
-------+----------------+-------
-çÙæªäÆ|ç®ç®ÒïÊÀ        |Æ¡A01Äî
-êûÝßäÆ|ØÂäãÈ´ÓîÄüƳ    |ÄãB10Äã
-ó§ã£äÆ|Ó¡ÌÀϴǹȴÓîÄüƳ|ØíZ01Ħ
+create table ìÞÙ¸æñÕè (ÈçäÆɱ text, ÄüƳÍñó¤ varchar, ÇâÉß varchar(16));
+create index ìÞÙ¸æñÕèindex1 on ìÞÙ¸æñÕè using btree (ÈçäÆɱ);
+create index ìÞÙ¸æñÕèindex2 on ìÞÙ¸æñÕè using hash (ÄüƳÍñó¤);
+insert into ìÞÙ¸æñÕè values ('çÙæªäÆ', 'ç®ç®ÒïÊÀ', 'Æ¡A01Äî');
+insert into ìÞÙ¸æñÕè values ('êûÝßäÆ', 'ØÂäãÈ´ÓîÄüƳ', 'ÄãB10Äã');
+insert into ìÞÙ¸æñÕè values ('ó§ã£äÆ', 'Ó¡ÌÀϴǹȴÓîÄüƳ', 'ØíZ01Ħ');
+vacuum ìÞÙ¸æñÕè;
+select * from ìÞÙ¸æñÕè;
+ ÈçäÆɱ |     ÄüƳÍñó¤     |  ÇâÉß   
+--------+------------------+---------
+ çÙæªäÆ | ç®ç®ÒïÊÀ         | Æ¡A01Äî
+ êûÝßäÆ | ØÂäãÈ´ÓîÄüƳ     | ÄãB10Äã
+ ó§ã£äÆ | Ó¡ÌÀϴǹȴÓîÄüƳ | ØíZ01Ħ
 (3 rows)
 
-QUERY: select * from ìÞÙ¸æñÕè where ÇâÉß = 'ØíZ01Ħ';
-ÈçäÆɱ|ÄüƳÍñó¤        |ÇâÉß   
-------+----------------+-------
-ó§ã£äÆ|Ó¡ÌÀϴǹȴÓîÄüƳ|ØíZ01Ħ
+select * from ìÞÙ¸æñÕè where ÇâÉß = 'ØíZ01Ħ';
+ ÈçäÆɱ |     ÄüƳÍñó¤     |  ÇâÉß   
+--------+------------------+---------
+ ó§ã£äÆ | Ó¡ÌÀϴǹȴÓîÄüƳ | ØíZ01Ħ
 (1 row)
 
-QUERY: select * from ìÞÙ¸æñÕè where ÇâÉß ~* 'Øíz01Ħ';
-ÈçäÆɱ|ÄüƳÍñó¤        |ÇâÉß   
-------+----------------+-------
-ó§ã£äÆ|Ó¡ÌÀϴǹȴÓîÄüƳ|ØíZ01Ħ
+select * from ìÞÙ¸æñÕè where ÇâÉß ~* 'Øíz01Ħ';
+ ÈçäÆɱ |     ÄüƳÍñó¤     |  ÇâÉß   
+--------+------------------+---------
+ ó§ã£äÆ | Ó¡ÌÀϴǹȴÓîÄüƳ | ØíZ01Ħ
 (1 row)
 
-QUERY: select * from ìÞÙ¸æñÕè where ÇâÉß like '_Z01_';
-ÈçäÆɱ|ÄüƳÍñó¤        |ÇâÉß   
-------+----------------+-------
-ó§ã£äÆ|Ó¡ÌÀϴǹȴÓîÄüƳ|ØíZ01Ħ
+select * from ìÞÙ¸æñÕè where ÇâÉß like '_Z01_';
+ ÈçäÆɱ |     ÄüƳÍñó¤     |  ÇâÉß   
+--------+------------------+---------
+ ó§ã£äÆ | Ó¡ÌÀϴǹȴÓîÄüƳ | ØíZ01Ħ
 (1 row)
 
-QUERY: select * from ìÞÙ¸æñÕè where ÇâÉß like '_Z%';
-ÈçäÆɱ|ÄüƳÍñó¤        |ÇâÉß   
-------+----------------+-------
-ó§ã£äÆ|Ó¡ÌÀϴǹȴÓîÄüƳ|ØíZ01Ħ
+select * from ìÞÙ¸æñÕè where ÇâÉß like '_Z%';
+ ÈçäÆɱ |     ÄüƳÍñó¤     |  ÇâÉß   
+--------+------------------+---------
+ ó§ã£äÆ | Ó¡ÌÀϴǹȴÓîÄüƳ | ØíZ01Ħ
 (1 row)
 
-QUERY: select * from ìÞÙ¸æñÕè where ÄüƳÍñó¤ ~ 'ç®ç®Òï[ÙìØ´ÊÀ]';
-ÈçäÆɱ|ÄüƳÍñó¤|ÇâÉß   
-------+--------+-------
-çÙæªäÆ|ç®ç®ÒïÊÀ|Æ¡A01Äî
+select * from ìÞÙ¸æñÕè where ÄüƳÍñó¤ ~ 'ç®ç®Òï[ÙìØ´ÊÀ]';
+ ÈçäÆɱ | ÄüƳÍñó¤ |  ÇâÉß   
+--------+----------+---------
+ çÙæªäÆ | ç®ç®ÒïÊÀ | Æ¡A01Äî
 (1 row)
 
-QUERY: select * from ìÞÙ¸æñÕè where ÄüƳÍñó¤ ~* 'ç®ç®Òï[ÙìØ´ÊÀ]';
-ÈçäÆɱ|ÄüƳÍñó¤|ÇâÉß   
-------+--------+-------
-çÙæªäÆ|ç®ç®ÒïÊÀ|Æ¡A01Äî
+select * from ìÞÙ¸æñÕè where ÄüƳÍñó¤ ~* 'ç®ç®Òï[ÙìØ´ÊÀ]';
+ ÈçäÆɱ | ÄüƳÍñó¤ |  ÇâÉß   
+--------+----------+---------
+ çÙæªäÆ | ç®ç®ÒïÊÀ | Æ¡A01Äî
 (1 row)
 
-QUERY: select *, character_length(ÈçäÆɱ) from ìÞÙ¸æñÕè;
-ÈçäÆɱ|ÄüƳÍñó¤        |ÇâÉß   |length
-------+----------------+-------+------
-çÙæªäÆ|ç®ç®ÒïÊÀ        |Æ¡A01Äî|     3
-êûÝßäÆ|ØÂäãÈ´ÓîÄüƳ    |ÄãB10Äã|     3
-ó§ã£äÆ|Ó¡ÌÀϴǹȴÓîÄüƳ|ØíZ01Ħ|     3
+select *, character_length(ÈçäÆɱ) from ìÞÙ¸æñÕè;
+ ÈçäÆɱ |     ÄüƳÍñó¤     |  ÇâÉß   | length 
+--------+------------------+---------+--------
+ çÙæªäÆ | ç®ç®ÒïÊÀ         | Æ¡A01Äî |      3
+ êûÝßäÆ | ØÂäãÈ´ÓîÄüƳ     | ÄãB10Äã |      3
+ ó§ã£äÆ | Ó¡ÌÀϴǹȴÓîÄüƳ | ØíZ01Ħ |      3
 (3 rows)
 
-QUERY: select *, octet_length(ÈçäÆɱ) from ìÞÙ¸æñÕè;
-ÈçäÆɱ|ÄüƳÍñó¤        |ÇâÉß   |octet_length
-------+----------------+-------+------------
-çÙæªäÆ|ç®ç®ÒïÊÀ        |Æ¡A01Äî|           6
-êûÝßäÆ|ØÂäãÈ´ÓîÄüƳ    |ÄãB10Äã|           6
-ó§ã£äÆ|Ó¡ÌÀϴǹȴÓîÄüƳ|ØíZ01Ħ|           6
+select *, octet_length(ÈçäÆɱ) from ìÞÙ¸æñÕè;
+ ÈçäÆɱ |     ÄüƳÍñó¤     |  ÇâÉß   | octet_length 
+--------+------------------+---------+--------------
+ çÙæªäÆ | ç®ç®ÒïÊÀ         | Æ¡A01Äî |            6
+ êûÝßäÆ | ØÂäãÈ´ÓîÄüƳ     | ÄãB10Äã |            6
+ ó§ã£äÆ | Ó¡ÌÀϴǹȴÓîÄüƳ | ØíZ01Ħ |            6
 (3 rows)
 
-QUERY: select *, position('È´Óî' in ÄüƳÍñó¤) from ìÞÙ¸æñÕè;
-ÈçäÆɱ|ÄüƳÍñó¤        |ÇâÉß   |strpos
-------+----------------+-------+------
-çÙæªäÆ|ç®ç®ÒïÊÀ        |Æ¡A01Äî|     0
-êûÝßäÆ|ØÂäãÈ´ÓîÄüƳ    |ÄãB10Äã|     3
-ó§ã£äÆ|Ó¡ÌÀϴǹȴÓîÄüƳ|ØíZ01Ħ|     5
+select *, position('È´Óî' in ÄüƳÍñó¤) from ìÞÙ¸æñÕè;
+ ÈçäÆɱ |     ÄüƳÍñó¤     |  ÇâÉß   | strpos 
+--------+------------------+---------+--------
+ çÙæªäÆ | ç®ç®ÒïÊÀ         | Æ¡A01Äî |      0
+ êûÝßäÆ | ØÂäãÈ´ÓîÄüƳ     | ÄãB10Äã |      3
+ ó§ã£äÆ | Ó¡ÌÀϴǹȴÓîÄüƳ | ØíZ01Ħ |      5
 (3 rows)
 
-QUERY: select *, substring(ÄüƳÍñó¤ from 3 for 6 ) from ìÞÙ¸æñÕè;
-ÈçäÆɱ|ÄüƳÍñó¤        |ÇâÉß   |substr      
-------+----------------+-------+------------
-çÙæªäÆ|ç®ç®ÒïÊÀ        |Æ¡A01Äî|ÒïÊÀ        
-êûÝßäÆ|ØÂäãÈ´ÓîÄüƳ    |ÄãB10Äã|È´ÓîÄüƳ    
-ó§ã£äÆ|Ó¡ÌÀϴǹȴÓîÄüƳ|ØíZ01Ħ|ϴǹȴÓîÄüƳ
+select *, substring(ÄüƳÍñó¤ from 3 for 6 ) from ìÞÙ¸æñÕè;
+ ÈçäÆɱ |     ÄüƳÍñó¤     |  ÇâÉß   |    substr    
+--------+------------------+---------+--------------
+ çÙæªäÆ | ç®ç®ÒïÊÀ         | Æ¡A01Äî | ÒïÊÀ
+ êûÝßäÆ | ØÂäãÈ´ÓîÄüƳ     | ÄãB10Äã | È´ÓîÄüƳ
+ ó§ã£äÆ | Ó¡ÌÀϴǹȴÓîÄüƳ | ØíZ01Ħ | ϴǹȴÓîÄüƳ
 (3 rows)