From ff40a4e199c1c46da367048f39dc6ed5b9853644 Mon Sep 17 00:00:00 2001 From: alexpeshkoff Date: Mon, 17 Nov 2008 16:29:14 +0000 Subject: [PATCH] Implemented CORE-2197: added support for -nodbtriggers switch in gbak into services API --- src/burp/burpswi.h | 2 +- src/include/consts_pub.h | 3 ++- src/utilities/fbsvcmgr.cpp | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/burp/burpswi.h b/src/burp/burpswi.h index def4e792bc..d58a6cdce2 100644 --- a/src/burp/burpswi.h +++ b/src/burp/burpswi.h @@ -135,7 +135,7 @@ static const in_sw_tab_t reference_burp_in_sw_table [] = // msg 278: %sMODE read_only or read_write access {IN_SW_BURP_N, isc_spb_res_no_validity, "NO_VALIDITY", 0, 0, 0, FALSE, 187, 0, NULL}, // msg 187: %sN(O_VALIDITY) do not restore database validity conditions - {IN_SW_BURP_NOD, 0, "NODBTRIGGERS", 0, 0, 0, FALSE, 294, 0, NULL}, + {IN_SW_BURP_NOD, isc_spb_bkp_no_triggers, "NODBTRIGGERS", 0, 0, 0, FALSE, 294, 0, NULL}, // msg 294: %sNOD(BTRIGGERS) do not run database triggers {IN_SW_BURP_NT, isc_spb_bkp_non_transportable, "NT", 0, 0, 0, FALSE, 239, 0, NULL}, // msg 239: %sNT Non-Transportable backup file format diff --git a/src/include/consts_pub.h b/src/include/consts_pub.h index 979798d9c5..7f23a5af7b 100644 --- a/src/include/consts_pub.h +++ b/src/include/consts_pub.h @@ -343,7 +343,8 @@ #define isc_spb_bkp_old_descriptions 0x10 #define isc_spb_bkp_non_transportable 0x20 #define isc_spb_bkp_convert 0x40 -#define isc_spb_bkp_expand 0x80 +#define isc_spb_bkp_expand 0x80 +#define isc_spb_bkp_no_triggers 0x8000 /******************************************** * Parameters for isc_action_svc_properties * diff --git a/src/utilities/fbsvcmgr.cpp b/src/utilities/fbsvcmgr.cpp index 8eb2a45230..2445e913b4 100644 --- a/src/utilities/fbsvcmgr.cpp +++ b/src/utilities/fbsvcmgr.cpp @@ -260,6 +260,7 @@ const Switches backupOptions[] = { {"bkp_old_descriptions", putOption, 0, isc_spb_bkp_old_descriptions, 0}, {"bkp_non_transportable", putOption, 0, isc_spb_bkp_non_transportable, 0}, {"bkp_convert", putOption, 0, isc_spb_bkp_convert, 0}, + {"bkp_no_triggers", putOption, 0, isc_spb_bkp_no_triggers, 0}, {0, 0, 0, 0, 0} }; @@ -278,6 +279,7 @@ const Switches restoreOptions[] = { {"res_replace", putOption, 0, isc_spb_res_replace, 0}, {"res_create", putOption, 0, isc_spb_res_create, 0}, {"res_use_all_space", putOption, 0, isc_spb_res_use_all_space, 0}, + {"bkp_no_triggers", putOption, 0, isc_spb_bkp_no_triggers, 0}, {0, 0, 0, 0, 0} };