From beba98d14aa4159fb795139a6fe7d329979dadda Mon Sep 17 00:00:00 2001
From: Tatsuo Ishii <ishii@postgresql.org>
Date: Tue, 18 Jan 2000 03:00:37 +0000
Subject: [PATCH] Adopt for new psql

---
 src/test/mb/expected/euc_jp.out | 128 +++++++++++++++----------------
 src/test/mb/expected/sjis.out   | 130 ++++++++++++++++----------------
 2 files changed, 129 insertions(+), 129 deletions(-)

diff --git a/src/test/mb/expected/euc_jp.out b/src/test/mb/expected/euc_jp.out
index b0bdfbac9a..6f38e998a8 100644
--- a/src/test/mb/expected/euc_jp.out
+++ b/src/test/mb/expected/euc_jp.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��   |          |    12
-����ԥ塼������ե��å���|ʬB10��   |          |    13
-����ԥ塼���ץ�����ޡ�  |��Z01��   |          |    12
+select *,character_length(�Ѹ�) from �׻����Ѹ�;
+            �Ѹ�            | ʬ�ॳ���� | ����1a���� | length 
+----------------------------+------------+------------+--------
+ ����ԥ塼���ǥ����ץ쥤   | ��A01��    |            |     12
+ ����ԥ塼������ե��å��� | ʬB10��    |            |     13
+ ����ԥ塼���ץ�����ޡ�   | ��Z01��    |            |     12
 (3 rows)
 
-QUERY: select *,octet_length(�Ѹ�) from �׻����Ѹ�;
-�Ѹ�                      |ʬ�ॳ����|����1a����|octet_length
---------------------------+----------+----------+------------
-����ԥ塼���ǥ����ץ쥤  |��A01��   |          |          24
-����ԥ塼������ե��å���|ʬB10��   |          |          26
-����ԥ塼���ץ�����ޡ�  |��Z01��   |          |          24
+select *,octet_length(�Ѹ�) from �׻����Ѹ�;
+            �Ѹ�            | ʬ�ॳ���� | ����1a���� | octet_length 
+----------------------------+------------+------------+--------------
+ ����ԥ塼���ǥ����ץ쥤   | ��A01��    |            |           24
+ ����ԥ塼������ե��å��� | ʬB10��    |            |           26
+ ����ԥ塼���ץ�����ޡ�   | ��Z01��    |            |           24
 (3 rows)
 
-QUERY: select *,position('��' in �Ѹ�) from �׻����Ѹ�;
-�Ѹ�                      |ʬ�ॳ����|����1a����|strpos
---------------------------+----------+----------+------
-����ԥ塼���ǥ����ץ쥤  |��A01��   |          |     7
-����ԥ塼������ե��å���|ʬB10��   |          |     0
-����ԥ塼���ץ�����ޡ�  |��Z01��   |          |     0
+select *,position('��' in �Ѹ�) from �׻����Ѹ�;
+            �Ѹ�            | ʬ�ॳ���� | ����1a���� | strpos 
+----------------------------+------------+------------+--------
+ ����ԥ塼���ǥ����ץ쥤   | ��A01��    |            |      7
+ ����ԥ塼������ե��å��� | ʬB10��    |            |      0
+ ����ԥ塼���ץ�����ޡ�   | ��Z01��    |            |      0
 (3 rows)
 
-QUERY: select *,substring(�Ѹ� from 10 for 4) from �׻����Ѹ�;
-�Ѹ�                      |ʬ�ॳ����|����1a����|substr  
---------------------------+----------+----------+--------
-����ԥ塼���ǥ����ץ쥤  |��A01��   |          |�ץ쥤  
-����ԥ塼������ե��å���|ʬB10��   |          |���å���
-����ԥ塼���ץ�����ޡ�  |��Z01��   |          |��ޡ�  
+select *,substring(�Ѹ� from 10 for 4) from �׻����Ѹ�;
+            �Ѹ�            | ʬ�ॳ���� | ����1a���� |  substr  
+----------------------------+------------+------------+----------
+ ����ԥ塼���ǥ����ץ쥤   | ��A01��    |            | �ץ쥤
+ ����ԥ塼������ե��å��� | ʬB10��    |            | ���å���
+ ����ԥ塼���ץ�����ޡ�   | ��Z01��    |            | ��ޡ�
 (3 rows)
 
diff --git a/src/test/mb/expected/sjis.out b/src/test/mb/expected/sjis.out
index 512678764d..9dadee10e7 100644
--- a/src/test/mb/expected/sjis.out
+++ b/src/test/mb/expected/sjis.out
@@ -1,90 +1,90 @@
-QUERY: drop table �v�Z�@�p��;
-QUERY: create table �v�Z�@�p�� (�p�� text, ���ރR�[�h varchar, ���l1A���� char(16));
-QUERY: create index �v�Z�@�p��index1 on �v�Z�@�p�� using btree (�p��);
-QUERY: create index �v�Z�@�p��index2 on �v�Z�@�p�� using hash (���ރR�[�h);
-QUERY: insert into �v�Z�@�p�� values('�R���s���[�^�f�B�X�v���C','�@A01��');
-QUERY: insert into �v�Z�@�p�� values('�R���s���[�^�O���t�B�b�N�X','��B10��');
-QUERY: insert into �v�Z�@�p�� values('�R���s���[�^�v���O���}�[','�lZ01��');
-QUERY: vacuum �v�Z�@�p��;
-QUERY: select * from �v�Z�@�p��;
-�p��                      |���ރR�[�h|���l1a����
---------------------------+----------+----------
-�R���s���[�^�f�B�X�v���C  |�@A01��   |          
-�R���s���[�^�O���t�B�b�N�X|��B10��   |          
-�R���s���[�^�v���O���}�[  |�lZ01��   |          
+drop table �v�Z�@�p��;
+create table �v�Z�@�p�� (�p�� text, ���ރR�[�h varchar, ���l1A���� char(16));
+create index �v�Z�@�p��index1 on �v�Z�@�p�� using btree (�p��);
+create index �v�Z�@�p��index2 on �v�Z�@�p�� using hash (���ރR�[�h);
+insert into �v�Z�@�p�� values('�R���s���[�^�f�B�X�v���C','�@A01��');
+insert into �v�Z�@�p�� values('�R���s���[�^�O���t�B�b�N�X','��B10��');
+insert into �v�Z�@�p�� values('�R���s���[�^�v���O���}�[','�lZ01��');
+vacuum �v�Z�@�p��;
+select * from �v�Z�@�p��;
+            �p��            | ���ރR�[�h | ���l1a���� 
+----------------------------+------------+------------
+ �R���s���[�^�f�B�X�v���C   | �@A01��    | 
+ �R���s���[�^�O���t�B�b�N�X | ��B10��    | 
+ �R���s���[�^�v���O���}�[   | �lZ01��    | 
 (3 rows)
 
-QUERY: select * from �v�Z�@�p�� where ���ރR�[�h = '�lZ01��';
-�p��                    |���ރR�[�h|���l1a����
-------------------------+----------+----------
-�R���s���[�^�v���O���}�[|�lZ01��   |          
+select * from �v�Z�@�p�� where ���ރR�[�h = '�lZ01��';
+           �p��           | ���ރR�[�h | ���l1a���� 
+--------------------------+------------+------------
+ �R���s���[�^�v���O���}�[ | �lZ01��    | 
 (1 row)
 
-QUERY: select * from �v�Z�@�p�� where ���ރR�[�h ~* '�lz01��';
-�p��                    |���ރR�[�h|���l1a����
-------------------------+----------+----------
-�R���s���[�^�v���O���}�[|�lZ01��   |          
+select * from �v�Z�@�p�� where ���ރR�[�h ~* '�lz01��';
+           �p��           | ���ރR�[�h | ���l1a���� 
+--------------------------+------------+------------
+ �R���s���[�^�v���O���}�[ | �lZ01��    | 
 (1 row)
 
-QUERY: select * from �v�Z�@�p�� where ���ރR�[�h like '_Z01_';
-�p��                    |���ރR�[�h|���l1a����
-------------------------+----------+----------
-�R���s���[�^�v���O���}�[|�lZ01��   |          
+select * from �v�Z�@�p�� where ���ރR�[�h like '_Z01_';
+           �p��           | ���ރR�[�h | ���l1a���� 
+--------------------------+------------+------------
+ �R���s���[�^�v���O���}�[ | �lZ01��    | 
 (1 row)
 
-QUERY: select * from �v�Z�@�p�� where ���ރR�[�h like '_Z%';
-�p��                    |���ރR�[�h|���l1a����
-------------------------+----------+----------
-�R���s���[�^�v���O���}�[|�lZ01��   |          
+select * from �v�Z�@�p�� where ���ރR�[�h like '_Z%';
+           �p��           | ���ރR�[�h | ���l1a���� 
+--------------------------+------------+------------
+ �R���s���[�^�v���O���}�[ | �lZ01��    | 
 (1 row)
 
-QUERY: select * from �v�Z�@�p�� where �p�� ~ '�R���s���[�^[�f�O]';
-�p��                      |���ރR�[�h|���l1a����
---------------------------+----------+----------
-�R���s���[�^�f�B�X�v���C  |�@A01��   |          
-�R���s���[�^�O���t�B�b�N�X|��B10��   |          
+select * from �v�Z�@�p�� where �p�� ~ '�R���s���[�^[�f�O]';
+            �p��            | ���ރR�[�h | ���l1a���� 
+----------------------------+------------+------------
+ �R���s���[�^�f�B�X�v���C   | �@A01��    | 
+ �R���s���[�^�O���t�B�b�N�X | ��B10��    | 
 (2 rows)
 
-QUERY: select * from �v�Z�@�p�� where �p�� ~* '�R���s���[�^[�f�O]';
-�p��                      |���ރR�[�h|���l1a����
---------------------------+----------+----------
-�R���s���[�^�f�B�X�v���C  |�@A01��   |          
-�R���s���[�^�O���t�B�b�N�X|��B10��   |          
+select * from �v�Z�@�p�� where �p�� ~* '�R���s���[�^[�f�O]';
+            �p��            | ���ރR�[�h | ���l1a���� 
+----------------------------+------------+------------
+ �R���s���[�^�f�B�X�v���C   | �@A01��    | 
+ �R���s���[�^�O���t�B�b�N�X | ��B10��    | 
 (2 rows)
 
-QUERY: select *,character_length(�p��) from �v�Z�@�p��;
-�p��                      |���ރR�[�h|���l1a����|length
---------------------------+----------+----------+------
-�R���s���[�^�f�B�X�v���C  |�@A01��   |          |    12
-�R���s���[�^�O���t�B�b�N�X|��B10��   |          |    13
-�R���s���[�^�v���O���}�[  |�lZ01��   |          |    12
+select *,character_length(�p��) from �v�Z�@�p��;
+            �p��            | ���ރR�[�h | ���l1a���� | length 
+----------------------------+------------+------------+--------
+ �R���s���[�^�f�B�X�v���C   | �@A01��    |            |     12
+ �R���s���[�^�O���t�B�b�N�X | ��B10��    |            |     13
+ �R���s���[�^�v���O���}�[   | �lZ01��    |            |     12
 (3 rows)
 
-QUERY: select *,octet_length(�p��) from �v�Z�@�p��;
-�p��                      |���ރR�[�h|���l1a����|octet_length
---------------------------+----------+----------+------------
-�R���s���[�^�f�B�X�v���C  |�@A01��   |          |          24
-�R���s���[�^�O���t�B�b�N�X|��B10��   |          |          26
-�R���s���[�^�v���O���}�[  |�lZ01��   |          |          24
+select *,octet_length(�p��) from �v�Z�@�p��;
+            �p��            | ���ރR�[�h | ���l1a���� | octet_length 
+----------------------------+------------+------------+--------------
+ �R���s���[�^�f�B�X�v���C   | �@A01��    |            |           24
+ �R���s���[�^�O���t�B�b�N�X | ��B10��    |            |           26
+ �R���s���[�^�v���O���}�[   | �lZ01��    |            |           24
 (3 rows)
 
-QUERY: select *,position('�f' in �p��) from �v�Z�@�p��;
-�p��                      |���ރR�[�h|���l1a����|strpos
---------------------------+----------+----------+------
-�R���s���[�^�f�B�X�v���C  |�@A01��   |          |     7
-�R���s���[�^�O���t�B�b�N�X|��B10��   |          |     0
-�R���s���[�^�v���O���}�[  |�lZ01��   |          |     0
+select *,position('�f' in �p��) from �v�Z�@�p��;
+            �p��            | ���ރR�[�h | ���l1a���� | strpos 
+----------------------------+------------+------------+--------
+ �R���s���[�^�f�B�X�v���C   | �@A01��    |            |      7
+ �R���s���[�^�O���t�B�b�N�X | ��B10��    |            |      0
+ �R���s���[�^�v���O���}�[   | �lZ01��    |            |      0
 (3 rows)
 
-QUERY: select *,substring(�p�� from 10 for 4) from �v�Z�@�p��;
-�p��                      |���ރR�[�h|���l1a����|substr  
---------------------------+----------+----------+--------
-�R���s���[�^�f�B�X�v���C  |�@A01��   |          |�v���C  
-�R���s���[�^�O���t�B�b�N�X|��B10��   |          |�B�b�N�X
-�R���s���[�^�v���O���}�[  |�lZ01��   |          |���}�[  
+select *,substring(�p�� from 10 for 4) from �v�Z�@�p��;
+            �p��            | ���ރR�[�h | ���l1a���� |  substr  
+----------------------------+------------+------------+----------
+ �R���s���[�^�f�B�X�v���C   | �@A01��    |            | �v���C
+ �R���s���[�^�O���t�B�b�N�X | ��B10��    |            | �B�b�N�X
+ �R���s���[�^�v���O���}�[   | �lZ01��    |            | ���}�[
 (3 rows)
 
-QUERY: copy �v�Z�@�p�� to stdout;
+copy �v�Z�@�p�� to stdout;
 �R���s���[�^�f�B�X�v���C	�@A01��	\N
 �R���s���[�^�O���t�B�b�N�X	��B10��	\N
 �R���s���[�^�v���O���}�[	�lZ01��	\N