database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

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

Browse Source 
into  mysql.com:/space/pekka/ndb/version/my50


mysql-test/r/ndb_blob.result:
  Auto merged
mysql-test/t/ndb_blob.test:
  Auto merged
ndb/include/kernel/signaldata/TcKeyReq.hpp:
  Auto merged
ndb/include/ndbapi/NdbBlob.hpp:
  Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
sql/sql_table.cc:
  Auto merged
ndb/tools/delete_all.cpp:
  nuts
This commit is contained in:
unknown
2006-05-03 23:17:16 +02:00
parent b0ecf7046b 6b02ec1caa
commit b5732e7c8c
8 changed files with 86 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_table.cc
View File

@@ -1941,7 +1941,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);
}