diff options
Diffstat (limited to 'ext/interbase')
| -rw-r--r-- | ext/interbase/ibase_service.c | 10 | ||||
| -rw-r--r-- | ext/interbase/interbase.c | 3 |
2 files changed, 6 insertions, 7 deletions
diff --git a/ext/interbase/ibase_service.c b/ext/interbase/ibase_service.c index b2a182b40d..857c58693d 100644 --- a/ext/interbase/ibase_service.c +++ b/ext/interbase/ibase_service.c @@ -497,9 +497,6 @@ static void _php_ibase_service_action(INTERNAL_FUNCTION_PARAMETERS, char svc_act case isc_spb_sts_sys_relations: goto options_argument; } - } else if (svc_action == isc_action_svc_display_user) { - *buf = svc_action; - spb_len = 1; } else { /* these actions all expect different types of arguments */ switch (action) { @@ -508,15 +505,16 @@ unknown_option: _php_ibase_module_error("Unrecognised option (%ld)" TSRMLS_CC, action); RETURN_FALSE; - case isc_spb_prp_activate: - case isc_spb_prp_db_online: case isc_spb_rpr_check_db: case isc_spb_rpr_ignore_checksum: case isc_spb_rpr_kill_shadows: case isc_spb_rpr_mend_db: case isc_spb_rpr_validate_db: - case isc_spb_rpr_full: case isc_spb_rpr_sweep_db: + svc_action = isc_action_svc_repair; + + case isc_spb_prp_activate: + case isc_spb_prp_db_online: options_argument: argument |= action; action = isc_spb_options; diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c index e753f83b38..d4e6b89b91 100644 --- a/ext/interbase/interbase.c +++ b/ext/interbase/interbase.c @@ -624,12 +624,13 @@ PHP_MINIT_FUNCTION(ibase) REGISTER_LONG_CONSTANT("IBASE_PRP_SET_SQL_DIALECT", isc_spb_prp_set_sql_dialect, CONST_PERSISTENT); REGISTER_LONG_CONSTANT("IBASE_PRP_ACTIVATE", isc_spb_prp_activate, CONST_PERSISTENT); REGISTER_LONG_CONSTANT("IBASE_PRP_DB_ONLINE", isc_spb_prp_db_online, CONST_PERSISTENT); + /* repair options */ REGISTER_LONG_CONSTANT("IBASE_RPR_CHECK_DB", isc_spb_rpr_check_db, CONST_PERSISTENT); REGISTER_LONG_CONSTANT("IBASE_RPR_IGNORE_CHECKSUM", isc_spb_rpr_ignore_checksum, CONST_PERSISTENT); REGISTER_LONG_CONSTANT("IBASE_RPR_KILL_SHADOWS", isc_spb_rpr_kill_shadows, CONST_PERSISTENT); REGISTER_LONG_CONSTANT("IBASE_RPR_MEND_DB", isc_spb_rpr_mend_db, CONST_PERSISTENT); REGISTER_LONG_CONSTANT("IBASE_RPR_VALIDATE_DB", isc_spb_rpr_validate_db, CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IBASE_RPR_FULL", isc_spb_rpr_full, CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IBASE_RPR_FULL", isc_spb_rpr_full, CONST_PERSISTENT); REGISTER_LONG_CONSTANT("IBASE_RPR_SWEEP_DB", isc_spb_rpr_sweep_db, CONST_PERSISTENT); /* db info arguments */ REGISTER_LONG_CONSTANT("IBASE_STS_DATA_PAGES", isc_spb_sts_data_pages, CONST_PERSISTENT); |