bk commit into 4.1 tree (pekka:1.2177) BUG#9865

[pekka]

Below is the list of changes that have just been committed into a local
4.1 repository of pekka. When pekka 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.2177 05/04/13 13:40:53 pekka@stripped +2 -0
  ndb - bug#9865 fix error message

  ndb/src/ndbapi/ndberror.c
    1.22 05/04/13 13:39:26 pekka@stripped +2 -0
    error message

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.50 05/04/13 13:39:26 pekka@stripped +2 -2
    error message

# 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:	pekka
# Host:	clam.ndb.mysql.com
# Root:	/export/space/pekka/ndb/version/my41

--- 1.49/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2005-02-06 10:00:26 +01:00
+++ 1.50/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2005-04-13 13:39:26 +02:00
@@ -7554,13 +7554,13 @@
 
   ndbrequire(max_rows > 0 && max_rows <= MAX_PARALLEL_OP_PER_SCAN);
   if (!getFragmentrec(signal, fragId)) {
-    errorCode = __LINE__;
+    errorCode = 1231;
     goto error_handler;
   }//if
 
   // Verify scan type vs table type (both sides are boolean)
   if (rangeScan != DictTabInfo::isOrderedIndex(fragptr.p->tableType)) {
-    errorCode = __LINE__;       // XXX fix
+    errorCode = 1232;
     goto error_handler;
   }//if
   

--- 1.21/ndb/src/ndbapi/ndberror.c	2004-12-17 10:32:23 +01:00
+++ 1.22/ndb/src/ndbapi/ndberror.c	2005-04-13 13:39:26 +02:00
@@ -320,6 +320,8 @@
   { 1226, SE, "Table is being dropped" },
   { 1228, SE, "Cannot use drop table for drop index" },
   { 1229, SE, "Too long frm data supplied" },
+  { 1231, SE, "Invalid table or index to scan" },
+  { 1232, SE, "Invalid table or index to scan" },
 
   /**
    * FunctionNotImplemented