bk commit into 6.0-falcon tree (chris:1.2575) BUG#29240

[cpowers]

Below is the list of changes that have just been committed into a local
6.0-falcon repository of chris. When chris does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-06-28 16:36:15-05:00, chris@stripped +2 -0
  Bug#29240, "Falcon: duplicate-key error"
  
  Adjusted logic in Table::checkUniqueIndexes() to ignore older record
  versions once a deleted but committed record version is detected.

  BitKeeper/etc/ignore@stripped, 2007-06-28 16:36:13-05:00, chris@stripped +1 -0
    Added sql/cwp2 to the ignore list

  storage/falcon/Table.cpp@stripped, 2007-06-28 16:36:13-05:00, chris@stripped +4 -0
    To avoid incorrect duplicate key errors, checkUniqueIndexes
    was modified to ignore older record versions once a deleted
    and committed record version is detected.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	chris
# Host:	terrazzo.site
# Root:	/home/chris/work/dev/dev-9/mysql-5.1-falcon

--- 1.124/storage/falcon/Table.cpp	2007-06-25 16:38:53 -05:00
+++ 1.125/storage/falcon/Table.cpp	2007-06-28 16:36:13 -05:00
@@ -2117,6 +2117,10 @@
 							if (state == CommittedAndOlder || state == Us)
 								break;
 
+							if (transaction->isolationLevel == TRANSACTION_REPEATABLE_READ)
+								if (state == CommittedButYounger)
+									foundFirstCommitted = true;
+								
 							continue;   // Deletion is still pending, keep looking for a dup.
 							}
 

--- 1.273/BitKeeper/etc/ignore	2007-06-25 16:37:59 -05:00
+++ 1.274/BitKeeper/etc/ignore	2007-06-28 16:36:13 -05:00
@@ -3013,3 +3013,4 @@
 win/vs8cache.txt
 zlib/*.ds?
 zlib/*.vcproj
+sql/cwp2