From: Date: January 25 2006 10:09pm Subject: bk commit into 4.1 tree (sergefp:1.2458) BUG#15935 List-Archive: http://lists.mysql.com/commits/1634 X-Bug: 15935 Message-Id: <20060125210909.6AF2E37B02@newbox.mylan> Below is the list of changes that have just been committed into a local 4.1 repository of psergey. When psergey 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 1.2458 06/01/26 00:09:04 sergefp@stripped +1 -0 BUG#15935: post-review fixes: added comment sql/sql_update.cc 1.153 06/01/26 00:09:01 sergefp@stripped +10 -0 BUG#15935: post-review fixes: added comment # 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: sergefp # Host: newbox.mylan # Root: /home/psergey/mysql-4.1-bug15935 --- 1.152/sql/sql_update.cc 2006-01-25 23:25:19 +03:00 +++ 1.153/sql/sql_update.cc 2006-01-26 00:09:01 +03:00 @@ -243,6 +243,16 @@ DISK_BUFFER_SIZE, MYF(MY_WME))) goto err; + /* + When we get here, we have one of the following options: + A. used_index == MAX_KEY + This means we should use full table scan, and start it with + init_read_record call + B. used_index != MAX_KEY + B.1 quick select is used, start the scan with init_read_record + B.2 quick select is not used, this is full index scan (with LIMIT) + Full index scan must be started with init_read_record_idx + */ if (used_index == MAX_KEY || (select && select->quick)) init_read_record(&info,thd,table,select,0,1); else