bk commit into 5.0 tree (andrey:1.1964) BUG#12207

[ahristov]

Below is the list of changes that have just been committed into a local
5.0 repository of andrey. When andrey 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.1964 05/08/08 22:15:37 andrey@lmy004. +2 -0
  fix for bug #12207 (post review)  
  "alter table ... discard table space on MyISAM table causes ERROR 2013"

  sql/sql_table.cc
    1.269 05/08/08 22:15:29 andrey@lmy004. +4 -6
    post review fixes

  sql/share/errmsg.txt
    1.40 05/08/08 22:15:28 andrey@lmy004. +0 -2
    no need of this 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:	andrey
# Host:	lmy004.
# Root:	/home/andrey/mysql-5.0-bug12207

--- 1.268/sql/sql_table.cc	2005-08-08 16:49:30 +02:00
+++ 1.269/sql/sql_table.cc	2005-08-08 22:15:29 +02:00
@@ -2798,10 +2798,8 @@
   thd->proc_info="end";
 
   if (error)
-  {
-    my_error(ER_UNSUPPORTED_ENGINE_OPERATION, MYF(0));
     goto err;
-  }
+
   /*
     The 0 in the call below means 'not in a transaction', which means
     immediate invalidation; that is probably what we wish here
@@ -2822,15 +2820,15 @@
 err:
   close_thread_tables(thd);
   thd->tablespace_op=FALSE;
+  
   if (error == 0)
   {
     send_ok(thd);
     DBUG_RETURN(0);
   }
 
-  if (error == HA_ERR_ROW_IS_REFERENCED)
-    my_error(ER_ROW_IS_REFERENCED, MYF(0));
-  
+  table->file->print_error(error, MYF(0));
+    
   DBUG_RETURN(-1);
 }
 

--- 1.39/sql/share/errmsg.txt	2005-08-08 16:56:44 +02:00
+++ 1.40/sql/share/errmsg.txt	2005-08-08 22:15:28 +02:00
@@ -5391,5 +5391,3 @@
 ER_WARN_CANT_DROP_DEFAULT_KEYCACHE
 	eng "Cannot drop default keycache"
         ger "Der Default-Keycache kann nicht gelöscht werden"
-ER_UNSUPPORTED_ENGINE_OPERATION
-	end "Operation not supported by this table handler"