bk commit into 5.1 tree (stewart:1.2229) BUG#19914

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart 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.2229 06/07/04 11:02:41 stewart@stripped +1 -0
  BUG#19914 cluster: select count(*) can return MAX_INT on temp failure
  
  fix for 5.1 with handler changes

  sql/ha_ndbcluster.cc
    1.347 06/07/04 11:02:26 stewart@stripped +1 -4
    return correct error code on error

# 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:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.1/bug19914

--- 1.346/sql/ha_ndbcluster.cc	2006-06-30 06:13:09 +10:00
+++ 1.347/sql/ha_ndbcluster.cc	2006-07-04 11:02:26 +10:00
@@ -432,10 +432,7 @@
   }
   else
   {
-    /**
-     * Be consistent with BUG#19914 until we fix it properly
-     */
-    DBUG_RETURN(-1);
+    DBUG_RETURN(HA_POS_ERROR);
   }
 
   THD *thd= current_thd;