Commit b337e83d authored by ramil@mysql.com's avatar ramil@mysql.com
Browse files

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into  mysql.com:/usr/home/ram/work/4.1.b7643
parents f45d6d3c 815da9cc

sql/sql_table.cc

+3 −1
Original line number Diff line number Diff line
@@ -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);

}