Merged revisions 12266-12267,12270-12271,12273,12275-12276 via svnmerge from

svn+ssh://[email protected]/FPC/svn/fpc/trunk

........
  r12266 | joost | 2008-11-29 11:45:37 +0100 (Sat, 29 Nov 2008) | 1 line
  
   * Because of some logic-error, only deletes were handled by ApplyUpdates
........
  r12276 | joost | 2008-11-29 20:02:37 +0100 (Sat, 29 Nov 2008) | 1 line
  
   * Added missing brackets in r12266
........

git-svn-id: branches/fixes_2_2@12295 -

packages/fcl-db/src/base/bufdataset.pas

@@ -1834,7 +1834,8 @@ begin
     while (r < Length(FUpdateBuffer)) and (Response <> rrAbort) do
       begin
       // If the record is first inserted and afterwards deleted, do nothing
-      if (FUpdateBuffer[r].UpdateKind=ukDelete) and (assigned(FUpdateBuffer[r].OldValuesBuffer)) then
+      if not ((FUpdateBuffer[r].UpdateKind=ukDelete) and not (assigned(FUpdateBuffer[r].OldValuesBuffer))) then
+      if not (FUpdateBuffer[r].UpdateKind=ukDelete) then
         begin
         FCurrentIndex.GotoBookmark(@FUpdateBuffer[r].BookmarkData);
         // Joost: I do not see the use of this resync?