!6603 7.0.0修复【写转发】参数命名单词错误，enable_remote_excute修改为enable_remote_execute

Merge pull request !6603 from zhangyukai/bugfix_paraname
2024-10-31 11:31:39 +00:00
parent bdac066b2e 8eb12cd2a7
commit 1537dbf0c0
7 changed files with 7 additions and 6 deletions
--- a/src/bin/gs_guc/cluster_guc.conf
+++ b/src/bin/gs_guc/cluster_guc.conf
@ -814,7 +814,7 @@ ss_scrlock_server_bind_core|string|0,0|NULL|NULL|
 dolphin_server_port|int|1024,65535|NULL|NULL|
 enable_dolphin_proto|bool|0,0|NULL|NULL|
 dolphin_hot_standby|bool|0,0,|NULL|NULL|
-enable_remote_excute|bool|0,0|NULL|NULL|
+enable_remote_execute|bool|0,0|NULL|NULL|
 light_comm|bool|0,0|NULL|NULL|
 enable_proc_coverage|bool|0,0|NULL|NULL|
 ignore_standby_lsn_window|int|0,2147483647|ms|NULL|
--- a/src/common/backend/utils/init/globals.cpp
+++ b/src/common/backend/utils/init/globals.cpp
@ -77,7 +77,7 @@ bool will_shutdown = false;
 *
 ********************************************/

-const uint32 GRAND_VERSION_NUM = 93015;
+const uint32 GRAND_VERSION_NUM = 93016;

 /********************************************
 * 2.VERSION NUM FOR EACH FEATURE
--- a/src/common/backend/utils/misc/guc.cpp
+++ b/src/common/backend/utils/misc/guc.cpp
@ -2053,7 +2053,7 @@ static void InitConfigureNamesBool()
            NULL,
            NULL
        },
-        {{"enable_remote_excute",
+        {{"enable_remote_execute",
            PGC_POSTMASTER,
            NODE_SINGLENODE,
            QUERY_TUNING,
--- a/src/include/catalog/upgrade_sql/set_guc/delete_guc
+++ b/src/include/catalog/upgrade_sql/set_guc/delete_guc
@ -17,3 +17,4 @@ twophase_clean_workers datanode
 bgwriter_thread_num datanode
 gds_debug_mod datanode
 unique_sql_clean_ratio datanode
+enable_remote_excute datanode
--- a/src/test/regress/expected/rangefuncs.out
+++ b/src/test/regress/expected/rangefuncs.out
@ -67,7 +67,7 @@ SELECT name, setting FROM pg_settings WHERE name LIKE 'enable%' ORDER BY name;
 enable_pbe_optimization           | on
 enable_prevent_job_task_startup   | off
 enable_recyclebin                 | off
- enable_remote_excute              | off
+ enable_remote_execute             | off
 enable_resource_record            | off
 enable_resource_track             | on
 enable_save_datachanged_timestamp | on
--- a/src/test/regress/input/ss_standby_support_write.source
+++ b/src/test/regress/input/ss_standby_support_write.source
@ -1,4 +1,4 @@
-\! @abs_bindir@/gs_guc set -D @abs_srcdir@/tmp_check/datanode2/ -c "enable_remote_excute=on" > /dev/null 2>&1
+\! @abs_bindir@/gs_guc set -D @abs_srcdir@/tmp_check/datanode2/ -c "enable_remote_execute=on" > /dev/null 2>&1
 \! @abs_bindir@/gs_ctl stop -D @abs_srcdir@/tmp_check/datanode2 > /dev/null 2>&1
 \! @abs_bindir@/gs_ctl start -D @abs_srcdir@/tmp_check/datanode2 > /dev/null 2>&1
 \! sleep 5
--- a/src/test/regress/output/recovery_2pc_tools.source
+++ b/src/test/regress/output/recovery_2pc_tools.source
@ -321,7 +321,7 @@ select name,vartype,unit,min_val,max_val from pg_settings where name <> 'qunit_c
 enable_proc_coverage                             | bool    |      |           | 
 enable_record_nettime                            | bool    |      |           | 
 enable_recyclebin                                | bool    |      |           | 
- enable_remote_excute                             | bool    |      |           | 
+ enable_remote_execute                            | bool    |      |           | 
 enable_resource_record                           | bool    |      |           | 
 enable_resource_track                            | bool    |      |           | 
 enable_save_confirmed_lsn                        | bool    |      |           |