8 files changed, 57 insertions, 57 deletions
diff --git a/src/test/mb/expected/big5.out b/src/test/mb/expected/big5.out
index 110bf8c7a3c..97100cd0a2d 100644
--- a/src/test/mb/expected/big5.out
+++ b/src/test/mb/expected/big5.out
@@ -51,11 +51,11 @@ select * from 廠商資料 where 公司抬頭 ~* '達達科[寄記技]';
 (1 row)
 
 select *, character_length(行業別) from 廠商資料;
- 行業別 |     公司抬頭     |  地址   | char_length 
---------+------------------+---------+-------------
- 電腦業 | 達達科技         | 北A01仁 |           3
- 製造業 | 財源有限公司     | 中B10中 |           3
- 餐飲業 | 美味股份有限公司 | 高Z01九 |           3
+ 行業別 |     公司抬頭     |  地址   | character_length 
+--------+------------------+---------+------------------
+ 電腦業 | 達達科技         | 北A01仁 |                3
+ 製造業 | 財源有限公司     | 中B10中 |                3
+ 餐飲業 | 美味股份有限公司 | 高Z01九 |                3
 (3 rows)
 
 select *, octet_length(行業別) from 廠商資料;
diff --git a/src/test/mb/expected/euc_cn.out b/src/test/mb/expected/euc_cn.out
index 71068f8c55d..4d046fa87dc 100644
--- a/src/test/mb/expected/euc_cn.out
+++ b/src/test/mb/expected/euc_cn.out
@@ -54,11 +54,11 @@ select * from 數呾儂扲逄 where 扲逄 ~* '萇齟[珆芞]';
 (2 rows)
 
 select *,character_length(扲逄) from 數呾儂扲逄;
-    扲逄    | 煦濬瘍  | 掘蛁1a | char_length 
-------------+---------+--------+-------------
- 萇齟珆尨亅 | 儂A01奻 |        |           5
- 萇齟芞倛   | 煦B01笢 |        |           4
- 萇齟最唗埜 | �Z01狟 |        |           5
+    扲逄    | 煦濬瘍  | 掘蛁1a | character_length 
+------------+---------+--------+------------------
+ 萇齟珆尨亅 | 儂A01奻 |        |                5
+ 萇齟芞倛   | 煦B01笢 |        |                4
+ 萇齟最唗埜 | �Z01狟 |        |                5
 (3 rows)
 
 select *,octet_length(扲逄) from 數呾儂扲逄;
diff --git a/src/test/mb/expected/euc_jp.out b/src/test/mb/expected/euc_jp.out
index 0cdf8fede47..15f83e0231c 100644
--- a/src/test/mb/expected/euc_jp.out
+++ b/src/test/mb/expected/euc_jp.out
@@ -54,11 +54,11 @@ select * from 煌遙窗迕賄 where 迕賄 ~* '戊件疋亙□正[犯弘]';
 (2 rows)
 
 select *,character_length(迕賄) from 煌遙窗迕賄;
-            迕賄            | 坌挀戊□玉 | ɛ嗶1a分方 | char_length 
-----------------------------+------------+------------+-------------
- 戊件疋亙□正犯奴旦皿伊奶   | 窗A01曉    |            |          12
- 戊件疋亙□正弘仿白奴永弁旦 | 坌B10醱    |            |          13
- 戊件疋亙□正皿伕弘仿穴□   | 諦Z01票    |            |          12
+            迕賄            | 坌挀戊□玉 | ɛ嗶1a分方 | character_length 
+----------------------------+------------+------------+------------------
+ 戊件疋亙□正犯奴旦皿伊奶   | 窗A01曉    |            |               12
+ 戊件疋亙□正弘仿白奴永弁旦 | 坌B10醱    |            |               13
+ 戊件疋亙□正皿伕弘仿穴□   | 諦Z01票    |            |               12
 (3 rows)
 
 select *,octet_length(迕賄) from 煌遙窗迕賄;
diff --git a/src/test/mb/expected/euc_kr.out b/src/test/mb/expected/euc_kr.out
index 8b90c4d76ec..229ffd8f971 100644
--- a/src/test/mb/expected/euc_kr.out
+++ b/src/test/mb/expected/euc_kr.out
@@ -54,11 +54,11 @@ select * from 耵蓱悁辨橫 where 辨橫 ~* '闡タ攪[蛤斜]';
 (2 rows)
 
 select *,character_length(辨橫) from 耵蓱悁辨橫;
-       辨橫       | 暐袛囀萄 | 綠堅1a塭掘 | char_length 
-------------------+----------+------------+-------------
- 闡タ攪蛤蝶デ溯檜 | 悁A01葞  |            |           8
- 闡タ攪斜楚ヌ蝶   | 暐B10齌  |            |           7
- 闡タ攪ヅ煎斜楚該 | 嬣Z01欞  |            |           8
+       辨橫       | 暐袛囀萄 | 綠堅1a塭掘 | character_length 
+------------------+----------+------------+------------------
+ 闡タ攪蛤蝶デ溯檜 | 悁A01葞  |            |                8
+ 闡タ攪斜楚ヌ蝶   | 暐B10齌  |            |                7
+ 闡タ攪ヅ煎斜楚該 | 嬣Z01欞  |            |                8
 (3 rows)
 
 select *,octet_length(辨橫) from 耵蓱悁辨橫;
