bk commit into 4.1 tree (ramil:1.2474)

[ramil]

Below is the list of changes that have just been committed into a local
4.1 repository of ram. When ram 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.2474 06/05/02 11:33:26 ramil@stripped +1 -0
  Merge rkalimullin@stripped:/home/bk/mysql-4.1
  into  mysql.com:/usr/home/ram/work/4.1.b7643

  sql/sql_table.cc
    1.309 06/05/02 11:33:20 ramil@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:	ramil
# Host:	myoffice.izhnet.ru
# Root:	/usr/home/ram/work/4.1.b7643/RESYNC

--- 1.308/sql/sql_table.cc	2006-04-28 21:15:27 +05:00
+++ 1.309/sql/sql_table.cc	2006-05-02 11:33:20 +05:00
@@ -1706,7 +1706,9 @@ mysql_rename_table(enum db_type base,
     }
   }
   delete file;
-  if (error)
+  if (error == HA_ERR_WRONG_COMMAND)
+    my_error(ER_NOT_SUPPORTED_YET, MYF(0), "ALTER TABLE");
+  else if (error)
     my_error(ER_ERROR_ON_RENAME, MYF(0), from, to, error);
   DBUG_RETURN(error != 0);
 }