diff options
| author | unknown <istruewing@stella.local> | 2007-12-11 23:57:57 +0100 |
|---|---|---|
| committer | unknown <istruewing@stella.local> | 2007-12-11 23:57:57 +0100 |
| commit | 223e57dec3d634e447094dc9125fe719d3794b1d (patch) | |
| tree | ae9b9524f1a4d88f37a9ca36977d3587dc3dd027 /sql/sql_table.cc | |
| parent | 961e5d3dc79f6d0c49d956080b67680109ad602a (diff) | |
| parent | 499b57fc572b20a01e35af3876364ce190151cb9 (diff) | |
| download | mariadb-git-223e57dec3d634e447094dc9125fe719d3794b1d.tar.gz | |
Merge stella.local:/home2/mydev/mysql-5.1-ateam
into stella.local:/home2/mydev/mysql-5.1-axmrg
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 166a2800ea8..a43344e902b 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -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)); |