create database doesn't work well in MULTIBYTE mode

Hi

I have a crash while creating regression database in pararell regression
test.
Seems it's due to the following change.

@@ -2638,7 +2705,14 @@                    n->dbname = $3;                    n->dbpath = $5;#ifdef MULTIBYTE
-                    n->encoding = $6;
+                    if ($6 != NULL) {
+                        n->encoding = pg_char_to_encoding($6);
+                        if (n->encoding < 0) {
+                            elog(ERROR, "Encoding name '%s' is invalid", $6);
+                        }
+                    } else {
+                        n->encoding = GetTemplateEncoding();
+                    }#else                    n->encoding = 0;#endif

Why ?
$6 is an ival not an str.

Regards.

Hiroshi Inoue
Inoue@tpf.co.jp