diff --git a/src/test/mb/expected/euc_tw.out b/src/test/mb/expected/euc_tw.out
index 3b0a0f75d6e..99eb4884e12 100644
--- a/src/test/mb/expected/euc_tw.out
+++ b/src/test/mb/expected/euc_tw.out
@@ -52,11 +52,11 @@ select * from 徻椓罶涷 where 襬⑼剉韝 ~* '蝞蝞秠[溈奡岍]';
 (1 row)
 
 select *, character_length(⺼鞄伀) from 徻椓罶涷;
- ⺼鞄伀 |     襬⑼剉韝     |  ユ彴   | char_length 
---------+------------------+---------+-------------
- 諔瑼鞄 | 蝞蝞秠岍         | ①A01癩 |           3
- 蕍楸鞄 | 娷鳲�迻襬⑼     | 斕B10斕 |           3
- 顜聜鞄 | 荂抸炴ソ�迻襬⑼ | 崼Z01藻 |           3
+ ⺼鞄伀 |     襬⑼剉韝     |  ユ彴   | character_length 
+--------+------------------+---------+------------------
+ 諔瑼鞄 | 蝞蝞秠岍         | ①A01癩 |                3
+ 蕍楸鞄 | 娷鳲�迻襬⑼     | 斕B10斕 |                3
+ 顜聜鞄 | 荂抸炴ソ�迻襬⑼ | 崼Z01藻 |                3
 (3 rows)
 
 select *, octet_length(⺼鞄伀) from 徻椓罶涷;
diff --git a/src/test/mb/expected/mule_internal.out b/src/test/mb/expected/mule_internal.out
index 983ece1cfdd..fa1f836febe 100644
--- a/src/test/mb/expected/mule_internal.out
+++ b/src/test/mb/expected/mule_internal.out
@@ -54,11 +54,11 @@ select * from 浲�遙𣸹�迕𡢄� where 𤦬�賄 ~* '𤨎�件𤨎�亙働�正[𤨎�弘]';
 (2 rows)
 
 select *,character_length(𤦬�賄) from 浲�遙𣸹�迕𡢄�;
-                 𤦬�賄                  | 熌�挀𤨎�□𤨎� | 鍮�嗶1a伃�方 | char_length 
------------------------------------------+-----------------+----------------+-------------
- 𤨎�件𤨎�亙働�正𤨎�奴𤨎�皿𤨎�奶    | 𣸹，01𠒣�       |                |          12
- 𤨎�件𤨎�亙働�正𤨎�仿𤨎�奴𤨎�弁𤨎� | 熌拾10𠜎�       |                |          13
- 𤨎�件𤨎�亙働�正𤨎�伕𤨎�仿𤨎�□    | 𠒒炃01兞�       |                |          12
+                 𤦬�賄                  | 熌�挀𤨎�□𤨎� | 鍮�嗶1a伃�方 | character_length 
+-----------------------------------------+-----------------+----------------+------------------
+ 𤨎�件𤨎�亙働�正𤨎�奴𤨎�皿𤨎�奶    | 𣸹，01𠒣�       |                |               12
+ 𤨎�件𤨎�亙働�正𤨎�仿𤨎�奴𤨎�弁𤨎� | 熌拾10𠜎�       |                |               13
+ 𤨎�件𤨎�亙働�正𤨎�伕𤨎�仿𤨎�□    | 𠒒炃01兞�       |                |               12
 (3 rows)
 
 select *,octet_length(𤦬�賄) from 浲�遙𣸹�迕𡢄�;
@@ -141,11 +141,11 @@ select * from 鐤�呾䮖�扲𤩑� where 竜�逄 ~* '㴝�齟[𤦻�芞]';
 (2 rows)
 
 select *,character_length(竜�逄) from 鐤�呾䮖�扲𤩑�;
-     竜�逄      | 㞾�濬鼈� | 𤍤�蛁1a | char_length 
------------------+-----------+----------+-------------
- 㴝�齟𤦻�尨韲� | 䮖鋛01齩� |          |           5
- 㴝�齟䮾�倛    | 㞾淓01𡣺� |          |           4
- 㴝�齟㭠�唗玞� | 齢汳01𤦻� |          |           5
+     竜�逄      | 㞾�濬鼈� | 𤍤�蛁1a | character_length 
+-----------------+-----------+----------+------------------
+ 㴝�齟𤦻�尨韲� | 䮖鋛01齩� |          |                5
+ 㴝�齟䮾�倛    | 㞾淓01𡣺� |          |                4
+ 㴝�齟㭠�唗玞� | 齢汳01𤦻� |          |                5
 (3 rows)
 
 select *,octet_length(竜�逄) from 鐤�呾䮖�扲𤩑�;
@@ -228,11 +228,11 @@ select * from 㑤�蓱暎�辨曎� where 𣊉�橫 ~* '𨬢�タ𥖏牪㯴�斜]';
 (2 rows)
 
 select *,character_length(𣊉�橫) from 㑤�蓱暎�辨曎�;
