[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2802)

#At lp:maria 2802 knielsen@knielsen-hq.org 2010-01-15 After-merge fix for XtraDB 9: missing DBUG_RETURN. modified: storage/xtradb/handler/ha_innodb.cc === modified file 'storage/xtradb/handler/ha_innodb.cc' --- a/storage/xtradb/handler/ha_innodb.cc 2010-01-15 17:02:57 +0000 +++ b/storage/xtradb/handler/ha_innodb.cc 2010-01-15 18:44:11 +0000 @@ -9729,7 +9729,7 @@ ha_innobase::check_if_incompatible_data( if (table->field[i]->flags & FIELD_IN_ADD_INDEX && innobase_strcasecmp(table->field[i]->field_name, dict_table_get_col_name(prebuilt->table, i))) { - return(COMPATIBLE_DATA_NO); + DBUG_RETURN(COMPATIBLE_DATA_NO); } } }