mirror of
https://github.com/MariaDB/server.git
synced 2026-04-29 11:45:32 +02:00
Merge stella.local:/home2/mydev/mysql-5.1-ateam
into stella.local:/home2/mydev/mysql-5.1-axmrg sql/sql_table.cc: Auto merged
This commit is contained in:
commit
223e57dec3
3 changed files with 29 additions and 1 deletions
|
|
@ -5979,7 +5979,8 @@ view_err:
|
|||
goto err;
|
||||
new_db_type= create_info->db_type;
|
||||
|
||||
if (new_db_type != old_db_type &&
|
||||
if ((new_db_type != old_db_type ||
|
||||
alter_info->flags & ALTER_PARTITION) &&
|
||||
!table->file->can_switch_engines())
|
||||
{
|
||||
my_error(ER_ROW_IS_REFERENCED, MYF(0));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue