SysFunction.cpp (Firebird-3.0.2.32703-0.tar.bz2) | : | SysFunction.cpp (Firebird-3.0.4.33054-0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 210 | skipping to change at line 210 | |||
USER_TRANSACTION_NAMESPACE[] = "USER_TRANSACTION"; | USER_TRANSACTION_NAMESPACE[] = "USER_TRANSACTION"; | |||
// System context variables names | // System context variables names | |||
const char | const char | |||
// SYSTEM namespace: global and database wise items | // SYSTEM namespace: global and database wise items | |||
ENGINE_VERSION[] = "ENGINE_VERSION", | ENGINE_VERSION[] = "ENGINE_VERSION", | |||
DATABASE_NAME[] = "DB_NAME", | DATABASE_NAME[] = "DB_NAME", | |||
// SYSTEM namespace: connection wise items | // SYSTEM namespace: connection wise items | |||
SESSION_ID_NAME[] = "SESSION_ID", | SESSION_ID_NAME[] = "SESSION_ID", | |||
NETWORK_PROTOCOL_NAME[] = "NETWORK_PROTOCOL", | NETWORK_PROTOCOL_NAME[] = "NETWORK_PROTOCOL", | |||
WIRE_COMPRESSED_NAME[] = "WIRE_COMPRESSED", | ||||
WIRE_ENCRYPTED_NAME[] = "WIRE_ENCRYPTED", | ||||
CLIENT_ADDRESS_NAME[] = "CLIENT_ADDRESS", | CLIENT_ADDRESS_NAME[] = "CLIENT_ADDRESS", | |||
CLIENT_HOST_NAME[] = "CLIENT_HOST", | CLIENT_HOST_NAME[] = "CLIENT_HOST", | |||
CLIENT_PID_NAME[] = "CLIENT_PID", | CLIENT_PID_NAME[] = "CLIENT_PID", | |||
CLIENT_PROCESS_NAME[] = "CLIENT_PROCESS", | CLIENT_PROCESS_NAME[] = "CLIENT_PROCESS", | |||
CURRENT_USER_NAME[] = "CURRENT_USER", | CURRENT_USER_NAME[] = "CURRENT_USER", | |||
CURRENT_ROLE_NAME[] = "CURRENT_ROLE", | CURRENT_ROLE_NAME[] = "CURRENT_ROLE", | |||
// SYSTEM namespace: transaction wise items | // SYSTEM namespace: transaction wise items | |||
TRANSACTION_ID_NAME[] = "TRANSACTION_ID", | TRANSACTION_ID_NAME[] = "TRANSACTION_ID", | |||
ISOLATION_LEVEL_NAME[] = "ISOLATION_LEVEL", | ISOLATION_LEVEL_NAME[] = "ISOLATION_LEVEL", | |||
LOCK_TIMEOUT_NAME[] = "LOCK_TIMEOUT", | LOCK_TIMEOUT_NAME[] = "LOCK_TIMEOUT", | |||
skipping to change at line 2134 | skipping to change at line 2136 | |||
resultStr = dbb->dbb_database_name.ToString(); | resultStr = dbb->dbb_database_name.ToString(); | |||
else if (nameStr == SESSION_ID_NAME) | else if (nameStr == SESSION_ID_NAME) | |||
resultStr.printf("%" SQUADFORMAT, PAG_attachment_id(tdbb) ); | resultStr.printf("%" SQUADFORMAT, PAG_attachment_id(tdbb) ); | |||
else if (nameStr == NETWORK_PROTOCOL_NAME) | else if (nameStr == NETWORK_PROTOCOL_NAME) | |||
{ | { | |||
if (attachment->att_network_protocol.isEmpty()) | if (attachment->att_network_protocol.isEmpty()) | |||
return NULL; | return NULL; | |||
resultStr = attachment->att_network_protocol; | resultStr = attachment->att_network_protocol; | |||
} | } | |||
else if (nameStr == WIRE_COMPRESSED_NAME) | ||||
{ | ||||
if (attachment->att_network_protocol.isEmpty()) | ||||
return NULL; | ||||
resultStr = (attachment->att_remote_flags & isc_dpb_addr_ | ||||
flag_conn_compressed) ? TRUE_VALUE : FALSE_VALUE; | ||||
} | ||||
else if (nameStr == WIRE_ENCRYPTED_NAME) | ||||
{ | ||||
if (attachment->att_network_protocol.isEmpty()) | ||||
return NULL; | ||||
resultStr = (attachment->att_remote_flags & isc_dpb_addr_ | ||||
flag_conn_encrypted) ? TRUE_VALUE : FALSE_VALUE; | ||||
} | ||||
else if (nameStr == CLIENT_ADDRESS_NAME) | else if (nameStr == CLIENT_ADDRESS_NAME) | |||
{ | { | |||
if (attachment->att_remote_address.isEmpty()) | if (attachment->att_remote_address.isEmpty()) | |||
return NULL; | return NULL; | |||
resultStr = attachment->att_remote_address; | resultStr = attachment->att_remote_address; | |||
} | } | |||
else if (nameStr == CLIENT_HOST_NAME) | else if (nameStr == CLIENT_HOST_NAME) | |||
{ | { | |||
if (attachment->att_remote_host.isEmpty()) | if (attachment->att_remote_host.isEmpty()) | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 18 lines changed or added |