-          𣊉�橫          | 㣑�袛𨬢�萄 | 唍�堅1a𣂎�掘 | char_length 
---------------------------+--------------+----------------+-------------
- 𨬢�タ𥖏�蛤𩐿�デ𣊭�檜 | 暎再01𣞼�    |                |           8
- 𨬢�タ𥖏�斜𣊭�ヌ𩐿�    | 㣑鮫10欅�    |                |           7
- 𨬢�タ𥖏�ヅ𣊭�斜𣊭�該 | 𣟕奊01𣿀�    |                |           8
+          𣊉�橫          | 㣑�袛𨬢�萄 | 唍�堅1a𣂎�掘 | character_length 
+--------------------------+--------------+----------------+------------------
+ 𨬢�タ𥖏�蛤𩐿�デ𣊭�檜 | 暎再01𣞼�    |                |                8
+ 𨬢�タ𥖏�斜𣊭�ヌ𩐿�    | 㣑鮫10欅�    |                |                7
+ 𨬢�タ𥖏�ヅ𣊭�斜𣊭�該 | 𣟕奊01𣿀�    |                |                8
 (3 rows)
 
 select *,octet_length(𣊉�橫) from 㑤�蓱暎�辨曎�;
@@ -292,13 +292,13 @@ select * from test where t ~* 'espa�ol';
 (2 rows)
 
 select *,character_length(t) from test;
-                  t                   | char_length 
---------------------------------------+-------------
- ENGLISH                              |           7
- FRAN�AIS                            |           8
- ESPA�OL                             |           7
- �SLENSKA                            |           8
- ENGLISH FRAN�AIS ESPA�OL �SLENSKA |          33
+                  t                   | character_length 
+--------------------------------------+------------------
+ ENGLISH                              |                7
+ FRAN�AIS                            |                8
+ ESPA�OL                             |                7
+ �SLENSKA                            |                8
+ ENGLISH FRAN�AIS ESPA�OL �SLENSKA |               33
 (5 rows)
 
 select *,octet_length(t) from test;
diff --git a/src/test/mb/expected/sjis.out b/src/test/mb/expected/sjis.out
index 2a852086e13..db2bfd0d755 100644
--- a/src/test/mb/expected/sjis.out
+++ b/src/test/mb/expected/sjis.out
@@ -53,11 +53,11 @@ select * from 綋咲𣏴炥㴒 where 炥㴒 ~* '�R��s��[�^[�f�O]';
 (2 rows)
 
 select *,character_length(炥㴒) from 綋咲𣏴炥㴒;
-            炥㴒            | 𧞅䡱�R�[�h | 𡞰徃1a�� | char_length 
-----------------------------+------------+------------+-------------
- �R��s��[�^�f�B�X�v��C   | 𣏴A01譌    |            |          12
- �R��s��[�^�O��t�B�b�N�X | 𧞅B10�    |            |          13
- �R��s��[�^�v��O��}�[   | 邮Z01䰾    |            |          12
+            炥㴒            | 𧞅䡱�R�[�h | 𡞰徃1a�� | character_length 
+----------------------------+------------+------------+------------------
+ �R��s��[�^�f�B�X�v��C   | 𣏴A01譌    |            |               12
+ �R��s��[�^�O��t�B�b�N�X | 𧞅B10�    |            |               13
+ �R��s��[�^�v��O��}�[   | 邮Z01䰾    |            |               12
 (3 rows)
 
 select *,octet_length(炥㴒) from 綋咲𣏴炥㴒;
diff --git a/src/test/mb/expected/unicode.out b/src/test/mb/expected/unicode.out
index e578a016d7a..8f9f63c7e0e 100644
--- a/src/test/mb/expected/unicode.out
+++ b/src/test/mb/expected/unicode.out
@@ -54,11 +54,11 @@ select * from 閮��璈毺鍂隤� where �刻� ~* '�喋��𢛵��潦�[���]';
 (2 rows)
 
 select *,character_length(�刻�) from 閮��璈毺鍂隤�;
-            �刻�            | ����喋��� | �躰��1a�𨬭� | char_length 
-----------------------------+------------+------------+-------------
- �喋��𢛵��潦�����嫘��研�   | 璈鬹01銝�    |            |          12
- �喋��𢛵��潦��啜��𨰻������ | ��B10銝�    |            |          13
- �喋��𢛵��潦��𨰜��啜��𠺶�   | 鈭暢01銝�    |            |          12
+            �刻�            | ����喋��� | �躰��1a�𨬭� | character_length 
+----------------------------+------------+------------+------------------
+ �喋��𢛵��潦�����嫘��研�   | 璈鬹01銝�    |            |               12
+ �喋��𢛵��潦��啜��𨰻������ | ��B10銝�    |            |               13
+ �喋��𢛵��潦��𨰜��啜��𠺶�   | 鈭暢01銝�    |            |               12
 (3 rows)
 
 select *,octet_length(�刻�) from 閮��璈毺鍂隤�;