diff --git a/contrib/babelfishpg_tsql/src/catalog.c b/contrib/babelfishpg_tsql/src/catalog.c index 3b6b454e6e..6f773b38e5 100644 --- a/contrib/babelfishpg_tsql/src/catalog.c +++ b/contrib/babelfishpg_tsql/src/catalog.c @@ -6290,7 +6290,7 @@ get_tvp_typename_typeschemaname(char *proc_name, char *target_arg_name, char **t } /* - * Returns true if given role has direct member bbf_role_admin + * Returns true if given role has direct membership of bbf_role_admin * whose admin_option is true, else returns false. */ bool diff --git a/test/JDBC/expected/test_windows_login_before-16_6-vu-cleanup.out b/test/JDBC/expected/test_windows_login_before-17_3-vu-cleanup.out similarity index 100% rename from test/JDBC/expected/test_windows_login_before-16_6-vu-cleanup.out rename to test/JDBC/expected/test_windows_login_before-17_3-vu-cleanup.out diff --git a/test/JDBC/expected/test_windows_login_before-16_6-vu-prepare.out b/test/JDBC/expected/test_windows_login_before-17_3-vu-prepare.out similarity index 100% rename from test/JDBC/expected/test_windows_login_before-16_6-vu-prepare.out rename to test/JDBC/expected/test_windows_login_before-17_3-vu-prepare.out diff --git a/test/JDBC/expected/test_windows_login_before-16_6-vu-verify.out b/test/JDBC/expected/test_windows_login_before-17_3-vu-verify.out similarity index 100% rename from test/JDBC/expected/test_windows_login_before-16_6-vu-verify.out rename to test/JDBC/expected/test_windows_login_before-17_3-vu-verify.out diff --git a/test/JDBC/input/test_windows_login_before-16_6-vu-cleanup.mix b/test/JDBC/input/test_windows_login_before-17_3-vu-cleanup.mix similarity index 100% rename from test/JDBC/input/test_windows_login_before-16_6-vu-cleanup.mix rename to test/JDBC/input/test_windows_login_before-17_3-vu-cleanup.mix diff --git a/test/JDBC/input/test_windows_login_before-16_6-vu-prepare.mix b/test/JDBC/input/test_windows_login_before-17_3-vu-prepare.mix similarity index 100% rename from test/JDBC/input/test_windows_login_before-16_6-vu-prepare.mix rename to test/JDBC/input/test_windows_login_before-17_3-vu-prepare.mix diff --git a/test/JDBC/input/test_windows_login_before-16_6-vu-verify.mix b/test/JDBC/input/test_windows_login_before-17_3-vu-verify.mix similarity index 100% rename from test/JDBC/input/test_windows_login_before-16_6-vu-verify.mix rename to test/JDBC/input/test_windows_login_before-17_3-vu-verify.mix diff --git a/test/JDBC/jdbc_schedule b/test/JDBC/jdbc_schedule index d3a27f932e..a2e5ebca22 100644 --- a/test/JDBC/jdbc_schedule +++ b/test/JDBC/jdbc_schedule @@ -483,9 +483,9 @@ ignore#!#declare_atatglobalvars_upgrade-before-16_5-vu-cleanup ignore#!#declare_atatglobalvars_upgrade-before-16_5-vu-prepare ignore#!#declare_atatglobalvars_upgrade-before-16_5-vu-verify -ignore#!#test_windows_login_before-16_6-vu-prepare -ignore#!#test_windows_login_before-16_6-vu-verify -ignore#!#test_windows_login_before-16_6-vu-cleanup +ignore#!#test_windows_login_before-17_3-vu-prepare +ignore#!#test_windows_login_before-17_3-vu-verify +ignore#!#test_windows_login_before-17_3-vu-cleanup ignore#!#trim-before-15_11-or-16_7-vu-prepare ignore#!#trim-before-15_11-or-16_7-vu-verify diff --git a/test/JDBC/upgrade/16_1/schedule b/test/JDBC/upgrade/16_1/schedule index 29bac1f6ba..1280b2a0eb 100644 --- a/test/JDBC/upgrade/16_1/schedule +++ b/test/JDBC/upgrade/16_1/schedule @@ -459,7 +459,7 @@ TestVarChar TestVariableDataLength test_windows_alter_login test_windows_alter_user -test_windows_login_before-16_6 +test_windows_login_before-17_3 test_windows_sp_helpuser TestXML timefromparts diff --git a/test/JDBC/upgrade/16_2/schedule b/test/JDBC/upgrade/16_2/schedule index 4852d304b8..8e57e3e783 100644 --- a/test/JDBC/upgrade/16_2/schedule +++ b/test/JDBC/upgrade/16_2/schedule @@ -463,7 +463,7 @@ TestVarChar TestVariableDataLength test_windows_alter_login test_windows_alter_user -test_windows_login_before-16_6 +test_windows_login_before-17_3 test_windows_sp_helpuser TestXML timefromparts diff --git a/test/JDBC/upgrade/16_3/schedule b/test/JDBC/upgrade/16_3/schedule index c0b4c04924..429129e4e8 100644 --- a/test/JDBC/upgrade/16_3/schedule +++ b/test/JDBC/upgrade/16_3/schedule @@ -464,7 +464,7 @@ TestVarChar TestVariableDataLength test_windows_alter_login test_windows_alter_user -test_windows_login_before-16_6 +test_windows_login_before-17_3 test_windows_sp_helpuser TestXML timefromparts diff --git a/test/JDBC/upgrade/16_4/schedule b/test/JDBC/upgrade/16_4/schedule index cabddf807e..ccef5e99ef 100644 --- a/test/JDBC/upgrade/16_4/schedule +++ b/test/JDBC/upgrade/16_4/schedule @@ -466,7 +466,7 @@ TestVarChar TestVariableDataLength test_windows_alter_login test_windows_alter_user -test_windows_login_before-16_6 +test_windows_login_before-17_3 test_windows_sp_helpuser TestXML timefromparts diff --git a/test/JDBC/upgrade/16_6/schedule b/test/JDBC/upgrade/16_6/schedule index 51da509917..6af0f35191 100644 --- a/test/JDBC/upgrade/16_6/schedule +++ b/test/JDBC/upgrade/16_6/schedule @@ -467,7 +467,7 @@ TestVarChar TestVariableDataLength test_windows_alter_login test_windows_alter_user -test_windows_login_before-16_6 +test_windows_login_before-17_3 test_windows_sp_helpuser TestXML timefromparts diff --git a/test/JDBC/upgrade/16_7/schedule b/test/JDBC/upgrade/16_7/schedule index 5420de502d..7d35eef8d4 100644 --- a/test/JDBC/upgrade/16_7/schedule +++ b/test/JDBC/upgrade/16_7/schedule @@ -466,7 +466,7 @@ TestVarChar TestVariableDataLength test_windows_alter_login test_windows_alter_user -test_windows_login +test_windows_login_before-17_3 test_windows_sp_helpuser TestXML timefromparts diff --git a/test/JDBC/upgrade/17_2/schedule b/test/JDBC/upgrade/17_2/schedule index 5d54b6103f..49aa5d0b8c 100644 --- a/test/JDBC/upgrade/17_2/schedule +++ b/test/JDBC/upgrade/17_2/schedule @@ -464,7 +464,7 @@ TestVarChar TestVariableDataLength test_windows_alter_login test_windows_alter_user -test_windows_login +test_windows_login_before-17_3 test_windows_sp_helpuser TestXML timefromparts