firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 08:03:04 +01:00
Code Issues

Misc.

Browse Source
This commit is contained in:
asfernandes 2012-07-19 01:52:38 +00:00
parent b16d4bd0e6
commit a9324d3733
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/gen/msgs.h
View File

@ -744,7 +744,7 @@ Data source : @4"}, /* eds_statement */
{335545037, ""}, /* svc_no_switches */
{335545038, "Size of stdin data is more than was requested from client"}, /* svc_bad_size */
{335545039, "Crypt plugin @1 failed to load"}, /* no_crypt_plugin */
{335545040, "Length of crypt plugin name should not exceed @1 byte"}, /* cp_name_too_long */
{335545040, "Length of crypt plugin name should not exceed @1 bytes"}, /* cp_name_too_long */
{335545041, "Crypt failed - already crypting database"}, /* cp_process_active */
{335545042, "Crypt failed - database is already in requested state"}, /* cp_already_crypted */
{335545043, "Missing crypt plugin, but page appears encrypted"}, /* decrypt_error */

12
src/lock/print.cpp
View File

@ -181,7 +181,7 @@ static const char* usage =
" -h print recent events history\n"
" -a print all of the above (equal to -o -l -r -h swithes)\n"
" -s <N> print only locks of given series (valid only if -l specified)\n"
" -n print only pending owners (if -o specified) or \n"
" -n print only pending owners (if -o specified) or\n"
" pending locks (if -l specified)\n"
" -w print \"waiting for\" list for every owner\n"
" (valid only if -o specified)\n"
@ -191,15 +191,15 @@ static const char* usage =
"\n"
" -i[<counters>] [<N> [<M>]] interactive mode:\n"
" print chosen lock manager activity counters during <N> seconds\n"
" witn interval of <M> seconds. Defaults are 1 sec for both values.\n"
" with interval of <M> seconds. Defaults are 1 sec for both values.\n"
" Counters are:\n"
" a number of mutex acquires, acquire blocks, etc \n"
" a number of mutex acquires, acquire blocks, etc\n"
" o number of lock operations (enqueues, converts, downgrades, etc)\n"
" t number of operations with most important lock series\n"
" w number of waits, timeouts, deadlock scans, etc\n"
" Default is aotw\n"
"\n"
" -? this help screen \n"
" -? this help screen\n"
"\n";
@ -1279,7 +1279,7 @@ static void prt_owner(OUTFILE outfile,
const srq* que_inst;
SRQ_LOOP(owner->own_requests, que_inst)
prt_request(outfile, LOCK_header,
(lrq*) ((UCHAR *) que_inst - OFFSET(lrq*, lrq_own_requests)));
(lrq*) ((UCHAR*) que_inst - OFFSET(lrq*, lrq_own_requests)));
}
if (sw_requests && sw_pending)
@ -1287,7 +1287,7 @@ static void prt_owner(OUTFILE outfile,
const srq* que_inst;
SRQ_LOOP(owner->own_pending, que_inst)
prt_request(outfile, LOCK_header,
(lrq*) ((UCHAR *) que_inst - OFFSET(lrq*, lrq_own_pending)));
(lrq*) ((UCHAR*) que_inst - OFFSET(lrq*, lrq_own_pending)));
}
}

2
src/msgs/messages2.sql
View File

@ -827,7 +827,7 @@ Data source : @4', NULL, NULL)
('svc_no_switches', NULL, 'svc.cpp', NULL, 0, 717, NULL, '', NULL, NULL);
('svc_bad_size', NULL, 'svc.cpp', NULL, 0, 718, NULL, 'Size of stdin data is more than was requested from client', NULL, NULL);
('no_crypt_plugin', NULL, 'CryptoManager.cpp', NULL, 0, 719, NULL, 'Crypt plugin @1 failed to load', NULL, NULL);
('cp_name_too_long', NULL, 'CryptoManager.cpp', NULL, 0, 720, NULL, 'Length of crypt plugin name should not exceed @1 byte', NULL, NULL);
('cp_name_too_long', NULL, 'CryptoManager.cpp', NULL, 0, 720, NULL, 'Length of crypt plugin name should not exceed @1 bytes', NULL, NULL);
('cp_process_active', NULL, 'CryptoManager.cpp', NULL, 0, 721, NULL, 'Crypt failed - already crypting database', NULL, NULL);
('cp_already_crypted', NULL, 'CryptoManager.cpp', NULL, 0, 722, NULL, 'Crypt failed - database is already in requested state', NULL, NULL);
('decrypt_error', NULL, 'CryptoManager.cpp', NULL, 0, 723, NULL, 'Missing crypt plugin, but page appears encrypted', NULL, NULL);