Commit 7400f10a authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/usr/home/ram/work/4.1.b7643


sql/sql_table.cc:
  Auto merged
parents 38b1f7c7 09ad4efa
Loading
Loading
Loading
Loading
+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);
}