1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xtradb/innodb: fix to compile with VS 2008

Browse Source 
and compiler warnings
This commit is contained in:
Sergei Golubchik 2014-10-04 15:26:04 +02:00
parent 4a784356da
commit 22f9353bfd
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
storage/innobase/handler/handler0alter.cc
View File

@ -2237,7 +2237,7 @@ innobase_check_foreigns_low(
/* Check if any FOREIGN KEY constraints are defined on this /* Check if any FOREIGN KEY constraints are defined on this
column. */ 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 != user_table->foreign_set.end();
++it) { ++it) {
@ -2274,7 +2274,7 @@ innobase_check_foreigns_low(
/* Check if any FOREIGN KEY constraints in other tables are /* Check if any FOREIGN KEY constraints in other tables are
referring to the column that is being dropped. */ 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(); = user_table->referenced_set.begin();
it != user_table->referenced_set.end(); it != user_table->referenced_set.end();
++it) { ++it) {
@ -4446,7 +4446,7 @@ err_exit:
rename_foreign: rename_foreign:
trx->op_info = "renaming column in SYS_FOREIGN_COLS"; 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 != user_table->foreign_set.end();
++it) { ++it) {
@ -4481,7 +4481,7 @@ rename_foreign:
} }
} }
for (dict_foreign_set::iterator it for (dict_foreign_set::const_iterator it
= user_table->referenced_set.begin(); = user_table->referenced_set.begin();
it != user_table->referenced_set.end(); it != user_table->referenced_set.end();
++it) { ++it) {

2
storage/innobase/row/row0mysql.cc
View File

@ -2839,7 +2839,7 @@ row_discard_tablespace_foreign_key_checks(
/* Check if the table is referenced by foreign key constraints from /* Check if the table is referenced by foreign key constraints from
some other table (not the table itself) */ 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(), = std::find_if(table->referenced_set.begin(),
table->referenced_set.end(), table->referenced_set.end(),
dict_foreign_different_tables()); dict_foreign_different_tables());

12
storage/xtradb/handler/handler0alter.cc
View File

@ -2238,7 +2238,7 @@ innobase_check_foreigns_low(
/* Check if any FOREIGN KEY constraints are defined on this /* Check if any FOREIGN KEY constraints are defined on this
column. */ 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 != user_table->foreign_set.end();
++it) { ++it) {
@ -2275,7 +2275,7 @@ innobase_check_foreigns_low(
/* Check if any FOREIGN KEY constraints in other tables are /* Check if any FOREIGN KEY constraints in other tables are
referring to the column that is being dropped. */ 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(); = user_table->referenced_set.begin();
it != user_table->referenced_set.end(); it != user_table->referenced_set.end();
++it) { ++it) {
@ -2667,7 +2667,7 @@ prepare_inplace_alter_table_dict(
if (UNIV_UNLIKELY(ctx->trx->fake_changes)) { if (UNIV_UNLIKELY(ctx->trx->fake_changes)) {
trx_rollback_to_savepoint(ctx->trx, NULL); trx_rollback_to_savepoint(ctx->trx, NULL);
trx_free_for_mysql(ctx->trx); 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); 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); DBUG_ASSERT(!srv_read_only_mode);
if (UNIV_UNLIKELY(prebuilt->trx->fake_changes)) { if (UNIV_UNLIKELY(prebuilt->trx->fake_changes)) {
DBUG_RETURN(HA_ERR_WRONG_COMMAND); DBUG_RETURN(true);
} }
MONITOR_ATOMIC_INC(MONITOR_PENDING_ALTER_TABLE); MONITOR_ATOMIC_INC(MONITOR_PENDING_ALTER_TABLE);
@ -4462,7 +4462,7 @@ err_exit:
rename_foreign: rename_foreign:
trx->op_info = "renaming column in SYS_FOREIGN_COLS"; 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 != user_table->foreign_set.end();
++it) { ++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(); = user_table->referenced_set.begin();
it != user_table->referenced_set.end(); it != user_table->referenced_set.end();
++it) { ++it) {

2
storage/xtradb/row/row0mysql.cc
View File

@ -2853,7 +2853,7 @@ row_discard_tablespace_foreign_key_checks(
/* Check if the table is referenced by foreign key constraints from /* Check if the table is referenced by foreign key constraints from
some other table (not the table itself) */ 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(), = std::find_if(table->referenced_set.begin(),
table->referenced_set.end(), table->referenced_set.end(),
dict_foreign_different_tables()); dict_foreign_different_tables());