bk commit into 5.0 tree (serg:1.1957)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
5.0 repository of serg. When serg 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.1957 05/08/08 20:35:51 serg@stripped +1 -0
  void handler::print_error(): cleanup

  sql/handler.cc
    1.183 05/08/08 20:35:40 serg@stripped +4 -6
    void handler::print_error(): cleanup

# 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:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-5.0

--- 1.182/sql/handler.cc	Sat Jul 30 10:19:50 2005
+++ 1.183/sql/handler.cc	Mon Aug  8 20:35:40 2005
@@ -1660,7 +1660,7 @@ void handler::print_error(int error, myf
   }
   case HA_ERR_NULL_IN_SPATIAL:
     textno= ER_UNKNOWN_ERROR;
-    DBUG_VOID_RETURN;
+    break;
   case HA_ERR_FOUND_DUPP_UNIQUE:
     textno=ER_DUP_UNIQUE;
     break;
@@ -1683,8 +1683,8 @@ void handler::print_error(int error, myf
     textno=ER_CRASHED_ON_REPAIR;
     break;
   case HA_ERR_OUT_OF_MEM:
-    my_message(ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES), errflag);
-    DBUG_VOID_RETURN;
+    textno=ER_OUT_OF_RESOURCES;
+    break;
   case HA_ERR_WRONG_COMMAND:
     textno=ER_ILLEGAL_HA;
     break;
@@ -1695,10 +1695,8 @@ void handler::print_error(int error, myf
     textno=ER_UNSUPPORTED_EXTENSION;
     break;
   case HA_ERR_RECORD_FILE_FULL:
-    textno=ER_RECORD_FILE_FULL;
-    break;
   case HA_ERR_INDEX_FILE_FULL:
-    textno= errno;
+    textno=ER_RECORD_FILE_FULL;
     break;
   case HA_ERR_LOCK_WAIT_TIMEOUT:
     textno=ER_LOCK_WAIT_TIMEOUT;