diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-10-04 15:26:04 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-10-04 15:26:04 +0200 |
| commit | 22f9353bfd3ea7b5f8cd7533c300dde78427636f (patch) | |
| tree | 923ea8dd402f4cb9453337ff969146e00950fd86 /storage/xtradb | |
| parent | 4a784356daf12af50047467efb85d6308b0b3603 (diff) | |
| download | mariadb-git-22f9353bfd3ea7b5f8cd7533c300dde78427636f.tar.gz | |
xtradb/innodb: fix to compile with VS 2008
and compiler warnings
Diffstat (limited to 'storage/xtradb')
| -rw-r--r-- | storage/xtradb/handler/handler0alter.cc | 12 | ||||
| -rw-r--r-- | storage/xtradb/row/row0mysql.cc | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/storage/xtradb/handler/handler0alter.cc b/storage/xtradb/handler/handler0alter.cc index a561ae22f86..a5524fc6894 100644 --- a/storage/xtradb/handler/handler0alter.cc +++ b/storage/xtradb/handler/handler0alter.cc @@ -2238,7 +2238,7 @@ innobase_check_foreigns_low( /* Check if any FOREIGN KEY constraints are defined on this column. */ - for (dict_foreign_set::iterator it = user_table->foreign_set.begin(); + for (dict_foreign_set::const_iterator it = user_table->foreign_set.begin(); it != user_table->foreign_set.end(); ++it) { @@ -2275,7 +2275,7 @@ innobase_check_foreigns_low( /* Check if any FOREIGN KEY constraints in other tables are referring to the column that is being dropped. */ - for (dict_foreign_set::iterator it + for (dict_foreign_set::const_iterator it = user_table->referenced_set.begin(); it != user_table->referenced_set.end(); ++it) { @@ -2667,7 +2667,7 @@ prepare_inplace_alter_table_dict( if (UNIV_UNLIKELY(ctx->trx->fake_changes)) { trx_rollback_to_savepoint(ctx->trx, NULL); trx_free_for_mysql(ctx->trx); - DBUG_RETURN(HA_ERR_WRONG_COMMAND); + DBUG_RETURN(true); } trx_start_for_ddl(ctx->trx, TRX_DICT_OP_INDEX); @@ -3387,7 +3387,7 @@ ha_innobase::prepare_inplace_alter_table( DBUG_ASSERT(!srv_read_only_mode); if (UNIV_UNLIKELY(prebuilt->trx->fake_changes)) { - DBUG_RETURN(HA_ERR_WRONG_COMMAND); + DBUG_RETURN(true); } MONITOR_ATOMIC_INC(MONITOR_PENDING_ALTER_TABLE); @@ -4462,7 +4462,7 @@ err_exit: rename_foreign: trx->op_info = "renaming column in SYS_FOREIGN_COLS"; - for (dict_foreign_set::iterator it = user_table->foreign_set.begin(); + for (dict_foreign_set::const_iterator it = user_table->foreign_set.begin(); it != user_table->foreign_set.end(); ++it) { @@ -4497,7 +4497,7 @@ rename_foreign: } } - for (dict_foreign_set::iterator it + for (dict_foreign_set::const_iterator it = user_table->referenced_set.begin(); it != user_table->referenced_set.end(); ++it) { diff --git a/storage/xtradb/row/row0mysql.cc b/storage/xtradb/row/row0mysql.cc index ebf991e6ff8..fffcf7dc4b8 100644 --- a/storage/xtradb/row/row0mysql.cc +++ b/storage/xtradb/row/row0mysql.cc @@ -2853,7 +2853,7 @@ row_discard_tablespace_foreign_key_checks( /* Check if the table is referenced by foreign key constraints from some other table (not the table itself) */ - dict_foreign_set::iterator it + dict_foreign_set::const_iterator it = std::find_if(table->referenced_set.begin(), table->referenced_set.end(), dict_foreign_different_tables()); |