firebird-2.5.1-svn-CORE-3610.patch

   1 --- src/jrd/vio.cpp     2011/09/29 03:27:33     53487
   2 +++ jrd/vio.cpp 2011/09/29 07:45:12     53488
   3 @@ -1821,7 +1821,6 @@
   4
   5
   6  bool VIO_get_current(thread_db* tdbb,
   7 -                                       //record_param* old_rpb,
   8                                         record_param* rpb,
   9                                         jrd_tra* transaction,
  10                                         MemoryPool* pool,
  11 @@ -2025,12 +2024,14 @@
  12                         if (rpb->rpb_flags & rpb_deleted)
  13                                 return !foreign_key;
  14
  15 -                       if (rpb->rpb_flags & rpb_uk_modified)
  16 -                                       return !foreign_key;
  17 -
  18 -                       // clear lock error from status vector
  19 -                       fb_utils::init_status(tdbb->tdbb_status_vector);
  20 -                       return true;
  21 +                       if (foreign_key)
  22 +                       {
  23 +                               // clear lock error from status vector
  24 +                               fb_utils::init_status(tdbb->tdbb_status_vector);
  25 +                               return !(rpb->rpb_flags & rpb_uk_modified);
  26 +                       }
  27 +
  28 +                       return !foreign_key;
  29
  30                 case tra_dead:
  31                         if (transaction->tra_attachment->att_flags & ATT_no_cleanup) {
  32