Menu
▾
▴
[Firebird-checkins] SF.net SVN: firebird:[54349] firebird/trunk
|
From: <ro...@us...> - 2012-04-10 01:39:03
|
Revision: 54349
http://firebird.svn.sourceforge.net/firebird/?rev=54349&view=rev
Author: robocop
Date: 2012-04-10 01:38:57 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
I plan to use this msg because the current one is misleading.
Modified Paths:
--------------
firebird/trunk/lang_helpers/gds_codes.ftn
firebird/trunk/lang_helpers/gds_codes.pas
firebird/trunk/src/include/gen/codetext.h
firebird/trunk/src/include/gen/iberror.h
firebird/trunk/src/include/gen/msgs.h
firebird/trunk/src/include/gen/sql_code.h
firebird/trunk/src/include/gen/sql_state.h
firebird/trunk/src/msgs/facilities2.sql
firebird/trunk/src/msgs/messages2.sql
firebird/trunk/src/msgs/system_errors2.sql
Modified: firebird/trunk/lang_helpers/gds_codes.ftn
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.ftn 2012-04-10 01:36:51 UTC (rev 54348)
+++ firebird/trunk/lang_helpers/gds_codes.ftn 2012-04-10 01:38:57 UTC (rev 54349)
@@ -1474,6 +1474,8 @@
PARAMETER (GDS__protect_sys_tab = 335545030)
INTEGER*4 GDS__libtommath_generic
PARAMETER (GDS__libtommath_generic = 335545031)
+ INTEGER*4 GDS__wroblrver2
+ PARAMETER (GDS__wroblrver2 = 335545032)
INTEGER*4 GDS__gfix_db_name
PARAMETER (GDS__gfix_db_name = 335740929)
INTEGER*4 GDS__gfix_invalid_sw
Modified: firebird/trunk/lang_helpers/gds_codes.pas
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.pas 2012-04-10 01:36:51 UTC (rev 54348)
+++ firebird/trunk/lang_helpers/gds_codes.pas 2012-04-10 01:38:57 UTC (rev 54349)
@@ -744,6 +744,7 @@
gds_missing_data_structures = 335545029;
gds_protect_sys_tab = 335545030;
gds_libtommath_generic = 335545031;
+ gds_wroblrver2 = 335545032;
gds_gfix_db_name = 335740929;
gds_gfix_invalid_sw = 335740930;
gds_gfix_incmp_sw = 335740932;
Modified: firebird/trunk/src/include/gen/codetext.h
===================================================================
--- firebird/trunk/src/include/gen/codetext.h 2012-04-10 01:36:51 UTC (rev 54348)
+++ firebird/trunk/src/include/gen/codetext.h 2012-04-10 01:38:57 UTC (rev 54349)
@@ -733,6 +733,7 @@
{"missing_data_structures", 335545029},
{"protect_sys_tab", 335545030},
{"libtommath_generic", 335545031},
+ {"wroblrver2", 335545032},
{"gfix_db_name", 335740929},
{"gfix_invalid_sw", 335740930},
{"gfix_incmp_sw", 335740932},
Modified: firebird/trunk/src/include/gen/iberror.h
===================================================================
--- firebird/trunk/src/include/gen/iberror.h 2012-04-10 01:36:51 UTC (rev 54348)
+++ firebird/trunk/src/include/gen/iberror.h 2012-04-10 01:38:57 UTC (rev 54349)
@@ -767,6 +767,7 @@
const ISC_STATUS isc_missing_data_structures = 335545029L;
const ISC_STATUS isc_protect_sys_tab = 335545030L;
const ISC_STATUS isc_libtommath_generic = 335545031L;
+const ISC_STATUS isc_wroblrver2 = 335545032L;
const ISC_STATUS isc_gfix_db_name = 335740929L;
const ISC_STATUS isc_gfix_invalid_sw = 335740930L;
const ISC_STATUS isc_gfix_incmp_sw = 335740932L;
@@ -1210,7 +1211,7 @@
const ISC_STATUS isc_trace_switch_param_miss = 337182758L;
const ISC_STATUS isc_trace_param_act_notcompat = 337182759L;
const ISC_STATUS isc_trace_mandatory_switch_miss = 337182760L;
-const ISC_STATUS isc_err_max = 1154;
+const ISC_STATUS isc_err_max = 1155;
#else /* c definitions */
@@ -1947,6 +1948,7 @@
#define isc_missing_data_structures 335545029L
#define isc_protect_sys_tab 335545030L
#define isc_libtommath_generic 335545031L
+#define isc_wroblrver2 335545032L
#define isc_gfix_db_name 335740929L
#define isc_gfix_invalid_sw 335740930L
#define isc_gfix_incmp_sw 335740932L
@@ -2390,7 +2392,7 @@
#define isc_trace_switch_param_miss 337182758L
#define isc_trace_param_act_notcompat 337182759L
#define isc_trace_mandatory_switch_miss 337182760L
-#define isc_err_max 1154
+#define isc_err_max 1155
#endif
Modified: firebird/trunk/src/include/gen/msgs.h
===================================================================
--- firebird/trunk/src/include/gen/msgs.h 2012-04-10 01:36:51 UTC (rev 54348)
+++ firebird/trunk/src/include/gen/msgs.h 2012-04-10 01:38:57 UTC (rev 54349)
@@ -252,10 +252,10 @@
{335544548, "Attempt to define a second PRIMARY KEY for the same table"}, /* primary_key_exists */
{335544549, "cannot modify or erase a system trigger"}, /* systrig_update */
{335544550, "only the owner of a table may reassign ownership"}, /* not_rel_owner */
- {335544551, "could not find table/procedure/package for GRANT"}, /* grant_obj_notfound */
+ {335544551, "could not find object for GRANT"}, /* grant_obj_notfound */
{335544552, "could not find column for GRANT"}, /* grant_fld_notfound */
{335544553, "user does not have GRANT privileges for operation"}, /* grant_nopriv */
- {335544554, "table/procedure has non-SQL security class defined"}, /* nonsql_security_rel */
+ {335544554, "object has non-SQL security class defined"}, /* nonsql_security_rel */
{335544555, "column has non-SQL security class defined"}, /* nonsql_security_fld */
{335544556, "Write-ahead Log without shared cache configuration not allowed"}, /* wal_cache_err */
{335544557, "database shutdown unsuccessful"}, /* shutfail */
@@ -694,7 +694,7 @@
{335544987, "Use of TRUSTED switches in spb_command_line is prohibited"}, /* no_trusted_spb */
{335544988, "PACKAGE @1"}, /* package_name */
{335544989, "Cannot make field @1 of table @2 NOT NULL because there are NULLs present"}, /* cannot_make_not_null */
- {335544990, "Feature @1 is not supported any more"}, /* feature_removed */
+ {335544990, "Feature @1 is not supported anymore"}, /* feature_removed */
{335544991, "VIEW @1"}, /* view_name */
{335544992, "Can not access lock files directory @1"}, /* lock_dir_access */
{335544993, "Fetch option @1 is invalid for a non-scrollable cursor"}, /* invalid_fetch_option */
@@ -736,6 +736,7 @@
{335545029, "Install incomplete, please read chapter \"Initializing security database\" in Quick Start Guide"}, /* missing_data_structures */
{335545030, "@1 operation is not allowed for system table @2"}, /* protect_sys_tab */
{335545031, "Libtommath error code @1 in function @2"}, /* libtommath_generic */
+ {335545032, "unsupported BLR version (expected between @1 and @2, encountered @3)"}, /* wroblrver2 */
{335740929, "data base file name (@1) already given"}, /* gfix_db_name */
{335740930, "invalid switch @1"}, /* gfix_invalid_sw */
{335740932, "incompatible switch combination"}, /* gfix_incmp_sw */
Modified: firebird/trunk/src/include/gen/sql_code.h
===================================================================
--- firebird/trunk/src/include/gen/sql_code.h 2012-04-10 01:36:51 UTC (rev 54348)
+++ firebird/trunk/src/include/gen/sql_code.h 2012-04-10 01:38:57 UTC (rev 54349)
@@ -732,6 +732,7 @@
{335545029, -902}, /* 709 missing_data_structures */
{335545030, -902}, /* 710 protect_sys_tab */
{335545031, -901}, /* 711 libtommath_generic */
+ {335545032, -902}, /* 712 wroblrver2 */
{335740929, -901}, /* 1 gfix_db_name */
{335740930, -901}, /* 2 gfix_invalid_sw */
{335740932, -901}, /* 4 gfix_incmp_sw */
Modified: firebird/trunk/src/include/gen/sql_state.h
===================================================================
--- firebird/trunk/src/include/gen/sql_state.h 2012-04-10 01:36:51 UTC (rev 54348)
+++ firebird/trunk/src/include/gen/sql_state.h 2012-04-10 01:38:57 UTC (rev 54349)
@@ -732,6 +732,7 @@
{335545029, "28000"}, // 709 missing_data_structures
{335545030, "42000"}, // 710 protect_sys_tab
{335545031, "2F000"}, // 711 libtommath_generic
+ {335545032, "HY000"}, // 712 wroblrver2
{335740929, "00000"}, // 1 gfix_db_name
{335740930, "00000"}, // 2 gfix_invalid_sw
{335740932, "00000"}, // 4 gfix_incmp_sw
Modified: firebird/trunk/src/msgs/facilities2.sql
===================================================================
--- firebird/trunk/src/msgs/facilities2.sql 2012-04-10 01:36:51 UTC (rev 54348)
+++ firebird/trunk/src/msgs/facilities2.sql 2012-04-10 01:38:57 UTC (rev 54349)
@@ -1,7 +1,7 @@
/* MAX_NUMBER is the next number to be used, always one more than the highest message number. */
set bulk_insert INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUMBER) VALUES (?, ?, ?, ?);
--
-('2012-02-14 22:37:07', 'JRD', 0, 712)
+('2012-03-06 02:21:55', 'JRD', 0, 713)
('2012-01-23 20:10:30', 'QLI', 1, 532)
('2009-07-16 05:26:11', 'GFIX', 3, 121)
('1996-11-07 13:39:40', 'GPRE', 4, 1)
Modified: firebird/trunk/src/msgs/messages2.sql
===================================================================
--- firebird/trunk/src/msgs/messages2.sql 2012-04-10 01:36:51 UTC (rev 54348)
+++ firebird/trunk/src/msgs/messages2.sql 2012-04-10 01:38:57 UTC (rev 54349)
@@ -777,7 +777,7 @@
('no_trusted_spb', NULL, 'svc.cpp', NULL, 0, 667, NULL, 'Use of TRUSTED switches in spb_command_line is prohibited', NULL, NULL)
('package_name', 'check_dependencies', 'dfw.epp', NULL, 0, 668, NULL, 'PACKAGE @1', NULL, NULL);
('cannot_make_not_null', 'check_not_null', 'dfw.epp', NULL, 0, 669, NULL, 'Cannot make field @1 of table @2 NOT NULL because there are NULLs present', NULL, NULL);
-('feature_removed', NULL, '', NULL, 0, 670, NULL, 'Feature @1 is not supported any more', NULL, NULL);
+('feature_removed', NULL, '', NULL, 0, 670, NULL, 'Feature @1 is not supported anymore', NULL, NULL);
('view_name', 'check_dependencies', 'dfw.epp', NULL, 0, 671, NULL, 'VIEW @1', NULL, NULL);
('lock_dir_access', 'createLockDirectory', 'os_utils.cpp', NULL, 0, 672, NULL, 'Can not access lock files directory @1', NULL, NULL);
('invalid_fetch_option', NULL, 'Cursor.cpp', NULL, 0, 673, NULL, 'Fetch option @1 is invalid for a non-scrollable cursor', NULL, NULL);
@@ -819,6 +819,7 @@
('missing_data_structures', NULL, 'server.cpp', NULL, 0, 709, NULL, 'Install incomplete, please read chapter "Initializing security database" in Quick Start Guide', NULL, NULL)
('protect_sys_tab', NULL, 'vio.cpp', NULL, 0, 710, NULL, '@1 operation is not allowed for system table @2', NULL, NULL)
('libtommath_generic', 'check', 'BigInteger.cpp', NULL, 0, 711, NULL, 'Libtommath error code @1 in function @2', NULL, NULL)
+('wroblrver2', NULL, NULL, NULL, 0, 712, NULL, 'unsupported BLR version (expected between @1 and @2, encountered @3)', NULL, NULL);
-- QLI
(NULL, NULL, NULL, NULL, 1, 0, NULL, 'expected type', NULL, NULL);
(NULL, NULL, NULL, NULL, 1, 1, NULL, 'bad block type', NULL, NULL);
Modified: firebird/trunk/src/msgs/system_errors2.sql
===================================================================
--- firebird/trunk/src/msgs/system_errors2.sql 2012-04-10 01:36:51 UTC (rev 54348)
+++ firebird/trunk/src/msgs/system_errors2.sql 2012-04-10 01:38:57 UTC (rev 54349)
@@ -718,6 +718,7 @@
(-902, '42', '000', 0, 710, 'protect_sys_tab', NULL, NULL)
-- If you have better SQL code for this, change it.
(-901, '2F', '000', 0, 711, 'libtommath_generic', NULL, NULL)
+(-902, 'HY', '000', 0, 712, 'wroblrver2', NULL, NULL)
-- GFIX
(-901, '00', '000', 3, 1, 'gfix_db_name', NULL, NULL)
(-901, '00', '000', 3, 2, 'gfix_invalid_sw', NULL, NULL)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
