diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2009-09-10 01:06:57 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2009-09-10 01:06:57 +0400 |
| commit | 8282ed39f238d582ded11fdf9bfc2c0f48c22835 (patch) | |
| tree | e23d8ad15a987d8d756907e24c11913e603c7794 /storage/xtradb | |
| parent | e2d6412d42f507d9130fc7e45463a3e560914f68 (diff) | |
| download | mariadb-git-8282ed39f238d582ded11fdf9bfc2c0f48c22835.tar.gz | |
MySQL 5.1 -> MariaDB 5.1 merge
- Post-merge fixes
Diffstat (limited to 'storage/xtradb')
| -rw-r--r-- | storage/xtradb/handler/ha_innodb.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc index 241408779bb..4ca5bd486f6 100644 --- a/storage/xtradb/handler/ha_innodb.cc +++ b/storage/xtradb/handler/ha_innodb.cc @@ -9470,7 +9470,7 @@ ha_innobase::check_if_incompatible_data( There is no mechanism for updating InnoDB foreign key definitions. */ if (foreign_key_column_is_being_renamed(prebuilt, table)) { - return(COMPATIBLE_DATA_NO); + DBUG_RETURN(COMPATIBLE_DATA_NO); } /* Check that row format didn't change */ |