List:Commits« Previous MessageNext Message »
From:msvensson Date:January 17 2006 6:40pm
Subject:bk commit into 4.1 tree (msvensson:1.2476)
View as plain text  
Below is the list of changes that have just been committed into a local
4.1 repository of msvensson. When msvensson 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.2476 06/01/17 19:40:40 msvensson@stripped +1 -0
  Merge msvensson@stripped:/home/msvensson/mysql/bug14634/my41-bug14634
  into  devsrv-b.mysql.com:/space/magnus/my41-bug14634

  sql/sql_select.cc
    1.447 06/01/17 19:40:33 msvensson@stripped +0 -0
    Auto merged

# 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:	msvensson
# Host:	devsrv-b.mysql.com
# Root:	/space/magnus/my41-bug14634/RESYNC

--- 1.446/sql/sql_select.cc	2006-01-10 17:03:51 +01:00
+++ 1.447/sql/sql_select.cc	2006-01-17 19:40:33 +01:00
@@ -5949,21 +5949,19 @@
   }
   if (table)
   {
-    int tmp;
+    int tmp, new_errno= 0;
     if ((tmp=table->file->extra(HA_EXTRA_NO_CACHE)))
     {
       DBUG_PRINT("error",("extra(HA_EXTRA_NO_CACHE) failed"));
-      my_errno= tmp;
-      error= -1;
+      new_errno= tmp;
     }
     if ((tmp=table->file->ha_index_or_rnd_end()))
     {
       DBUG_PRINT("error",("ha_index_or_rnd_end() failed"));
-      my_errno= tmp;
-      error= -1;
+      new_errno= tmp;
     }
-    if (error == -1)
-      table->file->print_error(my_errno,MYF(0));
+    if (new_errno)
+      table->file->print_error(new_errno,MYF(0));
   }
 #ifndef DBUG_OFF
   if (error)
Thread
bk commit into 4.1 tree (msvensson:1.2476)msvensson17 Jan