From 3a37801788b65bd3d423a227b00511e33f58348b Mon Sep 17 00:00:00 2001 From: playrest Date: Mon, 8 Feb 2021 19:45:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dgs=5Finitdb=E6=B2=A1?= =?UTF-8?q?=E6=8C=87=E5=AE=9A-D=E5=8F=82=E6=95=B0coredump=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/bin/initdb/initdb.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/initdb/initdb.cpp b/src/bin/initdb/initdb.cpp index 8592eef95..0c9be650b 100644 --- a/src/bin/initdb/initdb.cpp +++ b/src/bin/initdb/initdb.cpp @@ -228,7 +228,7 @@ static const char* backend_options = "--single " #define FREE_AND_RESET(ptr) \ do { \ - if (NULL != (ptr)) { \ + if (NULL != (ptr) && (char*)(ptr) != (char*)"") { \ free(ptr); \ (ptr) = NULL; \ } \ From 652a680a891b198a0143fe8d342eac31f3a7ee88 Mon Sep 17 00:00:00 2001 From: playrest Date: Thu, 18 Feb 2021 14:24:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E5=96=84gs=5Finitdb=E7=9A=84?= =?UTF-8?q?=E5=9B=9E=E5=BD=92=E6=B5=8B=E8=AF=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/regress/input/gs_initdb.source | 6 ++++++ src/test/regress/output/gs_initdb.source | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/src/test/regress/input/gs_initdb.source b/src/test/regress/input/gs_initdb.source index fe5ef6503..c33d47bee 100644 --- a/src/test/regress/input/gs_initdb.source +++ b/src/test/regress/input/gs_initdb.source @@ -25,3 +25,9 @@ \! rm -rf @testtablespace@/passwd.txt \! rm -rf @testtablespace@/test8 +-- use env PGDATA +\! mkdir -p @testtablespace@/test9 +\! export PGDATA=@testtablespace@/test9 && ( @abs_bindir@/gs_initdb -w test@123 --nodename coorn9 >> @abs_bindir@/test_initdb9.log 2>&1 ) +\! cat @abs_bindir@/test_initdb9.log | grep Success +\! rm -f @abs_bindir@/test_initdb9.log +\! rm -rf @testtablespace@/test9 diff --git a/src/test/regress/output/gs_initdb.source b/src/test/regress/output/gs_initdb.source index 6b62f9726..5019ee37b 100644 --- a/src/test/regress/output/gs_initdb.source +++ b/src/test/regress/output/gs_initdb.source @@ -102,3 +102,10 @@ freezing database postgres ... ok \! @abs_bindir@/gs_initdb -S -A trust --auth-host='ident' --auth-local='peer' --auth-host='ident' --auth-local='peer' -D @testtablespace@/test8 --nodename coorn8 -U test_initdb --pwfile=@testtablespace@/passwd.txt >> /dev/null 2>&1 \! rm -rf @testtablespace@/passwd.txt \! rm -rf @testtablespace@/test8 +-- use env PGDATA +\! mkdir -p @testtablespace@/test9 +\! export PGDATA=@testtablespace@/test9 && ( @abs_bindir@/gs_initdb -w test@123 --nodename coorn9 >> @abs_bindir@/test_initdb9.log 2>&1 ) +\! cat @abs_bindir@/test_initdb9.log | grep Success +Success. You can now start the database server of single node using: +\! rm -f @abs_bindir@/test_initdb9.log +\! rm -rf @testtablespace@/test9