Skip to content

Commit 534840b

Browse files
committed
fix Issue#887 ivorysql-wasm meson build error
1 parent 36b9f81 commit 534840b

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

meson_options.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ option('systemd', type: 'feature', value: 'auto',
160160
description: 'systemd support')
161161

162162
option('uuid', type: 'combo', choices: ['none', 'bsd', 'e2fs', 'ossp'],
163-
value: 'ossp',
163+
value: 'e2fs',
164164
description: 'Use LIB for contrib/uuid-ossp support')
165165

166166
option('zlib', type: 'feature', value: 'auto',

src/bin/initdb/po/zh_CN.po

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -776,11 +776,8 @@ msgstr "\"%s\" 是用于 \"%s\" 连接的无效认证方法"
776776

777777
#: initdb.c:2521
778778
#, c-format
779-
msgid " NOTICE: If you set this to gb18030,\n\
780-
the database will initilized with gb18030_2000,but not gb18030_2022,\n\
781-
if you want to use gb18030_2022,please set this option to gb18030_2022,\n"
782-
msgstr " 注意: 如果设置了这个参数为gb18030,数据库会以gb18030_2000标准进行初始化,\n\
783-
如果想要使用gb18030_2022标准,将此选项设置为gb18030_2022\n"
779+
msgid "NOTICE: If you set this to gb18030, the database will initilized with gb18030_2000,but not gb18030_2022, if you want to use gb18030_2022,please set this option to gb18030_2022,\n"
780+
msgstr "注意: 如果设置了这个参数为gb18030, 数据库会以gb18030_2000标准进行初始化, 如果想要使用gb18030_2022标准,将此选项设置为gb18030_2022\n"
784781

785782
#: initdb.c:2531
786783
#, c-format

0 commit comments

Comments
 (0)