From: Claudio V. C. <ro...@us...> - 2010-01-30 09:58:12
|
Build Version : T3.0.0.27505 Firebird 3.0 Unstable (writeBuildNum.sh,v 1.27678 2010/01/30 09:58:02 robocop Exp ) Update of /cvsroot/firebird/firebird2/src/jrd In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv6432/src/jrd Modified Files: dfw.epp dfw_proto.h met.epp pcmet.epp pcmet_proto.h Log Message: Misc. Index: dfw.epp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/dfw.epp,v retrieving revision 1.321 retrieving revision 1.322 diff -b -U3 -r1.321 -r1.322 --- dfw.epp 26 Jan 2010 08:29:03 -0000 1.321 +++ dfw.epp 30 Jan 2010 09:58:01 -0000 1.322 @@ -483,7 +483,7 @@ }; -USHORT DFW_assign_index_type(thread_db* tdbb, const Firebird::string& name, SSHORT field_type, +USHORT DFW_assign_index_type(thread_db* tdbb, const Firebird::MetaName& name, SSHORT field_type, SSHORT ttype) { /************************************** Index: dfw_proto.h =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/dfw_proto.h,v retrieving revision 1.23 retrieving revision 1.24 diff -b -U3 -r1.23 -r1.24 --- dfw_proto.h 11 Nov 2009 15:12:56 -0000 1.23 +++ dfw_proto.h 30 Jan 2010 09:58:01 -0000 1.24 @@ -31,7 +31,7 @@ enum dfw_t; } -USHORT DFW_assign_index_type(Jrd::thread_db*, const Firebird::string&, SSHORT, SSHORT); +USHORT DFW_assign_index_type(Jrd::thread_db*, const Firebird::MetaName&, SSHORT, SSHORT); void DFW_delete_deferred(Jrd::jrd_tra*, SLONG); Firebird::SortedArray<int>& DFW_get_ids(Jrd::DeferredWork* work); void DFW_merge_work(Jrd::jrd_tra*, SLONG, SLONG); Index: met.epp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/met.epp,v retrieving revision 1.322 retrieving revision 1.323 diff -b -U3 -r1.322 -r1.323 --- met.epp 27 Jan 2010 04:32:26 -0000 1.322 +++ met.epp 30 Jan 2010 09:58:01 -0000 1.323 @@ -4199,11 +4199,11 @@ Firebird::string key((char*) &type, sizeof(type)); int len = name.identifier.length(); key.append((char*) &len, sizeof(len)); - key.append(name.identifier.c_str()); + key.append(name.identifier.c_str(), len); len = name.package.length(); key.append((char*) &len, sizeof(len)); - key.append(name.package.c_str()); + key.append(name.package.c_str(), len); DSqlCacheItem* item = attachment->att_dsql_cache.put(key); if (item) Index: pcmet.epp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/pcmet.epp,v retrieving revision 1.66 retrieving revision 1.67 diff -b -U3 -r1.66 -r1.67 --- pcmet.epp 26 Jan 2010 08:29:03 -0000 1.66 +++ pcmet.epp 30 Jan 2010 09:58:01 -0000 1.67 @@ -54,7 +54,7 @@ DATABASE DB = FILENAME "ODS.RDB"; -void PCMET_expression_index(thread_db* tdbb, const string& name, USHORT id, jrd_tra* transaction) +void PCMET_expression_index(thread_db* tdbb, const MetaName& name, USHORT id, jrd_tra* transaction) { /************************************** * Index: pcmet_proto.h =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/pcmet_proto.h,v retrieving revision 1.14 retrieving revision 1.15 diff -b -U3 -r1.14 -r1.15 --- pcmet_proto.h 30 Sep 2009 01:10:10 -0000 1.14 +++ pcmet_proto.h 30 Jan 2010 09:58:01 -0000 1.15 @@ -33,7 +33,7 @@ struct index_desc; } -void PCMET_expression_index(Jrd::thread_db*, const Firebird::string&, USHORT, Jrd::jrd_tra*); +void PCMET_expression_index(Jrd::thread_db*, const Firebird::MetaName&, USHORT, Jrd::jrd_tra*); void PCMET_lookup_index(Jrd::thread_db*, Jrd::jrd_rel*, Jrd::index_desc*); #endif // JRD_PCMET_PROTO_H |