Skip to content

Commit 5ea6eab

Browse files
authored
Merge pull request IvorySQL#905 from yuanyl630/IVORY_REL_5_STABLE
fix the issue that invalid case-conversion-mode value doesn't terminate
2 parents 536e899 + b5e89ac commit 5ea6eab

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

‎src/bin/initdb/initdb.c‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2682,7 +2682,9 @@ usage(const char *progname)
26822682
printf(_(" -X, --waldir=WALDIR location for the write-ahead log directory\n"));
26832683
printf(_(" --wal-segsize=SIZE size of WAL segments, in megabytes\n"));
26842684
printf(_(" -m, --dbmode=MODE set database mode, default is oracle\n"));
2685-
printf(_(" -C, --case-conversion-mode=MODE set case conversion mode, default is interchange\n"));
2685+
printf(_(" -C, --case-conversion-mode=MODE\n"
2686+
" set case conversion mode, options can be\n"
2687+
" normal/interchange/lowercase, default is interchange\n"));
26862688
printf(_("\nLess commonly used options:\n"));
26872689
printf(_(" -c, --set NAME=VALUE override default setting for server parameter\n"));
26882690
printf(_(" -d, --debug generate lots of debugging output\n"));
@@ -3474,7 +3476,9 @@ main(int argc, char *argv[])
34743476
}
34753477
else
34763478
{
3477-
printf(_("UnKnow case conversion mode, use the default interchange.\n"));
3479+
pg_log_error("Unknown case conversion mode: %s", switchmode);
3480+
pg_log_error_hint("Valid case conversion mode value is normal, interchange, lowercase.");
3481+
exit(1);
34783482
}
34793483
break;
34803484
case 'D':

0 commit comments

Comments
 (0)