Hello community,

here is the log from the commit of package firebird for openSUSE:Leap:15.2 
checked in at 2020-03-06 12:36:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/firebird (Old)
 and      /work/SRC/openSUSE:Leap:15.2/.firebird.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "firebird"

Fri Mar  6 12:36:03 2020 rev:18 rq:781914 version:3.0.4.33054

Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/firebird/firebird.changes      2020-01-15 
14:55:07.241578509 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.firebird.new.26092/firebird.changes   
2020-03-06 12:36:10.542571134 +0100
@@ -1,0 +2,62 @@
+Wed Nov 21 07:39:56 UTC 2018 - [email protected]
+
+- update to upstream version 3.0.4
+  * add support for SRP authentication using SHA-256
+  * ODS (database file format) version raised to 12.2 on some
+    architectures (including i586, not x86_64); new version will be
+    able to open existing ODS 12.0 created on the same architecture
+    but for database transfer between architectures, backup/restore
+    is always recommended
+  * context variables WIRE_COMPRESSED and WIRE_ENCRYPTED were added
+    to the SYSTEM namespace to report compression and encryption
+    status, respectively, of the current connection (CORE-5913)
+  * enhanced reporting of errors when dynamic library fails to load
+    (CORE-5908)
+  * include funciton name when UDF causes "Arithmetic exception,
+    numeric overflow, or string truncation" error (CORE-5876)
+  * context variables LOCALTIME and LOCALTIMESTAMP (synonyms for
+    CURRENT_TIME and CURRENT_TIMESTAMP) for compatibility with 4.0
+    (CORE-5853)
+  * read-only restriction for system tables was relaxed to permit
+    CREATE, ALTER and DROP operations on their indexes (CORE-5746)
+  * fix unauthorized BLOB access vulnerability (CORE-5801)
+  * for a full list of bugfixes and improvements see
+    
http://www.firebirdsql.org/file/documentation/release_notes/html/en/3_0/rnfb30-general.html#rnfb30-general-v304
+- drop patches included in new upstream release:
+  Make-it-build-with-icu60.patch
+  An-attempt-to-fix-CORE-5764-need-feedback-on-snapsho.patch
+  Fixed-a-code-somewhy-accepted-by-gcc6.patch
+- refresh patches:
+  work-around-g-problem-in-SLE11.patch
+  use-C-98-on-SLE11.patch
+
+-------------------------------------------------------------------
+Wed Jul  4 11:44:02 UTC 2018 - [email protected]
+
+- replace unicode-handle-the-ICU-version-hack-from-SuSE.patch
+  with more general upstream solution:
+  * An-attempt-to-fix-CORE-5764-need-feedback-on-snapsho.patch
+  * Fixed-a-code-somewhy-accepted-by-gcc6.patch
+- unicode-handle-new-SUSE-ICU-version-hack.patch:
+  search also for "suse%d.%d" soname pattern to fix build after
+  upcoming ICU update (bsc#1095425)
+
+-------------------------------------------------------------------
+Wed Mar 28 06:54:09 UTC 2018 - [email protected]
+
+- move firebitd.xinetd back to firebird-server subpackage on SLE15
+- provide /etc/xinetd.d directory on Tumbleweed and Leap 15.0 as
+  xinetd is no longer guaranteed to be present there; this solution
+  (suggested by Dimstar) is less painful than either having
+  firebird-server depend on xinetd or splitting a new subpackage
+  firebird-server-classic.
+
+-------------------------------------------------------------------
+Fri Mar 23 11:32:28 UTC 2018 - [email protected]
+
+- patch xinetd config file unconditionally; previous change would
+  result in unpatched xinetd config file installed on Tumbleweed
+  so that the service would be enabled by default and firebird
+  binary run as root
+
+-------------------------------------------------------------------
@@ -4,2 +66,40 @@
-- Move xinetd file to /usr/share/misc/firebird on SLE15/Leap15/TW
-  (bsc#1084459).
+- Do no ship xinetd file on SLE15 (bsc#1084459).
+
+-------------------------------------------------------------------
+Sat Mar  3 17:51:56 UTC 2018 - [email protected]
+
+- update to upstream version 3.0.3
+  * fix conflicting constants; programs using * fb_info_crypt_state
+    constant must be recompiled
+  * provide crypto key name via fb_info_crypt_key item in
+    Attachment::getInfo()
+  * improve handling of concurrent ALTER DATABASE statements
+  * make sure ORDER BY with equivalent expressions are equivalent
+    and use the same plan
+  * avoid serialization of isc_attach_database calls issued by
+    EXECUTE STATEMENT
+  * show date and time of analysis in gstat output
+  * show database info in sweep error message
+  * provide compression details and encryption status of the
+    connection in Attachment::getInfo() API call
+  * fix RDB$RELATION_TYPE when restoring ODS < 11.1 database
+  * the optimizer can now estimate the actual record compression
+    ratio
+  * various performance improvements
+  * various bug fixes, for a list, see release notes at
+    
http://www.firebirdsql.org/file/documentation/release_notes/html/en/3_0/rnfb30-bug.html
+- drop patches included in new upstream version:
+  Backported-fix-for-CORE-5549-Errors-building-running.patch
+  Backported-fix-for-CORE-5562-Firebird-crashes-when-U.patch
+  Fixed-CORE-5567-Direct-system-table-modifications-ar.patch
+  Make-the-generated-code-compatible-with-gcc-6-in-C-1.patch
+  Workaround-for-CORE-5566-Server-crashes-while-restor.patch
+- unicode-handle-the-ICU-version-hack-from-SuSE.patch:
+  rework to handle ICU >= 60 (as many versions as upstream)
+- drop firebird-icu60.patch
+  obsoleted by update of the unicode patch
+- Make-it-build-with-icu60.patch
+  upstream post-3.0.3 commit for ICU >= 59 compatibility
+- use-C-98-on-SLE11.patch
+  compatibility patch for SLE11 where gcc 4.3 does not support
+  -stc=gnu++03 (applied only on SLE11)

Old:
----
  Backported-fix-for-CORE-5549-Errors-building-running.patch
  Backported-fix-for-CORE-5562-Firebird-crashes-when-U.patch
  Firebird-3.0.2.32703-0.tar.xz
  Fixed-CORE-5567-Direct-system-table-modifications-ar.patch
  Make-the-generated-code-compatible-with-gcc-6-in-C-1.patch
  Workaround-for-CORE-5566-Server-crashes-while-restor.patch
  firebird-icu60.patch
  unicode-handle-the-ICU-version-hack-from-SuSE.patch

New:
----
  Firebird-3.0.4.33054-0.tar.xz
  unicode-handle-new-SUSE-ICU-version-hack.patch
  use-C-98-on-SLE11.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ firebird.spec ++++++
--- /var/tmp/diff_new_pack.ssXIdC/_old  2020-03-06 12:36:11.322571608 +0100
+++ /var/tmp/diff_new_pack.ssXIdC/_new  2020-03-06 12:36:11.326571610 +0100
@@ -19,7 +19,7 @@
 %define up_stage 0
 
 Name:           firebird
-Version:        3.0.2.32703
+Version:        3.0.4.33054
 Release:        0
 Summary:        Database system (common files)
 License:        SUSE-IDPL-1.0 AND SUSE-IBPL-1.0
@@ -46,20 +46,15 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %endif
 
-Patch2:         fbguard-allow-creating-a-guard-pidfile.patch
-Patch3:         use-killproc-in-stop-branch-of-SuSE-init-script.patch
-Patch4:         disable-xinetd-service-by-default.patch
-Patch5:         add-pkgconfig-files.patch
-Patch6:         unicode-handle-the-ICU-version-hack-from-SuSE.patch
-Patch7:         Make-the-generated-code-compatible-with-gcc-6-in-C-1.patch
-Patch8:         Provide-sized-global-delete-operators-when-compiled-.patch
-Patch9:         Backported-fix-for-CORE-5549-Errors-building-running.patch
-Patch10:        Backported-fix-for-CORE-5562-Firebird-crashes-when-U.patch
-Patch11:        Workaround-for-CORE-5566-Server-crashes-while-restor.patch
-Patch12:        Fixed-CORE-5567-Direct-system-table-modifications-ar.patch
-Patch13:        firebird-icu60.patch
-# work around a problem with old g++
+Patch1:         fbguard-allow-creating-a-guard-pidfile.patch
+Patch2:         use-killproc-in-stop-branch-of-SuSE-init-script.patch
+Patch3:         disable-xinetd-service-by-default.patch
+Patch4:         add-pkgconfig-files.patch
+Patch5:         Provide-sized-global-delete-operators-when-compiled-.patch
+Patch6:         unicode-handle-new-SUSE-ICU-version-hack.patch
+# work around problems with old g++
 Patch91:        work-around-g-problem-in-SLE11.patch
+Patch92:        use-C-98-on-SLE11.patch
 
 %description
 This package provides common files needed by both client and server
@@ -80,22 +75,17 @@
     exit 1
 fi
 # --
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
 # --
 # work around a problem with old g++
 %if 0%{?suse_version} < 1140
 %patch91 -p1
+%patch92 -p1
 %endif
 
 %build
@@ -152,7 +142,7 @@
 chmod -R u+w .%{_docdir}/%{name}
 rm -vf .%{_datadir}/%{name}/misc/firebird.init.*
 rm -vf .%{_datadir}/%{name}/misc/rc.config.firebird
-%if 0%{?suse_version} < 1500
+%if 0%{?suse_version} < 1500 || 0%{?is_opensuse}
 mkdir -p .%{_sysconfdir}/xinetd.d
 mv -v .%{_datadir}/%{name}/misc/firebird.xinetd \
   .%{_sysconfdir}/xinetd.d/%{name}
@@ -179,7 +169,7 @@
 %{_libdir}/%{name}/lib
 %{_libdir}/%{name}/plugins/libEngine12.so
 %{_datadir}/%{name}/misc
-%if 0%{?suse_version} >= 1500
+%if 0%{?suse_version} >= 1500 && !0%{?is_opensuse}
 %exclude %{_datadir}/%{name}/misc/firebird.xinetd
 %endif
 %{_docdir}/%{name}/IDPLicense.txt
@@ -231,7 +221,10 @@
 %config(noreplace) %{_sysconfdir}/%{name}/fbtrace.conf
 %config(noreplace) %{_sysconfdir}/%{name}/plugins.conf
 %config(noreplace) %{_sysconfdir}/%{name}/firebird.conf.d/50-server.conf
-%if 0%{?suse_version} < 1500
+%if 0%{?suse_version} < 1500 || 0%{?is_opensuse}
+%if 0%{?suse_version} >= 1500
+%dir %{_sysconfdir}/xinetd.d
+%endif
 %config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
 %else
 %{_datadir}/%{name}/misc/firebird.xinetd

++++++ Firebird-3.0.2.32703-0.tar.xz -> Firebird-3.0.4.33054-0.tar.xz ++++++
/work/SRC/openSUSE:Leap:15.2/firebird/Firebird-3.0.2.32703-0.tar.xz 
/work/SRC/openSUSE:Leap:15.2/.firebird.new.26092/Firebird-3.0.4.33054-0.tar.xz 
differ: char 25, line 1

++++++ unicode-handle-new-SUSE-ICU-version-hack.patch ++++++
From: Michal Kubecek <[email protected]>
Date: Wed, 4 Jul 2018 13:36:57 +0200
Subject: unicode: handle new SUSE ICU version hack
Patch-mainline: Never, SUSE specific
References: bsc#1095425

Right after upstream adopted changes allowing compatibility with the way
openSUSE names ICU libraries, openSUSE came with another hack: to
distinguish ICU libraries built with U_CHARSET_IS_UTF8=0 from those built
with upstream default (1), openSUSE packages added "suse" to soname as
the change affects library ABI.

Add "suse%d.%d" to soname patterns tested when searching for ICU libraries.
---
 src/common/unicode_util.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/src/common/unicode_util.cpp
+++ b/src/common/unicode_util.cpp
@@ -343,7 +343,7 @@ static ModuleLoader::Module* formatAndLoad(const char* 
templateName,
        // ICU has several schemas for placing version into file name
        const char* patterns[] =
        {
-               "%d", "%d_%d", "%d%d", NULL
+               "suse%d.%d", "%d", "%d_%d", "%d%d", NULL
        };
 
        PathName s, filename;
++++++ use-C-98-on-SLE11.patch ++++++
From: Michal Kubecek <[email protected]>
Date: Sat, 3 Mar 2018 17:45:37 +0100
Subject: use C++98 on SLE11
Patch-mainline: Never, SLE11 compatibility hack

The gcc version in SLE11 (4.3) doesn't recognize -std=gnu++03 yet. Use
older gnu++98 (C++98 with GNU extensions) instead.
---
 builds/posix/prefix.linux         | 2 +-
 builds/posix/prefix.linux_amd64   | 2 +-
 builds/posix/prefix.linux_generic | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- a/builds/posix/prefix.linux
+++ b/builds/posix/prefix.linux
@@ -19,7 +19,7 @@
 # 2 Oct 2002, Nickolay Samofatov - Major cleanup
 
 COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC 
-fmessage-length=0 -fno-delete-null-pointer-checks
-CXXFLAGS=-std=gnu++03
+CXXFLAGS=-std=gnu++98
 OPTIMIZE_FLAGS=-O3 -march=i586 -mtune=i686 -fno-omit-frame-pointer
 WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas 
-Wno-unused-variable -Wno-narrowing
 
--- a/builds/posix/prefix.linux_amd64
+++ b/builds/posix/prefix.linux_amd64
@@ -19,7 +19,7 @@
 # 2 Oct 2002, Nickolay Samofatov - Major cleanup
 
 COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD 
-fPIC -fmessage-length=0 -fno-delete-null-pointer-checks
-CXXFLAGS=-std=gnu++03
+CXXFLAGS=-std=gnu++98
 OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer
 WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas 
-Wno-unused-variable -Wno-invalid-offsetof -Wno-narrowing 
-Wno-unused-local-typedefs
 
--- a/builds/posix/prefix.linux_generic
+++ b/builds/posix/prefix.linux_generic
@@ -19,7 +19,7 @@
 # 2 Oct 2002, Nickolay Samofatov - Major cleanup
 
 COMMON_FLAGS=-DLINUX -pipe -MMD -fPIC -DFB_SEND_FLAGS=MSG_NOSIGNAL 
-fno-delete-null-pointer-checks
-CXXFLAGS=-std=gnu++03
+CXXFLAGS=-std=gnu++98
 
 PROD_FLAGS=-ggdb -O3 $(COMMON_FLAGS)
 DEV_FLAGS=-ggdb -p -Wall -Wno-switch $(COMMON_FLAGS) -Wno-non-virtual-dtor
++++++ work-around-g-problem-in-SLE11.patch ++++++
--- /var/tmp/diff_new_pack.ssXIdC/_old  2020-03-06 12:36:11.402571657 +0100
+++ /var/tmp/diff_new_pack.ssXIdC/_new  2020-03-06 12:36:11.402571657 +0100
@@ -18,11 +18,9 @@
  src/jrd/constants.h              |  2 +-
  src/jrd/trace/TraceObjects.h     |  4 ++--
  src/yvalve/YObjects.h            |  2 +-
- src/yvalve/why.cpp               | 18 +++++++++---------
- 8 files changed, 22 insertions(+), 22 deletions(-)
+ src/yvalve/why.cpp               | 19 ++++++++++---------
+ 8 files changed, 23 insertions(+), 22 deletions(-)
 
-diff --git a/src/common/StatusHolder.h b/src/common/StatusHolder.h
-index e2d444f5192f..398076640779 100644
 --- a/src/common/StatusHolder.h
 +++ b/src/common/StatusHolder.h
 @@ -141,7 +141,7 @@ class DynamicStatusVector : public 
DynamicVector<ISC_STATUS_LENGTH>
@@ -43,11 +41,9 @@
        { }
  
        ISC_STATUS save(IStatus* status);
-diff --git a/src/common/classes/alloc.cpp b/src/common/classes/alloc.cpp
-index 16cc6d39b018..26def6855f47 100644
 --- a/src/common/classes/alloc.cpp
 +++ b/src/common/classes/alloc.cpp
-@@ -407,7 +407,7 @@ public:
+@@ -424,7 +424,7 @@ public:
        {
                MemBlock* rc = new(memory) MemBlock(size);
  
@@ -56,7 +52,7 @@
  
                return rc;
        }
-@@ -443,7 +443,7 @@ private:
+@@ -460,7 +460,7 @@ private:
  
  public:
        MemMediumHunk(MemMediumHunk** top, size_t spaceAllocated)
@@ -65,7 +61,7 @@
                  prev(NULL),
                  useCount(0)
        {
-@@ -470,7 +470,7 @@ public:
+@@ -487,7 +487,7 @@ public:
        {
                MemBlock* rc = new(memory) MemBlock(size, this);
  
@@ -74,8 +70,6 @@
                incrUsage();
  
                return rc;
-diff --git a/src/include/firebird/Interface.h 
b/src/include/firebird/Interface.h
-index 57f0a90e5c81..3a65bba0124b 100644
 --- a/src/include/firebird/Interface.h
 +++ b/src/include/firebird/Interface.h
 @@ -243,7 +243,7 @@ namespace Firebird
@@ -96,26 +90,22 @@
                {
                }
  
-diff --git a/src/jrd/Mapping.cpp b/src/jrd/Mapping.cpp
-index a2008f580e64..21ab7dda607f 100644
 --- a/src/jrd/Mapping.cpp
 +++ b/src/jrd/Mapping.cpp
-@@ -881,11 +881,11 @@ class DbHandle : public AutoPtr<IAttachment, 
SimpleRelease<IAttachment> >
+@@ -895,11 +895,11 @@ class DbHandle : public AutoPtr<IAttachment, 
SimpleRelease>
  {
  public:
        DbHandle()
 -              : AutoPtr()
-+              : AutoPtr<IAttachment, SimpleRelease<IAttachment> >()
++              : AutoPtr<IAttachment, SimpleRelease>()
        { }
  
        DbHandle(IAttachment* att)
 -              : AutoPtr(att)
-+              : AutoPtr<IAttachment, SimpleRelease<IAttachment> >(att)
++              : AutoPtr<IAttachment, SimpleRelease>(att)
        {
                if (att)
                        att->addRef();
-diff --git a/src/jrd/constants.h b/src/jrd/constants.h
-index 78742e9ac76d..6b8f99ffbf86 100644
 --- a/src/jrd/constants.h
 +++ b/src/jrd/constants.h
 @@ -444,7 +444,7 @@ const int DDL_TRIGGER_DROP_MAPPING                         
= 47;
@@ -127,8 +117,6 @@
  
  // Number of streams, conjuncts, indices that will be statically allocated
  // in various arrays. Larger numbers will have to be allocated dynamically
-diff --git a/src/jrd/trace/TraceObjects.h b/src/jrd/trace/TraceObjects.h
-index 5bfce6c3b7c5..bf6f42ba9dc9 100644
 --- a/src/jrd/trace/TraceObjects.h
 +++ b/src/jrd/trace/TraceObjects.h
 @@ -143,7 +143,7 @@ class TraceBLRStatementImpl : public 
BLRPrinter<TraceBLRStatementImpl>
@@ -149,33 +137,30 @@
        {}
  
        ISC_INT64 getStmtID()           { return 0; }
-diff --git a/src/yvalve/YObjects.h b/src/yvalve/YObjects.h
-index 346b9e98a84e..b508109f3b1c 100644
 --- a/src/yvalve/YObjects.h
 +++ b/src/yvalve/YObjects.h
-@@ -253,7 +253,7 @@ public:
+@@ -286,7 +286,7 @@ public:
  
  private:
        YTransaction(YTransaction* from)
 -              : YHelper(from->next),
 +              : YHelper<YTransaction, 
Firebird::ITransactionImpl<YTransaction, Firebird::CheckStatusWrapper> 
>(from->next),
-                 attachment(from->attachment),
+                 attachment(from->attachment.get()),
                  childBlobs(getPool()),
                  childCursors(getPool()),
-diff --git a/src/yvalve/why.cpp b/src/yvalve/why.cpp
-index ecdf018bc34b..e9564e399303 100644
 --- a/src/yvalve/why.cpp
 +++ b/src/yvalve/why.cpp
-@@ -3848,7 +3848,7 @@ YHelper<Impl, Intf>::YHelper(NextInterface* aNext)
+@@ -3751,7 +3751,8 @@ YHelper<Impl, Intf>::YHelper(NextInterface* aNext)
  
  
  YEvents::YEvents(YAttachment* aAttachment, IEvents* aNext, IEventCallback* 
aCallback)
--      : YHelper(aNext)
-+      : YHelper<YEvents, Firebird::IEventsImpl<YEvents, 
Firebird::CheckStatusWrapper> >(aNext)
- {
-       attachment = aAttachment;
-       callback = aCallback;
-@@ -3905,7 +3905,7 @@ void YEvents::cancel(CheckStatusWrapper* status)
+-      : YHelper(aNext), attachment(aAttachment), callback(aCallback)
++      : YHelper<YEvents, Firebird::IEventsImpl<YEvents, 
Firebird::CheckStatusWrapper> >(aNext),
++        attachment(aAttachment), callback(aCallback)
+ {
+       aAttachment->childEvents.add(this);
+ }
+@@ -3809,7 +3810,7 @@ void YEvents::cancel(CheckStatusWrapper* status)
  
  
  YRequest::YRequest(YAttachment* aAttachment, IRequest* aNext)
@@ -184,7 +169,7 @@
          attachment(aAttachment),
          userHandle(NULL)
  {
-@@ -4045,7 +4045,7 @@ void YRequest::free(CheckStatusWrapper* status)
+@@ -3950,7 +3951,7 @@ void YRequest::free(CheckStatusWrapper* status)
  
  
  YBlob::YBlob(YAttachment* aAttachment, YTransaction* aTransaction, IBlob* 
aNext)
@@ -193,7 +178,7 @@
          attachment(aAttachment),
          transaction(aTransaction)
  {
-@@ -4169,7 +4169,7 @@ int YBlob::seek(CheckStatusWrapper* status, int mode, 
int offset)
+@@ -4076,7 +4077,7 @@ int YBlob::seek(CheckStatusWrapper* status, int mode, 
int offset)
  
  
  YStatement::YStatement(YAttachment* aAttachment, IStatement* aNext)
@@ -201,8 +186,8 @@
 +      : YHelper<YStatement, Firebird::IStatementImpl<YStatement, 
Firebird::CheckStatusWrapper> >(aNext),
          attachment(aAttachment), cursor(NULL), input(true), output(false)
  {
-       attachment->childStatements.add(this);
-@@ -4436,7 +4436,7 @@ void YStatement::free(CheckStatusWrapper* status)
+       attachment.get()->childStatements.add(this);
+@@ -4464,7 +4465,7 @@ FB_BOOLEAN IscStatement::fetch(CheckStatusWrapper* 
status, IMessageMetadata* out
  
  
  YResultSet::YResultSet(YAttachment* anAttachment, YTransaction* aTransaction, 
IResultSet* aNext)
@@ -211,7 +196,7 @@
          attachment(anAttachment),
          transaction(aTransaction),
          statement(NULL)
-@@ -4447,7 +4447,7 @@ YResultSet::YResultSet(YAttachment* anAttachment, 
YTransaction* aTransaction, IR
+@@ -4475,7 +4476,7 @@ YResultSet::YResultSet(YAttachment* anAttachment, 
YTransaction* aTransaction, IR
  
  YResultSet::YResultSet(YAttachment* anAttachment, YTransaction* aTransaction,
                        YStatement* aStatement, IResultSet* aNext)
@@ -220,7 +205,7 @@
          attachment(anAttachment),
          transaction(aTransaction),
          statement(aStatement)
-@@ -4673,7 +4673,7 @@ void YResultSet::close(CheckStatusWrapper* status)
+@@ -4701,7 +4702,7 @@ void YResultSet::close(CheckStatusWrapper* status)
  
  
  YTransaction::YTransaction(YAttachment* aAttachment, ITransaction* aNext)
@@ -229,7 +214,7 @@
          attachment(aAttachment),
          childBlobs(getPool()),
          childCursors(getPool()),
-@@ -4936,7 +4936,7 @@ YTransaction* YTransaction::enterDtc(CheckStatusWrapper* 
status)
+@@ -4960,7 +4961,7 @@ YTransaction* YTransaction::enterDtc(CheckStatusWrapper* 
status)
  
  
  YAttachment::YAttachment(IProvider* aProvider, IAttachment* aNext, const 
PathName& aDbPath)
@@ -238,7 +223,7 @@
          provider(aProvider),
          dbPath(getPool(), aDbPath),
          childBlobs(getPool()),
-@@ -5509,7 +5509,7 @@ void YAttachment::getNextTransaction(CheckStatusWrapper* 
status, ITransaction* t
+@@ -5538,7 +5539,7 @@ void YAttachment::getNextTransaction(CheckStatusWrapper* 
status, ITransaction* t
  
  
  YService::YService(IProvider* aProvider, IService* aNext, bool utf8)
@@ -247,6 +232,3 @@
          provider(aProvider),
          utf8Connection(utf8)
  {
--- 
-2.10.0
-


Reply via email to